DataHearth/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure final download status is always set (#9453)

Browse Source
This commit is contained in:
Two-Ai 2023-05-05 22:17:05 -04:00 committed by GitHub
parent fce9cb820c
commit cb2d43c0d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
View File

@ -526,9 +526,15 @@ class Downloader(
dirname: String, dirname: String,
) { ) {
// Page list hasn't been initialized // Page list hasn't been initialized
val downloadPageCount = download.pages?.size ?: return val downloadPageCount = download.pages?.size ?: run {
// Ensure that all pages has been downloaded download.status = Download.State.ERROR
if (download.downloadedImages < downloadPageCount) return return
}
// Ensure that all pages have been downloaded
if (download.downloadedImages != downloadPageCount) {
download.status = Download.State.ERROR
return
}
// Ensure that the chapter folder has all the pages // Ensure that the chapter folder has all the pages
val downloadedImagesCount = tmpDir.listFiles().orEmpty().count { val downloadedImagesCount = tmpDir.listFiles().orEmpty().count {
val fileName = it.name.orEmpty() val fileName = it.name.orEmpty()
@ -540,29 +546,29 @@ class Downloader(
else -> true else -> true
} }
} }
if (downloadedImagesCount != downloadPageCount) {
download.status = if (downloadedImagesCount == downloadPageCount) { download.status = Download.State.ERROR
createComicInfoFile( return
tmpDir,
download.manga,
download.chapter,
download.source,
)
// Only rename the directory if it's downloaded
if (downloadPreferences.saveChaptersAsCBZ().get()) {
archiveChapter(mangaDir, dirname, tmpDir)
} else {
tmpDir.renameTo(dirname)
}
cache.addChapter(dirname, mangaDir, download.manga)
DiskUtil.createNoMediaFile(tmpDir, context)
Download.State.DOWNLOADED
} else {
Download.State.ERROR
} }
createComicInfoFile(
tmpDir,
download.manga,
download.chapter,
download.source,
)
// Only rename the directory if it's downloaded
if (downloadPreferences.saveChaptersAsCBZ().get()) {
archiveChapter(mangaDir, dirname, tmpDir)
} else {
tmpDir.renameTo(dirname)
}
cache.addChapter(dirname, mangaDir, download.manga)
DiskUtil.createNoMediaFile(tmpDir, context)
download.status = Download.State.DOWNLOADED
} }
/** /**