Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update manga from differernt sources in parallel

Browse Source
This commit is contained in:
Jobobby04 2021-02-04 19:05:35 -05:00
parent 9a3faad499
commit e26ab22e41
1 changed files with 51 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
View File

@ -32,6 +32,7 @@ import eu.kanade.tachiyomi.ui.library.LibraryGroup
import eu.kanade.tachiyomi.ui.manga.track.TrackItem import eu.kanade.tachiyomi.ui.manga.track.TrackItem
import eu.kanade.tachiyomi.util.chapter.NoChaptersException import eu.kanade.tachiyomi.util.chapter.NoChaptersException
import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
import eu.kanade.tachiyomi.util.lang.withIOContext
import eu.kanade.tachiyomi.util.prepUpdateCover import eu.kanade.tachiyomi.util.prepUpdateCover
import eu.kanade.tachiyomi.util.shouldDownloadNewChapters import eu.kanade.tachiyomi.util.shouldDownloadNewChapters
import eu.kanade.tachiyomi.util.storage.getUriCompat import eu.kanade.tachiyomi.util.storage.getUriCompat
@ -58,6 +59,8 @@ import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.cancel import kotlinx.coroutines.cancel
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.supervisorScope import kotlinx.coroutines.supervisorScope
import kotlinx.coroutines.sync.Semaphore
import kotlinx.coroutines.sync.withPermit
import timber.log.Timber import timber.log.Timber
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
@ -327,54 +330,62 @@ class LibraryUpdateService(
* @return an observable delivering the progress of each update. * @return an observable delivering the progress of each update.
*/ */
suspend fun updateChapterList(mangaToUpdate: List<LibraryManga>) { suspend fun updateChapterList(mangaToUpdate: List<LibraryManga>) {
val semaphore = Semaphore(5)
val progressCount = AtomicInteger(0) val progressCount = AtomicInteger(0)
val newUpdates = mutableListOf<Pair<LibraryManga, Array<Chapter>>>() val newUpdates = mutableListOf<Pair<LibraryManga, Array<Chapter>>>()
val failedUpdates = mutableListOf<Pair<Manga, String?>>() val failedUpdates = mutableListOf<Pair<Manga, String?>>()
var hasDownloads = false var hasDownloads = false
mangaToUpdate withIOContext {
.mapNotNull { manga -> mangaToUpdate.groupBy { it.source }
if (updateJob?.isActive != true) { .filterNot { it.key in LIBRARY_UPDATE_EXCLUDED_SOURCES }
throw CancellationException() .values.map { mangaInSource ->
} async {
semaphore.withPermit {
mangaInSource
.map { manga ->
if (updateJob?.isActive != true) {
throw CancellationException()
}
// Notify manga that will update. // Notify manga that will update.
notifier.showProgressNotification(manga, progressCount.andIncrement, mangaToUpdate.size) notifier.showProgressNotification(manga, progressCount.andIncrement, mangaToUpdate.size)
// SY --> // Update the chapters of the manga
if (manga.source in LIBRARY_UPDATE_EXCLUDED_SOURCES) return@mapNotNull null try {
// SY <-- val newChapters = updateManga(manga).first
// Update the chapters of the manga Pair(manga, newChapters)
try { } catch (e: Throwable) {
val newChapters = updateManga(manga).first // If there's any error, return empty update and continue.
Pair(manga, newChapters) val errorMessage = if (e is NoChaptersException) {
} catch (e: Throwable) { getString(R.string.no_chapters_error)
// If there's any error, return empty update and continue. } else {
val errorMessage = if (e is NoChaptersException) { e.message
getString(R.string.no_chapters_error) }
} else { failedUpdates.add(Pair(manga, errorMessage))
e.message Pair(manga, emptyList())
}
}
// Filter out mangas without new chapters (or failed).
.filter { (_, newChapters) -> newChapters.isNotEmpty() }
.forEach { (manga, newChapters) ->
if (manga.shouldDownloadNewChapters(db, preferences)) {
downloadChapters(manga, newChapters)
hasDownloads = true
}
// Convert to the manga that contains new chapters.
newUpdates.add(
Pair(
manga,
newChapters.sortedByDescending { ch -> ch.source_order }.toTypedArray()
)
)
}
}
} }
failedUpdates.add(Pair(manga, errorMessage)) }.awaitAll()
Pair(manga, emptyList()) }
}
}
// Filter out mangas without new chapters (or failed).
.filter { (_, newChapters) -> newChapters.isNotEmpty() }
.forEach { (manga, newChapters) ->
if (manga.shouldDownloadNewChapters(db, preferences)) {
downloadChapters(manga, newChapters)
hasDownloads = true
}
// Convert to the manga that contains new chapters.
newUpdates.add(
Pair(
manga,
newChapters.sortedByDescending { ch -> ch.source_order }.toTypedArray()
)
)
}
// Notify result of the overall update. // Notify result of the overall update.
notifier.cancelProgressNotification() notifier.cancelProgressNotification()