Lessen the use of GlobalScope launchIO (#7916)

* Lessen the use of GlobalScope `launchIO`

* Wrap some calls with `NonCancellable` context
This commit is contained in:
AntsyLich
2022-09-02 21:50:44 +06:00
committed by GitHub
parent 774a87a42a
commit da95ecb686
9 changed files with 59 additions and 67 deletions
@@ -42,6 +42,7 @@ import eu.kanade.tachiyomi.ui.manga.track.TrackItem
import eu.kanade.tachiyomi.util.chapter.ChapterSettingsHelper
import eu.kanade.tachiyomi.util.chapter.getChapterSort
import eu.kanade.tachiyomi.util.lang.launchIO
import eu.kanade.tachiyomi.util.lang.launchNonCancellableIO
import eu.kanade.tachiyomi.util.lang.toRelativeString
import eu.kanade.tachiyomi.util.lang.withUIContext
import eu.kanade.tachiyomi.util.preference.asHotFlow
@@ -396,7 +397,6 @@ class MangaPresenter(
/**
* Move the given manga to categories.
*
* @param manga the manga to move.
* @param categories the selected categories.
*/
private fun moveMangaToCategories(categories: List<Category>) {
@@ -413,7 +413,6 @@ class MangaPresenter(
/**
* Move the given manga to the category.
*
* @param manga the manga to move.
* @param category the selected category, or null for default category.
*/
private fun moveMangaToCategory(category: Category?) {
@@ -643,7 +642,7 @@ class MangaPresenter(
* @param chapters the list of chapters to delete.
*/
fun deleteChapters(chapters: List<DomainChapter>) {
launchIO {
presenterScope.launchNonCancellableIO {
val chapters2 = chapters.map { it.toDbChapter() }
try {
updateSuccessState { successState ->
@@ -675,10 +674,10 @@ class MangaPresenter(
}
private fun downloadNewChapters(chapters: List<DomainChapter>) {
presenterScope.launchIO {
val manga = successState?.manga ?: return@launchIO
presenterScope.launchNonCancellableIO {
val manga = successState?.manga ?: return@launchNonCancellableIO
val categories = getCategories.await(manga.id).map { it.id }
if (chapters.isEmpty() || !manga.shouldDownloadNewChapters(categories, preferences)) return@launchIO
if (chapters.isEmpty() || !manga.shouldDownloadNewChapters(categories, preferences)) return@launchNonCancellableIO
downloadChapters(chapters)
}
}
@@ -695,7 +694,7 @@ class MangaPresenter(
State.INCLUDE -> DomainManga.CHAPTER_SHOW_UNREAD
State.EXCLUDE -> DomainManga.CHAPTER_SHOW_READ
}
presenterScope.launchIO {
presenterScope.launchNonCancellableIO {
setMangaChapterFlags.awaitSetUnreadFilter(manga, flag)
}
}
@@ -713,7 +712,7 @@ class MangaPresenter(
State.EXCLUDE -> DomainManga.CHAPTER_SHOW_NOT_DOWNLOADED
}
presenterScope.launchIO {
presenterScope.launchNonCancellableIO {
setMangaChapterFlags.awaitSetDownloadedFilter(manga, flag)
}
}
@@ -731,7 +730,7 @@ class MangaPresenter(
State.EXCLUDE -> DomainManga.CHAPTER_SHOW_NOT_BOOKMARKED
}
presenterScope.launchIO {
presenterScope.launchNonCancellableIO {
setMangaChapterFlags.awaitSetBookmarkFilter(manga, flag)
}
}
@@ -743,7 +742,7 @@ class MangaPresenter(
fun setDisplayMode(mode: Long) {
val manga = successState?.manga ?: return
presenterScope.launchIO {
presenterScope.launchNonCancellableIO {
setMangaChapterFlags.awaitSetDisplayMode(manga, mode)
}
}
@@ -755,7 +754,7 @@ class MangaPresenter(
fun setSorting(sort: Long) {
val manga = successState?.manga ?: return
presenterScope.launchIO {
presenterScope.launchNonCancellableIO {
setMangaChapterFlags.awaitSetSortingModeOrFlipOrder(manga, sort)
}
}
@@ -870,7 +869,7 @@ class MangaPresenter(
fun refreshTrackers() {
refreshTrackersJob?.cancel()
refreshTrackersJob = launchIO {
refreshTrackersJob = presenterScope.launchNonCancellableIO {
supervisorScope {
try {
trackList
@@ -918,7 +917,7 @@ class MangaPresenter(
val successState = successState ?: return
if (item != null) {
item.manga_id = successState.manga.id
launchIO {
presenterScope.launchNonCancellableIO {
try {
val allChapters = successState.chapters.map { it.chapter }
val hasReadChapters = allChapters.any { it.read }
@@ -959,13 +958,13 @@ class MangaPresenter(
fun unregisterTracking(service: TrackService) {
val manga = successState?.manga ?: return
presenterScope.launchIO {
presenterScope.launchNonCancellableIO {
deleteTrack.await(manga.id, service.id)
}
}
private fun updateRemote(track: Track, service: TrackService) {
launchIO {
presenterScope.launchNonCancellableIO {
try {
service.update(track)