diff --git a/API.Tests/Parser/ComicParserTests.cs b/API.Tests/Parser/ComicParserTests.cs index 72642b1a0..e0551aac1 100644 --- a/API.Tests/Parser/ComicParserTests.cs +++ b/API.Tests/Parser/ComicParserTests.cs @@ -49,6 +49,7 @@ namespace API.Tests.Parser [InlineData("Chew Script Book (2011) (digital-Empire) SP04", "Chew Script Book")] [InlineData("Batman - Detective Comics - Rebirth Deluxe Edition Book 02 (2018) (digital) (Son of Ultron-Empire)", "Batman - Detective Comics - Rebirth Deluxe Edition Book")] [InlineData("Cyberpunk 2077 - Your Voice 01", "Cyberpunk 2077")] + [InlineData("Cyberpunk 2077 #01", "Cyberpunk 2077")] [InlineData("Batgirl Vol.2000 #57 (December, 2004)", "Batgirl")] [InlineData("Batgirl V2000 #57", "Batgirl")] public void ParseComicSeriesTest(string filename, string expected) diff --git a/API/Parser/Parser.cs b/API/Parser/Parser.cs index 7e7b32176..9c79e84ad 100644 --- a/API/Parser/Parser.cs +++ b/API/Parser/Parser.cs @@ -312,6 +312,11 @@ namespace API.Parser @"^(?.+?)(\s|_|-)?(?:Ep\.?)(\s|_|-)+\d+", MatchOptions, RegexTimeout), + // Batgirl Vol.2000 #57 (December, 2004) + new Regex( + @"^(?.+?)Vol\.?\s?#?(?:\d+)", + MatchOptions, + RegexTimeout), // Batman & Catwoman - Trail of the Gun 01, Batman & Grendel (1996) 01 - Devil's Bones, Teen Titans v1 001 (1966-02) (digital) (OkC.O.M.P.U.T.O.-Novus) new Regex( @"^(?.+?)(?: \d+)", @@ -351,6 +356,11 @@ namespace API.Parser @"^(?.*)(?: |_)v(?\d+)", MatchOptions, RegexTimeout), + // Batgirl Vol.2000 #57 (December, 2004) + new Regex( + @"^(?.+?)(?:\s|_)vol\.?\s?(?\d+)", + MatchOptions, + RegexTimeout), }; private static readonly Regex[] ComicChapterRegex = new[] @@ -380,6 +390,11 @@ namespace API.Parser @"^(?.+?)(?: |_)(c? ?)(?(\d+(\.\d)?)-?(\d+(\.\d)?)?)(c? ?)-", MatchOptions, RegexTimeout), + // Batgirl Vol.2000 #57 (December, 2004) + new Regex( + @"^(?.+?)(?:vol\.?\d+)\s#(?\d+)", + MatchOptions, + RegexTimeout), // Batman & Catwoman - Trail of the Gun 01, Batman & Grendel (1996) 01 - Devil's Bones, Teen Titans v1 001 (1966-02) (digital) (OkC.O.M.P.U.T.O.-Novus) new Regex( @"^(?.+?)(?: (?\d+))",