FF-1530: DeleteNonPageImages

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)
                 {

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()
     {