From fd4a08d8d284339a7048fcea99294fb44be868f4 Mon Sep 17 00:00:00 2001
From: John Andrews <john@reven.co.nz>
Date: Tue, 7 May 2024 19:02:26 +1200
Subject: [PATCH] FF-1530: DeleteNonPageImages

---
 ComicNodes/Comics/CreateComicInfo.cs |   2 ++
 ComicNodes/Tests/ComicInfoTests.cs   |  26 ++++++++++++++++++++++++++
 FileFlows.Plugin.dll                 | Bin 139264 -> 139264 bytes
 FileFlows.Plugin.pdb                 | Bin 33916 -> 33916 bytes
 4 files changed, 28 insertions(+)

diff --git a/ComicNodes/Comics/CreateComicInfo.cs b/ComicNodes/Comics/CreateComicInfo.cs
index 9b71e160..762cc288 100644
--- a/ComicNodes/Comics/CreateComicInfo.cs
+++ b/ComicNodes/Comics/CreateComicInfo.cs
@@ -242,6 +242,8 @@ public class CreateComicInfo : Node
             parts = shortname.Split('#');
             if (parts.Length < 2)
             {
+                // remove any junk
+                shortname = Regex.Replace(shortname, @"\s*\([^)]*\)\s*", " ").Trim();
                 var lastChanceMatch = Regex.Match(shortname, @"(\d)+$");
                 if(lastChanceMatch.Success)
                 {
diff --git a/ComicNodes/Tests/ComicInfoTests.cs b/ComicNodes/Tests/ComicInfoTests.cs
index 25781651..4fade6b7 100644
--- a/ComicNodes/Tests/ComicInfoTests.cs
+++ b/ComicNodes/Tests/ComicInfoTests.cs
@@ -120,6 +120,32 @@ public class ComicInfoTests : TestBase
     }
 
     
+    [TestMethod]
+    public void NameAndNumber2()
+    {
+        var result = CreateComicInfo.GetInfo(Logger,
+            "/home/john/Comics/Marvel/X-Men/X-Man/X-Man 005 (1995) (digital) (Sierra-HD).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-Man", info.Series);
+        Assert.AreEqual(5, info.Number);
+
+        var xml = CreateComicInfo.SerializeToXml(info);
+        Assert.IsFalse(string.IsNullOrWhiteSpace(xml));
+        TestContext.WriteLine(new string('-', 70));
+        TestContext.WriteLine(xml);
+        
+        var name = CreateComicInfo.GetNewName(info, "cbz", 3);
+        Assert.AreEqual("X-Man - #005.cbz", name.Value);
+    }
+
     [TestMethod]
     public void PhysicalFileTest()
     {
diff --git a/FileFlows.Plugin.dll b/FileFlows.Plugin.dll
index b976a0bcdfb6d733fb80c529c062b4bd788fd413..d8888e4d0e51bc0e3ebdfae5a628bc2dfb529caa 100644
GIT binary patch
delta 250
zcmZoTz|nAkV?qZ@wEwhqjXkYBj9Yt{G?)e6{&^c~6zk+Vmm_XVK%1=2_9M(pvjsI0
z4b76wjExLUjf_l_lMT~SEG<&ZEDTdqQqz)5Op-0ljm(mbEX@<Qw~I10GO}>76uzI%
zBhC~cApOZa+A`&nL$gps@aZ0&sOdT4O!f*;(F2E}qCoZez57n48k%hCTRSmk{r1!1
zOsTB?i42AeW(-L{Y|LN;WSas>BOsX!goX@h3@Hqj3>HAr3`iO>qykx~K+z-y6Cg|m
V%9#UIn*muyV0Pm6dReAMCIC^zN0I;l

delta 250
zcmZoTz|nAkV?qbZbo1wj8hcuM7`OH?X)p`i_i|K9`~Smls?LPl%0Aq7+mA3a%@))!
zH84sxH%PHCHa0gmGEO#6v`jTkN=r2{H!?}FFfp_+F-<W`O*T*3-Y&}2$jI{Cp=SDY
z9&x4sfh`YTtql$qa9w#_lKowi<NE12;!O4mP|>3>QIPtLFItaGDd_mOt#j$o?We_=
zQd#{?84MVV7?K&xfpiLk1%ojVnggK`kOqk+GFURCGMF+XF{A-$6R?a4SfvSrAyB;u
UP%eeR3@8UuowU7PmZ^~m0KnExV*mgE

diff --git a/FileFlows.Plugin.pdb b/FileFlows.Plugin.pdb
index 74c14c7d3c1b21f5d9706ae763d62f2b2198d5de..6327aceb23c1935f041408b35d57d0f4971af054 100644
GIT binary patch
delta 467
zcmV;^0WALfhywhG0+4(Z8}c_>Ib`xcgA!O%%Zv<K3IuWQv5?9;f0>g^?dKkM25AZw
zf29|T-iK{1!X9`he*}GLbF%>>Ac0rv0{{T6lTAy*KoExS`4vM?iZn5?O<OBMEmS-R
zr7e0850lL#S=j8#epvGF-BepzMCl>3r+sJknGa^8sNbmtQ3QABtm>B}Nu#CwzSUaW
zRNMelIl&eU9Q=?qe}G_>5}}XW2hS^%B^j@SZQm7K5Y*TJLuUxMWJ+sd7BZ^vlPe7<
zbJ%hryaGZQ3%uCFY(?LRJxJ3bbGWNE`dx0vGYOpGvV?VGEY;JKTezY^_%^tb(;#?5
zW2nwVbNkyJ&VGDzRezvtX4Yz+IZGG4g`dqrsI3W?!j)Y1e=gt8MahDf&iC!rBjAbz
zp`o)mZ2>Q&%_$`guiJAr<w+Jw*SlI!{DHf|IL*?VBpxQokg>SPC*wRF$COi%4F+s7
zN>Y|gMtFACrB=CPwu^CYxE0g|=-*kkOZ#~IdD`uMUOzZ4a(LC;(%i55LStEzw7`VV
z7zV)?0W$$Hlh-|AC}A-+Vm31}F*PzWHDhBjW@I@yWHvZ4Wn^V$Vl*^kIX5ykV=_56
JVY6U997dD<(|rH{

delta 467
zcmV;^0WALfhywhG0+4(ZwBhQlQ&SK{sn;0??t($D=Rkayv5?9;f81H=6C=_0ktS^>
zYWE{h(qq|QlO2YV8dPIueT;21>48`30{{T6lS@kjF%ZY^`zZ!bigdS+ty`@KwNUXO
zl(y(WJY<vE-9R>xJS_X|O{y&|McKnnPWjK|HxDLB((BZsB!PS4tm>60Q4@>oA!xxi
z6*oW?L)a1n2S4Nue-N-riP%T(gXa~IB^s}T4etsr5Ngr@CC(slNtM<}E#z2{FRnBY
z$zaQc@CpcJEbw9vvlad%_8^Ui%<-<;<h<ODXA(KXWeMxXSgfZfw|Iqx@NIA<r&07y
zjKMk=&E2^>p8fjfs{SOhnOUoO?krwjEc|R1LTydF6t3j*f8y$+ElL)=biQw|9syS<
zkQi*u2?e~OHm8(9+z+QU<yjU=*SlJX_yc!6?hk3!XOqz=%Z4MGky{++1*X|BWs`I;
zNyqF4X_mLny3~p}YP%TchFgJMfc~9jSlXxK&l9%$W&P;5VDP57#kpVgg(hW<(gGDe
zV;n`_0W$$Hlh-|AC^axLV>d8lI5RUhH!?G0H(@ztHDYFEG&eFdWH>Z2I5ah6Hf3Ws
JVzXdA97cEr*>L~>