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

Fix an edge case bug where cache directory can get stuck existing but empty, preventing reading.

Browse source
This commit is contained in:
Joseph Milazzo 2025-04-25 09:44:10 -05:00
parent 0ea1116d1d
commit b6e9cca0a3
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
API/Services/CacheService.cs
View file

@ -80,7 +80,6 @@ public class CacheService : ICacheService
/// <returns></returns> /// <returns></returns>
public IEnumerable<FileDimensionDto> GetCachedFileDimensions(string cachePath) public IEnumerable<FileDimensionDto> GetCachedFileDimensions(string cachePath)
{ {
var sw = Stopwatch.StartNew();
var files = _directoryService.GetFilesWithExtension(cachePath, Tasks.Scanner.Parser.Parser.ImageFileExtensions) var files = _directoryService.GetFilesWithExtension(cachePath, Tasks.Scanner.Parser.Parser.ImageFileExtensions)
.OrderByNatural(Path.GetFileNameWithoutExtension) .OrderByNatural(Path.GetFileNameWithoutExtension)
.ToArray(); .ToArray();
@ -186,9 +185,16 @@ public class CacheService : ICacheService
} }
else else
{ {
// Potential BUG: If the folder is left here and there are no files within, this could theoretically return without proper cache // Do an explicit check for files since rarely a "permission denied" error on deleting
// the file can occur, thus leaving an empty folder and we would never re-cache the files.
if (_directoryService.GetFiles(extractPath).Any())
{
return chapter; return chapter;
} }
// Delete the extractPath as ExtractArchive will return if the directory already exists
_directoryService.ClearAndDeleteDirectory(extractPath);
}
} }
var files = chapter?.Files.ToList(); var files = chapter?.Files.ToList();
@ -210,13 +216,13 @@ public class CacheService : ICacheService
/// <returns></returns> /// <returns></returns>
public void ExtractChapterFiles(string extractPath, IReadOnlyList<MangaFile>? files, bool extractPdfImages = false) public void ExtractChapterFiles(string extractPath, IReadOnlyList<MangaFile>? files, bool extractPdfImages = false)
{ {
if (files == null) return; if (files == null || files.Count == 0) return;
var removeNonImages = true; var removeNonImages = true;
var fileCount = files.Count; var fileCount = files.Count;
var extraPath = string.Empty; var extraPath = string.Empty;
var extractDi = _directoryService.FileSystem.DirectoryInfo.New(extractPath); var extractDi = _directoryService.FileSystem.DirectoryInfo.New(extractPath);
if (files.Count > 0 && files[0].Format == MangaFormat.Image) if (files[0].Format == MangaFormat.Image)
{ {
// Check if all the files are Images. If so, do a directory copy, else do the normal copy // Check if all the files are Images. If so, do a directory copy, else do the normal copy
if (files.All(f => f.Format == MangaFormat.Image)) if (files.All(f => f.Format == MangaFormat.Image))