AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

v0.8.4.1 - Hotfix (#3419)

Browse source 
Co-authored-by: Weblate (bot) <hosted@weblate.org>
Co-authored-by: Adam Beneš <toohka@protonmail.com>
Co-authored-by: Dark77 <Dark77@pobox.sk>
Co-authored-by: Frozehunter <frozehunter@me.com>
Co-authored-by: Havokdan <havokdan@yahoo.com.br>
Co-authored-by: Yoan Jacquemin <yoanjacquemin@gmail.com>
Co-authored-by: aleixcox <18121624@qq.com>
Co-authored-by: mag37 <robin.ivehult@gmail.com>
This commit is contained in:
Joe Milazzo 2024-11-27 11:04:18 -06:00 • committed by GitHub
parent d4028a8d68
commit ac47cbd75f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 300 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

4
API/Services/Tasks/Scanner/ParseScannedFiles.cs
View file

@ -818,11 +818,11 @@ public class ParseScannedFiles
chapter.IssueOrder = counter;
// Increment for next chapter (unless the next has a similar value, then add 0.1)
if (!string.IsNullOrEmpty(prevIssue) && float.TryParse(prevIssue, CultureInfo.InvariantCulture, out var prevIssueFloat) && parsedChapter.Is(prevIssueFloat))
if (!string.IsNullOrEmpty(prevIssue) && float.TryParse(prevIssue, NumberStyles.Any, CultureInfo.InvariantCulture, out var prevIssueFloat) && parsedChapter.Is(prevIssueFloat))
{
counter += 0.1f; // bump if same value as the previous issue
}
prevIssue = $"{parsedChapter}";
prevIssue = $"{parsedChapter.ToString(CultureInfo.InvariantCulture)}";
}
else
{

15
API/Services/Tasks/Scanner/Parser/Parser.cs
View file

@ -10,7 +10,7 @@ using API.Extensions;
namespace API.Services.Tasks.Scanner.Parser;
#nullable enable
public static class Parser
public static partial class Parser
{
// NOTE: If you change this, don't forget to change in the UI (see Series Detail)
public const string DefaultChapter = "-100000"; // -2147483648
@ -1054,7 +1054,7 @@ public static class Parser
}
// Check if there is a range or not
if (Regex.IsMatch(range, @"\d-{1}\d"))
if (NumberRangeRegex().IsMatch(range))
{
var tokens = range.Replace("_", string.Empty).Split("-", StringSplitOptions.RemoveEmptyEntries);
@ -1081,7 +1081,7 @@ public static class Parser
}
// Check if there is a range or not
if (Regex.IsMatch(range, @"\d-{1}\d"))
if (NumberRangeRegex().IsMatch(range))
{
var tokens = range.Replace("_", string.Empty).Split("-", StringSplitOptions.RemoveEmptyEntries);
@ -1244,10 +1244,15 @@ public static class Parser
{
if (string.IsNullOrEmpty(filename)) return filename;
if (Regex.IsMatch(filename, SupportedExtensions))
if (SupportedExtensionsRegex().IsMatch(filename))
{
return Regex.Replace(filename, SupportedExtensions, string.Empty);
return SupportedExtensionsRegex().Replace(filename, string.Empty);
}
return filename;
}
[GeneratedRegex(SupportedExtensions)]
private static partial Regex SupportedExtensionsRegex();
[GeneratedRegex(@"\d-{1}\d")]
private static partial Regex NumberRangeRegex();
}