Add support for MKM art variation cards with † in collector numbers

madelson · Aug 15, 2024 · 9efb7c3 · 9efb7c3
1 parent 55c2852
commit 9efb7c3
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/TabletopMtgImporter.Console/TabletopMtgImporter.Console.csproj b/TabletopMtgImporter.Console/TabletopMtgImporter.Console.csproj
@@ -5,8 +5,8 @@
     <TargetFramework>net461</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <AssemblyName>TabletopMTGImporter</AssemblyName>
-    <AssemblyVersion>0.8.2.0</AssemblyVersion>
-    <FileVersion>0.8.2.0</FileVersion>
+    <AssemblyVersion>0.8.3.0</AssemblyVersion>
+    <FileVersion>0.8.3.0</FileVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

diff --git a/TabletopMtgImporter.Core/DeckParser.cs b/TabletopMtgImporter.Core/DeckParser.cs
@@ -92,7 +92,7 @@ public static bool TryParse(TextReader reader, out List<DeckCard> cards, out Lis
                     # card name. Disallow characters used to delimit the following sections as well as trailing whitespace
                     \s+(?<name>[^\s\(`^]+(\s+[^\s\(`^]+)*)
                     # set and optionally collector number
-                    (\s+\((?<set>\w+)\)(\s(?<collectorNumber>(\w+\-)?\d+[a-zA-Z]?))?)?
+                    (\s+\((?<set>\w+)\)(\s(?<collectorNumber>(\w+\-)?\d+[a-zA-Z†]?))?)?
                     # optional foil marker
                     (\s+\*F\*)?
                     # category [x{a}{b}...,] (new format) or `x` (old format).

diff --git a/TabletopMtgImporter.Core/Importer.cs b/TabletopMtgImporter.Core/Importer.cs
@@ -87,7 +87,12 @@ async Task<bool> TryImportAsync()
 
                     if (info != null)
                     {
-                        await UwcProvider.UpdateAsync(info, deckInput);
+                        try { await UwcProvider.UpdateAsync(info, deckInput); }
+                        catch (Exception ex)
+                        {
+                            this._logger.Error($"Failed to update UWC cards. Detailed information: {ex}");
+                            throw;
+                        }
 
                         cardInfo[card] = info;
                         foreach (var relatedCard in (info.RelatedCards ?? Enumerable.Empty<ScryfallCard.RelatedCard>())

diff --git a/TabletopMtgImporter.Core/ScryfallClient.cs b/TabletopMtgImporter.Core/ScryfallClient.cs
@@ -19,7 +19,8 @@ internal class ScryfallClient
             DefaultRequestHeaders =
             {
                 Accept = { new("application/json") },
-                UserAgent = { new("TabletopSimulatorMtgImporter", Assembly.GetEntryAssembly().GetName().Version.ToString()) }
+                // Assembly.GetEntryAssembly() can return null when running via tests
+                UserAgent = { new("TabletopSimulatorMtgImporter", Assembly.GetEntryAssembly()?.GetName().Version.ToString() ?? "1.0") }
             }
         };
 

diff --git a/TabletopMtgImporter.Tests/EndToEndTest.cs b/TabletopMtgImporter.Tests/EndToEndTest.cs
@@ -134,6 +134,17 @@ public async Task TestSetNumbersWithDash()
                 mainDeck.ContainedObjects.Select(o => o.Nickname));
         }
 
+        [Test]
+        public async Task TestMkmArtVariationCollectorNumber()
+        {
+            var cards = new[] { "1x Wojek Investigator (mkm) 36† [Draw]" };
+            var deck = await this.ImportDeckAsync(cards);
+            var mainDeck = deck.ObjectStates[0];
+            CollectionAssert.AreEquivalent(
+                new[] { "Wojek Investigator" },
+                mainDeck.ContainedObjects.Select(o => o.Nickname));
+        }
+
         private Task<TabletopDeckObject> ImportDeckAsync(params string[] cards) => this.ImportDeckAsync(cards.AsEnumerable());
 
         private async Task<TabletopDeckObject> ImportDeckAsync(IEnumerable<string> cards, bool require100Cards = false)

diff --git a/TabletopMtgImporter.Wpf/TabletopMtgImporter.Wpf.csproj b/TabletopMtgImporter.Wpf/TabletopMtgImporter.Wpf.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <AssemblyName>TabletopMTGImporterGUI</AssemblyName>
-    <AssemblyVersion>0.8.2.0</AssemblyVersion>
-    <FileVersion>0.8.2.0</FileVersion>
+    <AssemblyVersion>0.8.3.0</AssemblyVersion>
+    <FileVersion>0.8.3.0</FileVersion>
     <TargetFramework>net48</TargetFramework>
     <UseWPF>true</UseWPF>
     <LangVersion>8.0</LangVersion>