Merge branch 'release-0.2.4.1'

Otiel · Jan 22, 2019 · faefaa0 · faefaa0
2 parents 2395c5b + e5dbd70
commit faefaa0
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 0.2.4.1
+
+## Bug fixes
+
+* Fixed issue that would cause the program to crash when the artwork file was already existing in the target folder.
+* Fixed issue [#73](https://github.com/Otiel/BandcampDownloader/issues/73) that would stuck the downloads in an endless loop when downloading a cover art failed.
+* Fixed issue that would report an incorrect number of tries when downloading a cover art failed.
+
 # 0.2.4.0
 
 ## New features

diff --git a/docs/new-release.md b/docs/new-release.md
@@ -0,0 +1,37 @@
+# How to create a new release
+
+## Workflow
+
+This repository follows [git flow](https://nvie.com/posts/a-successful-git-branching-model) as a git branching and release management workflow. The following content describes how to create a new release by following this workflow and using GitHub resources.
+
+## Prepare the release
+
+1. Merge all `fix` and `feature` branches that are to be incorporated in the new release on the `develop` branch.
+2. Update `CHANGELOG.md` based on the git history. Determine the new version number from the changes. Do not commit yet.
+
+## Create a new release branch
+
+1. Create a new branch named `release-X.Y.Z` from `develop` and switch to this new branch.
+2. Bump the version number:
+    * Commit the changes on `CHANGELOG.md`.
+    * Update the assembly number on `AssemblyInfo.cs` and commit.
+
+## Finish the release branch
+
+1. Merge `release-X.Y.Z` into `master`.
+2. Create a new tag called `vX.Y.Z`.
+3. Merge `release-X.Y.Z` into `develop`.
+4. Delete the `release-X.Y.Z` branch.
+5. Push `master`, `develop` and the new tag.
+
+## Create the GitHub release
+
+1. On Visual Studio, set the Solution Configuration to "Release".
+2. Build the solution.
+3. Create a new _zip_ archive containing the necessary files created under `src\BandcampDownloader\bin\Release`.
+4. Draft a new [release](https://github.com/Otiel/BandcampDownloader/releases) on GitHub:
+    * Choose the newly created tag (if you forgot to push it, now's the time to do it).
+    * Set the title equal to `X.Y.Z`.
+    * Copy-paste the changes from `CHANGELOG.md`.
+    * Attach the _zip_ file.
+5. Publish the release!
diff --git a/src/BandcampDownloader/Properties/AssemblyInfo.cs b/src/BandcampDownloader/Properties/AssemblyInfo.cs
@@ -51,6 +51,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.4.0")]
-[assembly: AssemblyFileVersion("0.2.4.0")]
+[assembly: AssemblyVersion("0.2.4.1")]
+[assembly: AssemblyFileVersion("0.2.4.1")]
 [assembly: GuidAttribute("8C171C7F-9BAC-4EC0-A287-59908B48953F")]
diff --git a/src/BandcampDownloader/UI/Dialogs/WindowMain.xaml.cs b/src/BandcampDownloader/UI/Dialogs/WindowMain.xaml.cs
@@ -374,7 +374,7 @@ private TagLib.Picture DownloadCoverArt(Album album, String downloadsFolder) {
                                 }
                                 ImageBuilder.Current.Build(artworkTempPath, artworkFolderPath, settings); // Save it to the album folder
                             } else if (App.UserSettings.SaveCoverArtInFolder) {
-                                File.Copy(artworkTempPath, artworkFolderPath);
+                                File.Copy(artworkTempPath, artworkFolderPath, true);
                             }
 
                             // Convert/resize artwork to be saved in tags
@@ -404,12 +404,17 @@ private TagLib.Picture DownloadCoverArt(Album album, String downloadsFolder) {
                             Log($"Downloaded artwork for album \"{album.Title}\"", LogType.IntermediateSuccess);
                         } else if (!e.Cancelled && e.Error != null) {
                             if (tries < App.UserSettings.DownloadMaxTries) {
-                                Log($"Unable to download artwork for album \"{album.Title}\". Try {tries} of {App.UserSettings.DownloadMaxTries}", LogType.Warning);
+                                Log($"Unable to download artwork for album \"{album.Title}\". Try {tries + 1} of {App.UserSettings.DownloadMaxTries}", LogType.Warning);
                             } else {
                                 Log($"Unable to download artwork for album \"{album.Title}\". Hit max retries of {App.UserSettings.DownloadMaxTries}", LogType.Error);
                             }
                         } // Else the download has been cancelled (by the user)
 
+                        tries++;
+                        if (!artworkDownloaded && tries < App.UserSettings.DownloadMaxTries) {
+                            //WaitForCooldown(tries);
+                        }
+
                         doneEvent.Set();
                     };