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

More Scanner Work (#2994)

Browse Source
This commit is contained in:
Joe Milazzo 2024-06-10 15:10:00 -05:00 committed by GitHub
parent 1de426070b
commit 982253f1b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
API/Data/Repositories/SeriesRepository.cs
View File

@ -2118,7 +2118,8 @@ public class SeriesRepository : ISeriesRepository
LowestFolderPath = s.LowestFolderPath, LowestFolderPath = s.LowestFolderPath,
Format = s.Format, Format = s.Format,
LibraryRoots = s.Library.Folders.Select(f => f.Path) LibraryRoots = s.Library.Folders.Select(f => f.Path)
}).ToListAsync(); })
.ToListAsync();
var map = new Dictionary<string, IList<SeriesModified>>(); var map = new Dictionary<string, IList<SeriesModified>>();
foreach (var series in info) foreach (var series in info)
@ -2137,7 +2138,7 @@ public class SeriesRepository : ISeriesRepository
} }
if (string.IsNullOrEmpty(series.LowestFolderPath)) continue; if (string.IsNullOrEmpty(series.LowestFolderPath) || series.FolderPath.Equals(series.LowestFolderPath)) continue;
if (!map.TryGetValue(series.LowestFolderPath, out var value2)) if (!map.TryGetValue(series.LowestFolderPath, out var value2))
{ {
map.Add(series.LowestFolderPath, new List<SeriesModified>() map.Add(series.LowestFolderPath, new List<SeriesModified>()

8
API/Services/Tasks/Scanner/ParseScannedFiles.cs
View File

@ -145,14 +145,16 @@ public class ParseScannedFiles
} }
result.Add(CreateScanResult(directory, folderPath, false, ArraySegment<string>.Empty)); result.Add(CreateScanResult(directory, folderPath, false, ArraySegment<string>.Empty));
} }
else if (seriesPaths.TryGetValue(directory, out var series) && series.All(s => !string.IsNullOrEmpty(s.LowestFolderPath))) else if (!forceCheck && seriesPaths.TryGetValue(directory, out var series) && series.Count > 1 && series.All(s => !string.IsNullOrEmpty(s.LowestFolderPath)))
{ {
// If there are multiple series inside this path, let's check each of them to see which was modified and only scan those // If there are multiple series inside this path, let's check each of them to see which was modified and only scan those
// This is very helpful for ComicVine libraries by Publisher // This is very helpful for ComicVine libraries by Publisher
_logger.LogDebug("[ProcessFiles] {Directory} is dirty and has multiple series folders, checking if we can avoid a full scan", directory); _logger.LogDebug("[ProcessFiles] {Directory} is dirty and has multiple series folders, checking if we can avoid a full scan", directory);
foreach (var seriesModified in series) foreach (var seriesModified in series)
{ {
var hasFolderChangedSinceLastScan = library.LastScanned.Truncate(TimeSpan.TicksPerSecond) <
// TODO: We can check directly against seriesModified.LastScanned instead of library scan
var hasFolderChangedSinceLastScan = forceCheck || library.LastScanned.Truncate(TimeSpan.TicksPerSecond) <
_directoryService _directoryService
.GetLastWriteTime(seriesModified.LowestFolderPath!) .GetLastWriteTime(seriesModified.LowestFolderPath!)
.Truncate(TimeSpan.TicksPerSecond); .Truncate(TimeSpan.TicksPerSecond);
@ -167,7 +169,7 @@ public class ParseScannedFiles
} }
else else
{ {
_logger.LogDebug("[ProcessFiles] {Directory} subfolder {Folder} changed, adding folders", directory, seriesModified.LowestFolderPath); _logger.LogDebug("[ProcessFiles] {Directory} subfolder {Folder} changed for Series {SeriesName}", directory, seriesModified.LowestFolderPath, seriesModified.SeriesName);
result.Add(CreateScanResult(directory, folderPath, true, result.Add(CreateScanResult(directory, folderPath, true,
_directoryService.ScanFiles(seriesModified.LowestFolderPath!, fileExtensions, matcher))); _directoryService.ScanFiles(seriesModified.LowestFolderPath!, fileExtensions, matcher)));
} }