Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-07-09 03:04:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix StoryArc & StoryArcNumber mismatch (#2018)

Browse Source 
* Ensure StoryArc and StoryArcNumber are max length

* Trim StoryArc to remove excess spaces.

* Replaced with cleaner approach.

* Update with majora2007 recommendations
This commit is contained in:
Jolyon Suthers 2023-06-02 21:07:13 +10:00 committed by GitHub
parent b4ff867b49
commit 7f64349ba9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
API/Services/ReadingListService.cs
View File

@ -513,23 +513,24 @@ public class ReadingListService : IReadingListService
var data = new List<Tuple<string, string>>(); var data = new List<Tuple<string, string>>();
if (string.IsNullOrEmpty(storyArc)) return data; if (string.IsNullOrEmpty(storyArc)) return data;
var arcs = storyArc.Split(","); var arcs = storyArc.Split(",", StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
var arcNumbers = storyArcNumbers.Split(","); var arcNumbers = storyArcNumbers.Split(",", StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
if (arcNumbers.Count(s => !string.IsNullOrEmpty(s)) != arcs.Length) if (arcNumbers.Count(s => !string.IsNullOrEmpty(s)) != arcs.Length)
{ {
_logger.LogWarning("There is a mismatch on StoryArc and StoryArcNumber for {FileName}. Def", filename); _logger.LogWarning("There is a mismatch on StoryArc and StoryArcNumber for {FileName}", filename);
} }
var maxPairs = Math.Min(arcs.Length, arcNumbers.Length); var maxPairs = Math.Max(arcs.Length, arcNumbers.Length);
for (var i = 0; i < maxPairs; i++) for (var i = 0; i < maxPairs; i++)
{ {
// When there is a mismatch on arcs and arc numbers, then we should default to a high number var arcNumber = int.MaxValue.ToString();
if (string.IsNullOrEmpty(arcNumbers[i]) && !string.IsNullOrEmpty(arcs[i])) if (arcNumbers.Length > i)
{ {
arcNumbers[i] = int.MaxValue.ToString(); arcNumber = arcNumbers[i];
} }
if (string.IsNullOrEmpty(arcs[i]) || !int.TryParse(arcNumbers[i], out _)) continue;
data.Add(new Tuple<string, string>(arcs[i], arcNumbers[i])); if (string.IsNullOrEmpty(arcs[i]) || !int.TryParse(arcNumber, out _)) continue;
data.Add(new Tuple<string, string>(arcs[i], arcNumber));
} }
return data; return data;