From 31fa44859cd62045432b525353fb0a1a6b7b6926 Mon Sep 17 00:00:00 2001 From: majora2007 Date: Mon, 15 Nov 2021 23:00:14 +0000 Subject: [PATCH 1/4] Bump versions by dotnet-bump-version. --- Kavita.Common/Kavita.Common.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kavita.Common/Kavita.Common.csproj b/Kavita.Common/Kavita.Common.csproj index 6bf9fd80e..9893d4842 100644 --- a/Kavita.Common/Kavita.Common.csproj +++ b/Kavita.Common/Kavita.Common.csproj @@ -4,7 +4,7 @@ net5.0 kavitareader.com Kavita - 0.4.8.13 + 0.4.8.14 en From 17779fd8adf47b0f3546d148c0d2847396388552 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Tue, 16 Nov 2021 08:07:42 -0600 Subject: [PATCH 2/4] Fixed some comic parsing bugs based on user report (#758) (#761) --- API.Tests/Parser/ComicParserTests.cs | 5 +++++ API/Parser/Parser.cs | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/API.Tests/Parser/ComicParserTests.cs b/API.Tests/Parser/ComicParserTests.cs index ccfd672bc..043c0e027 100644 --- a/API.Tests/Parser/ComicParserTests.cs +++ b/API.Tests/Parser/ComicParserTests.cs @@ -58,6 +58,11 @@ namespace API.Tests.Parser [InlineData("2000 AD 0366 [1984-04-28] (flopbie)", "2000 AD")] [InlineData("Daredevil - v6 - 10 - (2019)", "Daredevil")] [InlineData("Batman - The Man Who Laughs #1 (2005)", "Batman - The Man Who Laughs")] + [InlineData("Demon 012 (Sep 1973) c2c", "Demon")] + [InlineData("Dragon Age - Until We Sleep 01 (of 03)", "Dragon Age - Until We Sleep")] + [InlineData("Green Lantern v2 017 - The Spy-Eye that doomed Green Lantern v2", "Green Lantern")] + [InlineData("Green Lantern - Circle of Fire Special - Adam Strange (2000)", "Green Lantern - Circle of Fire - Adam Strange")] + [InlineData("Identity Crisis Extra - Rags Morales Sketches (2005)", "Identity Crisis - Rags Morales Sketches")] public void ParseComicSeriesTest(string filename, string expected) { Assert.Equal(expected, API.Parser.Parser.ParseComicSeries(filename)); diff --git a/API/Parser/Parser.cs b/API/Parser/Parser.cs index efc15f36b..02dc6894c 100644 --- a/API/Parser/Parser.cs +++ b/API/Parser/Parser.cs @@ -258,19 +258,19 @@ namespace API.Parser MatchOptions, RegexTimeout), // Teen Titans v1 001 (1966-02) (digital) (OkC.O.M.P.U.T.O.-Novus) new Regex( - @"^(?.*)(?: |_)v\d+", + @"^(?.+?)(?: |_)v\d+", MatchOptions, RegexTimeout), // Amazing Man Comics chapter 25 new Regex( - @"^(?.*)(?: |_)c(hapter) \d+", + @"^(?.+?)(?: |_)c(hapter) \d+", MatchOptions, RegexTimeout), // Amazing Man Comics issue #25 new Regex( - @"^(?.*)(?: |_)i(ssue) #\d+", + @"^(?.+?)(?: |_)i(ssue) #\d+", MatchOptions, RegexTimeout), // Batman Wayne Family Adventures - Ep. 001 - Moving In new Regex( - @"^(?.+?)(\s|_|-)?(?:Ep\.?)(\s|_|-)+\d+", + @"^(?.+?)(\s|_|-)(?:Ep\.?)(\s|_|-)+\d+", MatchOptions, RegexTimeout), // Batgirl Vol.2000 #57 (December, 2004) new Regex( @@ -286,7 +286,7 @@ namespace API.Parser MatchOptions, RegexTimeout), // Scott Pilgrim 02 - Scott Pilgrim vs. The World (2005) new Regex( - @"^(?.*)(?: |_)(?\d+)", + @"^(?.+?)(?: |_)(?\d+)", MatchOptions, RegexTimeout), // The First Asterix Frieze (WebP by Doc MaKS) new Regex( @@ -887,7 +887,7 @@ namespace API.Parser { if (match.Success) { - title = title.Replace(match.Value, "").Trim(); + title = title.Replace(match.Value, string.Empty).Trim(); } } } @@ -904,7 +904,7 @@ namespace API.Parser { if (match.Success) { - title = title.Replace(match.Value, "").Trim(); + title = title.Replace(match.Value, string.Empty).Trim(); } } } @@ -950,7 +950,7 @@ namespace API.Parser { if (match.Success) { - title = title.Replace(match.Value, ""); + title = title.Replace(match.Value, string.Empty); } } } From 292fbe4d70cc7f09708b3dc64f3e1e14def000c2 Mon Sep 17 00:00:00 2001 From: majora2007 Date: Tue, 16 Nov 2021 14:16:51 +0000 Subject: [PATCH 3/4] Bump versions by dotnet-bump-version. --- Kavita.Common/Kavita.Common.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kavita.Common/Kavita.Common.csproj b/Kavita.Common/Kavita.Common.csproj index 9893d4842..16c729a62 100644 --- a/Kavita.Common/Kavita.Common.csproj +++ b/Kavita.Common/Kavita.Common.csproj @@ -4,7 +4,7 @@ net5.0 kavitareader.com Kavita - 0.4.8.14 + 0.4.8.15 en From bc210c62fae3ea3b5e77990be683c353c2cc6367 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Tue, 16 Nov 2021 08:24:58 -0600 Subject: [PATCH 4/4] Up budget on style bundle size (#763) --- UI/Web/angular.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/Web/angular.json b/UI/Web/angular.json index abcdbcca9..a78e625b0 100644 --- a/UI/Web/angular.json +++ b/UI/Web/angular.json @@ -71,7 +71,7 @@ { "type": "anyComponentStyle", "maximumWarning": "2kb", - "maximumError": "4kb" + "maximumError": "5kb" } ] }