move pattern formatter to the common dumper code and use it in linux …

…build

also add explicit invalid character filter for the resulting name that should fix #20

Ps3DiscDumper/Dumper.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.IO;
 using System.Linq;
 using System.Management;
@@ -21,7 +22,7 @@ namespace Ps3DiscDumper
 {
     public class Dumper: IDisposable
     {
-        public const string Version = "3.2.1";
+        public const string Version = "3.2.2";
 
         private static readonly HashSet<char> InvalidChars = new(Path.GetInvalidFileNameChars());
         private static readonly char[] MultilineSplit = {'\r', '\n'};
@@ -163,7 +164,11 @@ private void CheckParamSfo(ParamSfo sfo)
 
         public void DetectDisc(string inDir = "", Func<Dumper, string> outputDirFormatter = null)
         {
-            outputDirFormatter ??= d => $"[{d.ProductCode}] {d.Title}";
+            outputDirFormatter ??= d => PatternFormatter.Format($"%{Patterns.Title}% [%{Patterns.ProductCode}%]", new()
+            {
+                [Patterns.ProductCode] = d.ProductCode,
+                [Patterns.Title] = d.Title,
+            });
             string discSfbPath = null;
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {

Ps3DiscDumper/Utils/PatternFormatter.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Specialized;
+using System.IO;
+using System.Linq;
+
+namespace Ps3DiscDumper.Utils
+{
+    public static class PatternFormatter
+    {
+        public static string Format(string pattern, NameValueCollection items)
+        {
+            if (string.IsNullOrEmpty(pattern))
+                return pattern;
+
+            foreach (var k in items.AllKeys)
+                pattern = pattern.Replace($"%{k}%", items[k]);
+            pattern = pattern.Replace("®", "")
+                .Replace("™", "")
+                .Replace("(TM)", "")
+                .Replace("(R)", "");
+            pattern = ReplaceInvalidChars(pattern);
+            if (string.IsNullOrEmpty(pattern))
+                pattern = ReplaceInvalidChars($"{DateTime.Now:s}");
+            return pattern;
+        }
+
+        private static string ReplaceInvalidChars(string dirName)
+        {
+            foreach (var invalidChar in Path.GetInvalidFileNameChars().Concat(Path.GetInvalidPathChars()).Distinct())
+                dirName = dirName.Replace(invalidChar, '_');
+            return dirName;
+        }
+    }
+}

UI.WinForms.Msil/Patterns.cs → Ps3DiscDumper/Utils/Patterns.cs

@@ -1,6 +1,6 @@
-namespace UI.WinForms.Msil
+namespace Ps3DiscDumper.Utils
 {
-    internal static class Patterns
+    public static class Patterns
     {
         public const string ProductCode = "product_code";
         public const string ProductCodeLetters = "product_code_letters";

UI.WinForms.Msil/Forms/SettingsForm.cs

@@ -2,6 +2,7 @@
 using System.Collections.Specialized;
 using System.IO;
 using System.Windows.Forms;
+using Ps3DiscDumper.Utils;
 
 namespace UI.WinForms.Msil
 {

UI.WinForms.Msil/Settings.cs

@@ -1,4 +1,5 @@
 using System.Configuration;
+using Ps3DiscDumper.Utils;
 
 namespace UI.WinForms.Msil
 {
@@ -10,7 +11,7 @@ internal sealed class Settings : ApplicationSettingsBase
         [UserScopedSetting, DefaultSettingValue(@".\ird")]
         public string IrdDir { get => (string)this[nameof(IrdDir)]; set => this[nameof(IrdDir)] = value; }
 
-        [UserScopedSetting, DefaultSettingValue("%" + Patterns.Title + "% [%" + Patterns.ProductCode + "%]")]
+        [UserScopedSetting, DefaultSettingValue($"%{Patterns.Title}% [%{Patterns.ProductCode}%]")]
         public string DumpNameTemplate { get => (string)this[nameof(DumpNameTemplate)]; set => this[nameof(DumpNameTemplate)] = value; }
 
         [UserScopedSetting, DefaultSettingValue("false")]