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

Fixed a bug where a new lirary scan would break due to scan series not properly filtering out parsed series (#423)

Browse source
This commit is contained in:
Joseph Milazzo 2021-07-23 21:52:57 -05:00 • committed by GitHub
parent ebd4ec25bf
commit 78ad01f5ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
API/Extensions/SeriesExtensions.cs
View file

@ -43,7 +43,8 @@ namespace API.Extensions
{ {
if (info == null) return false; if (info == null) return false;
return Parser.Parser.Normalize(info.Series) == series.NormalizedName || Parser.Parser.Normalize(info.Series) == Parser.Parser.Normalize(series.Name) return Parser.Parser.Normalize(info.Series) == series.NormalizedName || Parser.Parser.Normalize(info.Series) == Parser.Parser.Normalize(series.Name)
|| info.Series == series.Name || info.Series == series.LocalizedName || info.Series == series.OriginalName || Parser.Parser.Normalize(info.Series) == Parser.Parser.Normalize(series.OriginalName); || info.Series == series.Name || info.Series == series.LocalizedName || info.Series == series.OriginalName
|| Parser.Parser.Normalize(info.Series) == Parser.Parser.Normalize(series.OriginalName);
} }
} }
} }

9
API/Services/Tasks/ScannerService.cs
View file

@ -55,7 +55,7 @@ namespace API.Services.Tasks
// Hence we clear out anything but what we selected for // Hence we clear out anything but what we selected for
var firstSeries = library.Series.FirstOrDefault(); var firstSeries = library.Series.FirstOrDefault();
var keys = parsedSeries.Keys; var keys = parsedSeries.Keys;
foreach (var key in keys.Where(key => !firstSeries.NameInParserInfo(parsedSeries[key].FirstOrDefault()))) foreach (var key in keys.Where(key => !firstSeries.NameInParserInfo(parsedSeries[key].FirstOrDefault()) || firstSeries?.Format != key.Format))
{ {
parsedSeries.Remove(key); parsedSeries.Remove(key);
} }
@ -202,13 +202,6 @@ namespace API.Services.Tasks
} }
} }
if (library.Series.Count == 0)
{
_logger.LogDebug("Removed all Series, returning without checking reset of files scanned");
return;
}
// Add new series that have parsedInfos // Add new series that have parsedInfos
foreach (var (key, infos) in parsedSeries) foreach (var (key, infos) in parsedSeries)
{ {