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

Implemented partial chapter support. Fixed some edge case where if library scan was skipped due to no modififcation on disk, whole library would be removed. Removed above code for testing.

Browse Source
This commit is contained in:
Joseph Milazzo 2021-02-07 13:07:07 -06:00
parent b30560fdda
commit 57f74d3de3
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
API/Controllers/AccountController.cs
View File

@ -102,10 +102,6 @@ namespace API.Controllers
.Include(u => u.UserPreferences) .Include(u => u.UserPreferences)
.SingleOrDefaultAsync(x => x.NormalizedUserName == loginDto.Username.ToUpper()); .SingleOrDefaultAsync(x => x.NormalizedUserName == loginDto.Username.ToUpper());
var debugUsers = await _userManager.Users.Select(x => x.NormalizedUserName).ToListAsync();
_logger.LogInformation($"All Users: {string.Join(",", debugUsers)}");
if (user == null) return Unauthorized("Invalid username"); if (user == null) return Unauthorized("Invalid username");
var result = await _signInManager var result = await _signInManager

14
API/Parser/Parser.cs
View File

@ -111,28 +111,28 @@ namespace API.Parser
private static readonly Regex[] MangaChapterRegex = new[] private static readonly Regex[] MangaChapterRegex = new[]
{ {
new Regex( new Regex(
@"(c|ch)(\.? ?)(?<Chapter>\d+-?\d*)", @"(c|ch)(\.? ?)(?<Chapter>\d+(?:.\d+|-\d+)?)",
RegexOptions.IgnoreCase | RegexOptions.Compiled), RegexOptions.IgnoreCase | RegexOptions.Compiled),
// [Suihei Kiki]_Kasumi_Otoko_no_Ko_[Taruby]_v1.1.zip // [Suihei Kiki]_Kasumi_Otoko_no_Ko_[Taruby]_v1.1.zip
new Regex( new Regex(
@"v\d+\.(?<Chapter>\d+-?\d*)", @"v\d+\.(?<Chapter>\d+(?:.\d+|-\d+)?)",
RegexOptions.IgnoreCase | RegexOptions.Compiled), RegexOptions.IgnoreCase | RegexOptions.Compiled),
// Hinowa ga CRUSH! 018 (2019) (Digital) (LuCaZ).cbz // Hinowa ga CRUSH! 018 (2019) (Digital) (LuCaZ).cbz,Hinowa ga CRUSH! 018.5 (2019) (Digital) (LuCaZ).cbz
new Regex( new Regex(
@"(?<Series>.*) (?<Chapter>\d+) (?:\(\d{4}\))", @"(?<Series>.*) (?<Chapter>\d+(?:.\d+|-\d+)?)(?: \(\d{4}\))?",
RegexOptions.IgnoreCase | RegexOptions.Compiled), RegexOptions.IgnoreCase | RegexOptions.Compiled),
// Tower Of God S01 014 (CBT) (digital).cbz // Tower Of God S01 014 (CBT) (digital).cbz
new Regex( new Regex(
@"(?<Series>.*) S(?<Volume>\d+) (?<Chapter>\d+)", @"(?<Series>.*) S(?<Volume>\d+) (?<Chapter>\d+(?:.\d+|-\d+)?)",
RegexOptions.IgnoreCase | RegexOptions.Compiled), RegexOptions.IgnoreCase | RegexOptions.Compiled),
// Beelzebub_01_[Noodles].zip // Beelzebub_01_[Noodles].zip
new Regex( new Regex(
@"^((?!v|vo|vol|Volume).)*( |_)(?<Chapter>\.?\d+)( |_|\[|\()", @"^((?!v|vo|vol|Volume).)*( |_)(?<Chapter>\.?\d+(?:.\d+|-\d+)?)( |_|\[|\()",
RegexOptions.IgnoreCase | RegexOptions.Compiled), RegexOptions.IgnoreCase | RegexOptions.Compiled),
// Yumekui-Merry_DKThias_Chapter21.zip // Yumekui-Merry_DKThias_Chapter21.zip
new Regex( new Regex(
@"Chapter(?<Chapter>\d+(-\d+)?)", @"Chapter(?<Chapter>\d+(-\d+)?)", //(?:.\d+|-\d+)?
RegexOptions.IgnoreCase | RegexOptions.Compiled), RegexOptions.IgnoreCase | RegexOptions.Compiled),
}; };

28
API/Services/ScannerService.cs
View File

@ -57,13 +57,16 @@ namespace API.Services
_logger.LogInformation($"Beginning scan on {library.Name}. Forcing metadata update: {forceUpdate}"); _logger.LogInformation($"Beginning scan on {library.Name}. Forcing metadata update: {forceUpdate}");
var totalFiles = 0; var totalFiles = 0;
var skippedFolders = 0;
foreach (var folderPath in library.Folders) foreach (var folderPath in library.Folders)
{ {
if (!forceUpdate && Directory.GetLastWriteTime(folderPath.Path) <= folderPath.LastScanned) // if (!forceUpdate && Directory.GetLastWriteTime(folderPath.Path) <= folderPath.LastScanned)
{ // {
_logger.LogDebug($"{folderPath.Path} hasn't been updated since last scan. Skipping."); // // NOTE: This solution isn't the best, but it has potential. We need to handle a few other cases so it works great.
continue; // _logger.LogDebug($"{folderPath.Path} hasn't been updated since last scan. Skipping.");
} // skippedFolders += 1;
// continue;
// }
try { try {
totalFiles += DirectoryService.TraverseTreeParallelForEach(folderPath.Path, (f) => totalFiles += DirectoryService.TraverseTreeParallelForEach(folderPath.Path, (f) =>
@ -81,6 +84,17 @@ namespace API.Services
catch (ArgumentException ex) { catch (ArgumentException ex) {
_logger.LogError(ex, $"The directory '{folderPath}' does not exist"); _logger.LogError(ex, $"The directory '{folderPath}' does not exist");
} }
folderPath.LastScanned = DateTime.Now;
}
if (skippedFolders == library.Folders.Count)
{
_logger.LogInformation("All Folders were skipped due to no modifications to the directories.");
_unitOfWork.LibraryRepository.Update(library);
_scannedSeries = null;
_logger.LogInformation("Processed {0} files in {1} milliseconds for {2}", totalFiles, sw.ElapsedMilliseconds, library.Name);
return;
} }
var filtered = _scannedSeries.Where(kvp => kvp.Value.Count != 0); var filtered = _scannedSeries.Where(kvp => kvp.Value.Count != 0);
@ -92,7 +106,7 @@ namespace API.Services
// Remove series that are no longer on disk // Remove series that are no longer on disk
RemoveSeriesNotOnDisk(allSeries, series, library); RemoveSeriesNotOnDisk(allSeries, series, library);
foreach (var folder in library.Folders) folder.LastScanned = DateTime.Now; //foreach (var folder in library.Folders) folder.LastScanned = DateTime.Now;
_unitOfWork.LibraryRepository.Update(library); _unitOfWork.LibraryRepository.Update(library);
if (Task.Run(() => _unitOfWork.Complete()).Result) if (Task.Run(() => _unitOfWork.Complete()).Result)
@ -185,7 +199,7 @@ namespace API.Services
if (info == null) if (info == null)
{ {
_logger.LogInformation($"Could not parse series from {path}"); _logger.LogWarning($"Could not parse from {path}");
return; return;
} }