From 88795474211068f88f2dbae184c51fbe0688e538 Mon Sep 17 00:00:00 2001
From: John Andrews <john@reven.co.nz>
Date: Sat, 11 May 2024 18:26:24 +1200
Subject: [PATCH] fixed comic renamer

---
 ComicNodes/Comics/CreateComicInfo.cs |  16 +++++++--------
 ComicNodes/Tests/ComicInfoTests.cs   |  28 +++++++++++++++++++++++++++
 FileFlows.Plugin.dll                 | Bin 140800 -> 140800 bytes
 FileFlows.Plugin.pdb                 | Bin 34328 -> 34332 bytes
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/ComicNodes/Comics/CreateComicInfo.cs b/ComicNodes/Comics/CreateComicInfo.cs
index 62c3a071..4470baa7 100644
--- a/ComicNodes/Comics/CreateComicInfo.cs
+++ b/ComicNodes/Comics/CreateComicInfo.cs
@@ -284,14 +284,6 @@ public class CreateComicInfo : Node
             info.Count = ofNumber;
         }
         
-        //var issueNumberMatch2 = Regex.Match(shortname, @"(?<!['])[#]?\b(\-?\d{1,3})\b(?!\w)");
-        ExtractIssueNumber(info, ref shortname);
-
-        if (info.Number != null)
-            ExtractYear(ref shortname);
-        else 
-            ExtractAnnualInfo(info, ref shortname);
-
         var volMatch = Regex.Match(shortname, @"\b[Vv](?:olume|ol)?\s*(\d+)\b", RegexOptions.IgnoreCase);
         if (volMatch.Success)
         {
@@ -302,6 +294,14 @@ public class CreateComicInfo : Node
                 : shortname;
 
         }
+        //var issueNumberMatch2 = Regex.Match(shortname, @"(?<!['])[#]?\b(\-?\d{1,3})\b(?!\w)");
+        ExtractIssueNumber(info, ref shortname);
+
+        if (info.Number != null)
+            ExtractYear(ref shortname);
+        else 
+            ExtractAnnualInfo(info, ref shortname);
+
         
         // remove any junk
         shortname = Regex.Replace(shortname, @"\(([\-]?\d+)\)", "$1").Trim();
diff --git a/ComicNodes/Tests/ComicInfoTests.cs b/ComicNodes/Tests/ComicInfoTests.cs
index 5e2f03c6..9592c5d5 100644
--- a/ComicNodes/Tests/ComicInfoTests.cs
+++ b/ComicNodes/Tests/ComicInfoTests.cs
@@ -92,6 +92,33 @@ public class ComicInfoTests : TestBase
         Assert.AreEqual("Ultimate Spider-Man (2000) - Volume 5 - Public Scrutiny.cbz", name.Value);
     }
     
+    [TestMethod]
+    public void Volume2()
+    {
+        var result = CreateComicInfo.GetInfo(Logger,
+            "/home/john/Comics/Marvel/X-Men/X-Men The Complete Age of Apocalypse Epic/X-Men The Complete Age of Apocalypse Epic - Vol 3.cbz", 
+            "/home/john/Comics",
+            true);
+
+        TestContext.WriteLine(Logger.ToString());
+
+        Assert.IsFalse(result.IsFailed);
+        var info = result.Value;
+        Assert.IsNotNull(info);
+        Assert.AreEqual("Marvel", info.Publisher);
+        Assert.AreEqual("X-Men The Complete Age of Apocalypse Epic", info.Series);
+        Assert.AreEqual("Volume 3", info.Volume);
+        Assert.AreEqual(null, info.Title);
+
+        var xml = CreateComicInfo.SerializeToXml(info);
+        Assert.IsFalse(string.IsNullOrWhiteSpace(xml));
+        TestContext.WriteLine(new string('-', 70));
+        TestContext.WriteLine(xml);
+        
+        var name = CreateComicInfo.GetNewName(info, "cbz", 0);
+        Assert.AreEqual("X-Men The Complete Age of Apocalypse Epic - Volume 3.cbz", name.Value);
+    }
+
     
     [TestMethod]
     public void NameAndNumber()
@@ -226,6 +253,7 @@ public class ComicInfoTests : TestBase
         var name = CreateComicInfo.GetNewName(info, "cbz", 3);
         Assert.AreEqual("Batman - The Killing Joke.cbz", name.Value);
     }
+    
     [TestMethod]
     public void NameAndNumber2()
     {
diff --git a/FileFlows.Plugin.dll b/FileFlows.Plugin.dll
index 6f179844e678d015825cf59774f1aae3da6caa91..2736fff41b6c9d651cf374ae462ae27fca380e96 100644
GIT binary patch
delta 250
zcmZoT!_jbtV?qZ@QE%72#-7$5#;rX}CpZMYEeUz-8NbnCZT?g<>GwQV+fz81vV}Cv
z&6Cp1EfSM0j4X^yjFS?L3{s6P5-p6AO_Pnxj10_-%necuEltd~f0t%zWMpAoAJjj+
zMwTf+pm2q#s}9F{uVs@TxGkOj_`~!&vP||0P|;IqP*IS2mlOXoZ21i%E14Ew+-@z$
z^p(ZmoWYzSi6IS0S}-IsBm+q!Fg9T@28t&Fc?JxrKsHF$0!Sw_m;$j8gBe%`M4AIt
Uq%asVSTdL}m~XFFW@=;t0K^7L=Kufz

delta 250
zcmZoT!_jbtV?qbZy*&><H1@RiFmCN(I>8~Z>%Vli&16Q8{nq>Egk?ncY)|22$`;Z{
zwlq(%G`2`eGE6i~GcYwvHb_fNHZx64NwrK$GdE7POi47eOioGK{#}}>k&)$x9_P*J
zHL^?r0?N6UtgrPgbm}~MY}H8)u7c@zWSQ(0prTElP*I@zNPT6Mpb5qcnu7%{Ds8ux
zWBSVCpUhy%V9t;NB#jv?7?Oa{kRcI>(-;gGOc~4=l7Vy@Ln@Fq1M*XWDpP@KlYnC8
YKph}<3Q)ZnkWL1&lD5|?Gc_^+0K14zP5=M^

diff --git a/FileFlows.Plugin.pdb b/FileFlows.Plugin.pdb
index 6ec86341656ceb7b1b18c7f50228b124e12a9d11..c65357937aa347c522b62ba3c4468b0997b2bd3d 100644
GIT binary patch
delta 2834
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

delta 2832
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