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

Fixed a bug where if a chapter had multiple archive files, they wouldn't all be extracted due to short circuit in ExtractArchive. Now I add the file id then flatten afterwards. (#113)

Browse source
This commit is contained in:
Joseph Milazzo 2021-03-26 13:43:54 -05:00 • committed by GitHub
parent d2914a0e79
commit 280fdc07f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
API/Services/CacheService.cs
View file

@ -41,12 +41,19 @@ namespace API.Services
public async Task<Chapter> Ensure(int chapterId)
{
EnsureCacheDirectory();
Chapter chapter = await _unitOfWork.VolumeRepository.GetChapterAsync(chapterId);
var chapter = await _unitOfWork.VolumeRepository.GetChapterAsync(chapterId);
var fileCount = 0;
var extractPath = GetCachePath(chapterId);
foreach (var file in chapter.Files)
{
var extractPath = GetCachePath(chapterId);
_archiveService.ExtractArchive(file.FilePath, extractPath);
_archiveService.ExtractArchive(file.FilePath, Path.Join(extractPath, file.Id + ""));
fileCount++;
}
if (fileCount > 1)
{
new DirectoryInfo(extractPath).Flatten();
}
return chapter;

2
build.sh
View file

@ -62,7 +62,7 @@ Package()
ProgressStart "Creating $runtime Package for $framework"
# TODO: Use no-restore? Because Build should have already done it for us
echo "Building"
cd API
echo dotnet publish -c release --self-contained --runtime $runtime -o "$lOutputFolder" --framework $framework