diff --git a/API.Tests/ParserTest.cs b/API.Tests/ParserTest.cs index 0d13f7628..0190e6dc7 100644 --- a/API.Tests/ParserTest.cs +++ b/API.Tests/ParserTest.cs @@ -101,9 +101,6 @@ namespace API.Tests [InlineData("Kedouin Makoto - Corpse Party Musume, Chapter 09", "Kedouin Makoto - Corpse Party Musume")] [InlineData("Goblin Slayer Side Story - Year One 025.5", "Goblin Slayer Side Story - Year One")] [InlineData("Goblin Slayer - Brand New Day 006.5 (2019) (Digital) (danke-Empire)", "Goblin Slayer - Brand New Day")] - [InlineData("Yumekui-Merry_DKThias_Chapter11v2.zip", "Yumekui-Merry")] - [InlineData("Yumekui-Merry DKThiasScanlations Chapter51v2", "Yumekui-Merry")] - [InlineData("Yumekui-Merry_DKThiasScanlations&RenzokuseiScans_Chapter61", "Yumekui-Merry")] public void ParseSeriesTest(string filename, string expected) { Assert.Equal(expected, ParseSeries(filename)); @@ -144,7 +141,6 @@ namespace API.Tests [InlineData("Vol 1", "0")] [InlineData("VanDread-v01-c001[MD].zip", "1")] [InlineData("Goblin Slayer Side Story - Year One 025.5", "25.5")] - [InlineData("Mob Psycho 100 v02 (2019) (Digital) (Shizu).cbz", "0")] public void ParseChaptersTest(string filename, string expected) { Assert.Equal(expected, ParseChapter(filename)); @@ -306,10 +302,7 @@ namespace API.Tests Chapters = "6.5", Filename = "Goblin Slayer - Brand New Day 006.5 (2019) (Digital) (danke-Empire).cbz", Format = MangaFormat.Archive, FullFilePath = filepath }); - - - - + foreach (var file in expected.Keys) { diff --git a/API/Parser/Parser.cs b/API/Parser/Parser.cs index 1e860ab28..27b6309c1 100644 --- a/API/Parser/Parser.cs +++ b/API/Parser/Parser.cs @@ -124,9 +124,10 @@ namespace API.Parser RegexOptions.IgnoreCase | RegexOptions.Compiled), // [Suihei Kiki]_Kasumi_Otoko_no_Ko_[Taruby]_v1.1.zip new Regex( - @"v\d+\.(?\d+(?:.\d+|-\d+)?)", RegexOptions.IgnoreCase | RegexOptions.Compiled), + // Mob Psycho 100 + // Hinowa ga CRUSH! 018 (2019) (Digital) (LuCaZ).cbz, Hinowa ga CRUSH! 018.5 (2019) (Digital) (LuCaZ).cbz new Regex( @"^(?!Vol)(?.*) (?\d+(?:.\d+|-\d+)?)(?: \(\d{4}\))?",