Removes parenthesis from deck images in TTS/Local Image

Fixes #59
ronelm2000 · Nov 29, 2022 · 5ea5810 · 5ea5810
1 parent b1e8b6a
commit 5ea5810
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/Montage.Card.API/Utilities/StringExtensions.cs b/Montage.Card.API/Utilities/StringExtensions.cs
@@ -60,13 +60,25 @@ public static string AsFileNameFriendly(this string str, char replacement = '_')
     {
         var res = str;
         foreach (var c in System.IO.Path.GetInvalidFileNameChars())
-            res = res.Replace(c, '_');
-        res = res.Replace('\\', '_');
-        res = res.Replace('/', '_');
-        res = res.Replace(' ', '_');
+            res = res.Replace(c, replacement);
+        res = res.Replace('\\', replacement);
+        res = res.Replace('/', replacement);
+        res = res.Replace(' ', replacement);
         return res;
     }
 
+    public static string AsFriendlyToTabletopSimulator(this string str, char replacement = '_')
+    {
+        var res = str;
+        foreach (var c in System.IO.Path.GetInvalidFileNameChars())
+            res = res.Replace(c, replacement);
+        res = res   .Replace('\\', replacement)
+                    .Replace('/', replacement)
+                    .Replace(' ', replacement)
+                    .Replace(')', replacement)
+                    .Replace('(', replacement);
+        return res;
+    }
     public static async Task<IDocument> ParseHTML(this string content)
     {
         var config = AngleSharp.Configuration.Default.WithCss();

diff --git a/MontageWeissTools/Impls/Exporters/Deck/LocalDeckImageExporter.cs b/MontageWeissTools/Impls/Exporters/Deck/LocalDeckImageExporter.cs
@@ -49,7 +49,7 @@ public async Task Export(WeissSchwarzDeck deck, IExportInfo info, CancellationTo
             .SelectMany(c => Enumerable.Range(0, deck.Ratios[c]).Select(i => c))
             .ToList();
         var resultFolder = Path.CreateDirectory(info.Destination);
-        var fileNameFriendlyDeckName = deck.Name.AsFileNameFriendly();
+        var fileNameFriendlyDeckName = deck.Name.AsFriendlyToTabletopSimulator();
         var imageDictionary = await AsOrdered(deck.Ratios.Keys)
             .ToAsyncEnumerable()
             .Select((p, i) =>

diff --git a/MontageWeissTools/Impls/Exporters/Deck/TTS/TTSDeckExporter.cs b/MontageWeissTools/Impls/Exporters/Deck/TTS/TTSDeckExporter.cs
@@ -52,7 +52,7 @@ public async Task Export(WeissSchwarzDeck deck, IExportInfo info, CancellationTo
 
         var resultFolder = Path.CreateDirectory(info.Destination);
 
-        var fileNameFriendlyDeckName = deck.Name.AsFileNameFriendly();
+        var fileNameFriendlyDeckName = deck.Name.AsFriendlyToTabletopSimulator();
 
         var imageDictionary = await deck.Ratios.Keys
             .ToAsyncEnumerable()
@@ -101,11 +101,11 @@ public async Task Export(WeissSchwarzDeck deck, IExportInfo info, CancellationTo
             ;
 
         var finalTemplateUIXML = TTSResources.XMLUITemplate;
-        var saveState = JsonConvert.DeserializeObject<SaveState>(Encoding.UTF8.GetString(TTSResources.CustomObject));
+        var saveState = JsonConvert.DeserializeObject<SaveState>(Encoding.UTF8.GetString(TTSResources.CustomObject)) ?? throw new InvalidOperationException();
         saveState.ObjectStates[0].LuaScript = finalTemplateLUA;
         saveState.ObjectStates[0].XmlUI = finalTemplateUIXML;
 
-        var nameOfObject = $"Deck Generator ({fileNameFriendlyDeckName})";
+        var nameOfObject = $"Deck Generator ({deck.Name})";
         var deckGeneratorPath = resultFolder.Combine($"{nameOfObject}.json");
 
         //TODO: Add more progress logs here.