Merge branch 'release-0.2.10.0'

Otiel · May 13, 2019 · ae6c23e · ae6c23e
2 parents b52ea53 + 9ec6c76
commit ae6c23e
Show file tree

Hide file tree

Showing 59 changed files with 879 additions and 521 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# 0.2.10.0
+
+## New features
+
+* Added "About" section on Settings window.
+
+## Improvements
+
+* Minor UI improvements.
+
+## Bug fixes
+
+* Fixed a bug preventing the cover art to be saved in the tracks. [#88](https://github.com/Otiel/BandcampDownloader/issues/88)
+
 # 0.2.9.0
 
 ## New features

diff --git a/README.md b/README.md
@@ -20,6 +20,7 @@ BandcampDownloader is a Windows application that helps downloading albums from [
   * Convert it to jpg,
   * Resize it,
   * Save it in tracks tags and in folder.
+* Create playlist file (supported formats are: m3u, pls, wpl, zpl).
 
 <p align="center">
     <img alt="Screenshot" src="docs/images/Screenshot.png">

diff --git a/src/BandcampDownloader.sln b/src/BandcampDownloader.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28306.52
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BandcampDownloader", "BandcampDownloader\BandcampDownloader.csproj", "{F6E97E00-B958-4745-974E-14C6A72E5D03}"
 EndProject
@@ -26,6 +26,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
+		RESX_SortFileContentOnSave = True
 		SolutionGuid = {52F50432-02C4-4952-8CA7-F992D75FB5B5}
 	EndGlobalSection
 EndGlobal
diff --git a/src/BandcampDownloader/App.xaml b/src/BandcampDownloader/App.xaml
@@ -2,5 +2,4 @@
     x:Class="BandcampDownloader.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    StartupUri="UI/Dialogs/WindowMain.xaml">
-</Application>
+    StartupUri="UI/Dialogs/WindowMain.xaml" />
diff --git a/src/BandcampDownloader/App.xaml.cs b/src/BandcampDownloader/App.xaml.cs
@@ -29,7 +29,7 @@ protected override void OnStartup(StartupEventArgs e) {
         /// </summary>
         private void InitializeSettings() {
             App.UserSettings = new ConfigurationBuilder<IUserSettings>().UseIniFile(Constants.UserSettingsFilePath).Build();
-            if (String.IsNullOrEmpty(UserSettings.DownloadsPath)) {
+            if (string.IsNullOrEmpty(UserSettings.DownloadsPath)) {
                 // Its default value cannot be set in settings as it isn't determined by a constant function
                 App.UserSettings.DownloadsPath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\{artist}\\{album}";
             }

diff --git a/src/BandcampDownloader/BandcampDownloader.csproj b/src/BandcampDownloader/BandcampDownloader.csproj
@@ -88,8 +88,8 @@
     <Reference Include="Costura, Version=3.3.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
       <HintPath>..\packages\Costura.Fody.3.3.2\lib\net40\Costura.dll</HintPath>
     </Reference>
-    <Reference Include="HtmlAgilityPack, Version=1.11.3.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>..\packages\HtmlAgilityPack.1.11.3\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    <Reference Include="HtmlAgilityPack, Version=1.11.4.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\packages\HtmlAgilityPack.1.11.4\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
     <Reference Include="ImageResizer, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ImageResizer.4.2.5\lib\net45\ImageResizer.dll</HintPath>
@@ -107,7 +107,7 @@
       <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.2\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.6.3\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="PlaylistsNET, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\PlaylistsNET.1.0.4\lib\net45\PlaylistsNET.dll</HintPath>
@@ -139,8 +139,8 @@
     <Reference Include="WPFLocalizeExtension, Version=3.3.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\WPFLocalizeExtension.3.3.1\lib\net452\WPFLocalizeExtension.dll</HintPath>
     </Reference>
-    <Reference Include="XAMLMarkupExtensions, Version=1.6.0.0, Culture=neutral, PublicKeyToken=c726e0262981a1eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\XAMLMarkupExtensions.1.6.0\lib\net452\XAMLMarkupExtensions.dll</HintPath>
+    <Reference Include="XAMLMarkupExtensions, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\XAMLMarkupExtensions.1.5.1\lib\net452\XAMLMarkupExtensions.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -161,6 +161,9 @@
     <Compile Include="Model\JSON\JsonTrack.cs" />
     <Compile Include="Helpers\TagHelper.cs" />
     <Compile Include="Helpers\UpdatesHelper.cs" />
+    <Compile Include="UI\Dialogs\Settings\UserControlSettingsAbout.xaml.cs">
+      <DependentUpon>UserControlSettingsAbout.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UI\Dialogs\Update\UserControlChangelog.xaml.cs">
       <DependentUpon>UserControlChangelog.xaml</DependentUpon>
     </Compile>
@@ -228,6 +231,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="UI\Dialogs\Settings\UserControlSettingsAbout.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="UI\Dialogs\Settings\UserControlSettingsGeneral.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -325,7 +332,7 @@
     <Resource Include="Resources\Cloud.ico" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\Cloud.png" />
+    <Resource Include="Resources\Cloud.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\ArrowCircle225Left.png" />
@@ -339,7 +346,19 @@
   <ItemGroup>
     <Resource Include="FodyWeavers.xml" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Resources\CloudSmall.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ApplicationBlue.png" />
+    <Resource Include="Resources\DocumentMusicPlaylist.png" />
+    <Resource Include="Resources\DriveDownload.png" />
+    <Resource Include="Resources\Gear.png" />
+    <Resource Include="Resources\GlobeNetwork.png" />
+    <Resource Include="Resources\Information.png" />
+    <Resource Include="Resources\Picture.png" />
+    <Resource Include="Resources\Tags.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Fody.3.3.5\build\Fody.targets" Condition="Exists('..\packages\Fody.3.3.5\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/src/BandcampDownloader/Core/Constants.cs b/src/BandcampDownloader/Core/Constants.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Reflection;
 
 namespace BandcampDownloader {
@@ -8,38 +7,46 @@ internal static class Constants {
         /// <summary>
         /// The version number of BandcampDownloader.
         /// </summary>
-        public static readonly String AppVersion = Assembly.GetEntryAssembly().GetName().Version.ToString();
+        public static readonly string AppVersion = Assembly.GetEntryAssembly().GetName().Version.ToString();
+        /// <summary>
+        /// The absolute path to the log file.
+        /// </summary>
+        public static readonly string LogFilePath = Directory.GetParent(Assembly.GetExecutingAssembly().Location) + @"\BandcampDownloader.log";
+        /// <summary>
+        /// The log file maximum size in bytes.
+        /// </summary>
+        public static readonly long MaxLogSize = 1024 * 1024;
         /// <summary>
         /// The URL redirecting to the changelog file on GitHub.
         /// </summary>
-        public static readonly String ChangelogUrl = "https://raw.githubusercontent.com/Otiel/BandcampDownloader/master/CHANGELOG.md";
+        public static readonly string UrlChangelog = "https://raw.githubusercontent.com/Otiel/BandcampDownloader/master/CHANGELOG.md";
         /// <summary>
         /// The URL redirecting to the help page on translating the app on GitHub.
         /// </summary>
-        public static readonly String HelpTranslateWebsite = "https://github.com/Otiel/BandcampDownloader/blob/master/docs/help-translate.md";
+        public static readonly string UrlHelpTranslate = "https://github.com/Otiel/BandcampDownloader/blob/master/docs/help-translate.md";
+        /// <summary>
+        /// The URL redirecting to the issues page on GitHub.
+        /// </summary>
+        public static readonly string UrlIssues = "https://github.com/Otiel/BandcampDownloader/issues";
         /// <summary>
         /// The URL redirecting to the latest release on GitHub.
         /// </summary>
-        public static readonly String LatestReleaseWebsite = "https://github.com/Otiel/BandcampDownloader/releases/latest";
+        public static readonly string UrlLatestRelease = "https://github.com/Otiel/BandcampDownloader/releases/latest";
         /// <summary>
-        /// The absolute path to the log file.
+        /// The URL redirecting to the releases page on GitHub.
         /// </summary>
-        public static readonly String LogFilePath = Directory.GetParent(Assembly.GetExecutingAssembly().Location) + @"\BandcampDownloader.log";
+        public static readonly string UrlReleases = "https://github.com/Otiel/BandcampDownloader/releases";
         /// <summary>
-        /// The log file maximum size in bytes.
+        /// The URL redirecting to the zip file. Must be formatted with a version.
         /// </summary>
-        public static readonly long MaxLogSize = 1024 * 1024;
+        public static readonly string UrlReleaseZip = "https://github.com/Otiel/BandcampDownloader/releases/download/v{0}/BandcampDownloader.zip";
         /// <summary>
         /// The website URL of BandcampDownloader.
         /// </summary>
-        public static readonly String ProjectWebsite = "https://github.com/Otiel/BandcampDownloader";
+        public static readonly string UrlWebsite = "https://github.com/Otiel/BandcampDownloader";
         /// <summary>
         /// The absolute path to the settings file.
         /// </summary>
-        public static readonly String UserSettingsFilePath = Directory.GetParent(Assembly.GetExecutingAssembly().Location) + @"\BandcampDownloader.ini";
-        /// <summary>
-        /// The URL redirecting to the zip file. Must be formatted with a version.
-        /// </summary>
-        public static readonly String ZipUrl = "https://github.com/Otiel/BandcampDownloader/releases/download/v{0}/BandcampDownloader.zip";
+        public static readonly string UserSettingsFilePath = Directory.GetParent(Assembly.GetExecutingAssembly().Location) + @"\BandcampDownloader.ini";
     }
 }