github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix delay between URL fetch and image download (#9452)

Browse source 
Fetch each source image URL immediately before downloading each image
instead of fetching all URLs and then downloading all images.

Source image URLs may change, so the downloader may fail if there is
too long a delay between fetching the image URL and downloading the
image.
This commit is contained in:
Two-Ai 2023-05-05 22:17:51 -04:00 committed by GitHub
parent cb2d43c0d1
commit bbe0ab1dd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
View file

@ -338,8 +338,13 @@ class Downloader(
download.status = Download.State.DOWNLOADING download.status = Download.State.DOWNLOADING
// Get all the URLs to the source images, fetch pages if necessary // Start downloading images, consider we can have downloaded images already
pageList.filter { it.imageUrl.isNullOrEmpty() }.forEach { page -> // Concurrently do 2 pages at a time
pageList.asFlow()
.flatMapMerge(concurrency = 2) { page ->
flow {
// Fetch image URL if necessary
if (page.imageUrl.isNullOrEmpty()) {
page.status = Page.State.LOAD_PAGE page.status = Page.State.LOAD_PAGE
try { try {
page.imageUrl = download.source.fetchImageUrl(page).awaitSingle() page.imageUrl = download.source.fetchImageUrl(page).awaitSingle()
@ -348,11 +353,6 @@ class Downloader(
} }
} }
// Start downloading images, consider we can have downloaded images already
// Concurrently do 2 pages at a time
pageList.asFlow()
.flatMapMerge(concurrency = 2) { page ->
flow {
withIOContext { getOrDownloadImage(page, download, tmpDir) } withIOContext { getOrDownloadImage(page, download, tmpDir) }
emit(page) emit(page)
}.flowOn(Dispatchers.IO) }.flowOn(Dispatchers.IO)