Merge branch 'develop'

Otiel · Feb 28, 2022 · d3a59b0 · d3a59b0
2 parents 4e8e3e1 + 9a007cd
commit d3a59b0
Show file tree

Hide file tree

Showing 6 changed files with 355 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 1.4.1
+
+## Improvements
+
+* Added / updated translations thanks to contributors. [#203](https://github.com/Otiel/BandcampDownloader/pull/203) [#205](https://github.com/Otiel/BandcampDownloader/pull/205)
+
+## Bug fixes
+
+* Fixed an issue when trying to download tracks containing special characters in their title. [#189](https://github.com/Otiel/BandcampDownloader/issues/189)
+
 # 1.4.0
 
 ## New features

diff --git a/src/BandcampDownloader/Helpers/FileHelper.cs b/src/BandcampDownloader/Helpers/FileHelper.cs
@@ -53,32 +53,14 @@ public static async Task<long> GetFileSizeAsync(string url, string protocolMetho
             return fileSize;
         }
 
-        /// <summary>
-        /// Replaces the forbidden characters \ / : * ? " &lt; &gt; | from the System.String object by an underscore _ in
-        /// order to be used for a Windows file or folder.
-        /// </summary>
         public static string ToAllowedFileName(this string fileName)
         {
             if (fileName == null)
             {
                 throw new ArgumentNullException(nameof(fileName));
             }
 
-            // Rules are defined here: https://docs.microsoft.com/en-us/windows/desktop/FileIO/naming-a-file
-
-            // Replace reserved characters by '_'
-            fileName = fileName.Replace("\\", "_");
-            fileName = fileName.Replace("/", "_");
-            fileName = fileName.Replace(":", "_");
-            fileName = fileName.Replace("*", "_");
-            fileName = fileName.Replace("?", "_");
-            fileName = fileName.Replace("\"", "_");
-            fileName = fileName.Replace("<", "_");
-            fileName = fileName.Replace(">", "_");
-            fileName = fileName.Replace("|", "_");
-
-            // Replace newline by '_'
-            fileName = fileName.Replace(Environment.NewLine, "_");
+            fileName = fileName.ReplaceInvalidPathCharacters('_');
 
             // Remove trailing dot(s)
             fileName = Regex.Replace(fileName, @"\.+$", "");
@@ -91,5 +73,20 @@ public static string ToAllowedFileName(this string fileName)
 
             return fileName;
         }
+
+        private static string ReplaceInvalidPathCharacters(this string path, char replaceBy)
+        {
+            foreach (var invalidCharacter in Path.GetInvalidPathChars())
+            {
+                path = path.Replace(invalidCharacter, replaceBy);
+            }
+
+            foreach (var invalidCharacter in Path.GetInvalidFileNameChars())
+            {
+                path = path.Replace(invalidCharacter, replaceBy);
+            }
+
+            return path;
+        }
     }
 }
diff --git a/src/BandcampDownloader/Properties/AssemblyInfo.cs b/src/BandcampDownloader/Properties/AssemblyInfo.cs
@@ -47,6 +47,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("1.4.0")]
-[assembly: AssemblyFileVersion("1.4.0")]
+[assembly: AssemblyVersion("1.4.1")]
+[assembly: AssemblyFileVersion("1.4.1")]
 [assembly: GuidAttribute("8C171C7F-9BAC-4EC0-A287-59908B48953F")]