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

Refactor bridged RxJava/coroutine calls in MangaPresenter

Browse Source 
(cherry picked from commit ac9bf1f3ff9eeee66a6f4e0a917974b04887cdff)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
This commit is contained in:
arkon 2021-01-04 14:55:28 -05:00 committed by Jobobby04
parent e92e942fcd
commit 208d4574db
1 changed files with 27 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
View File

@ -33,9 +33,8 @@ import eu.kanade.tachiyomi.util.chapter.ChapterSettingsHelper
import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
import eu.kanade.tachiyomi.util.isLocal import eu.kanade.tachiyomi.util.isLocal
import eu.kanade.tachiyomi.util.lang.await import eu.kanade.tachiyomi.util.lang.await
import eu.kanade.tachiyomi.util.lang.isNullOrUnsubscribed
import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.launchIO
import eu.kanade.tachiyomi.util.lang.runAsObservable import eu.kanade.tachiyomi.util.lang.launchUI
import eu.kanade.tachiyomi.util.prepUpdateCover import eu.kanade.tachiyomi.util.prepUpdateCover
import eu.kanade.tachiyomi.util.removeCovers import eu.kanade.tachiyomi.util.removeCovers
import eu.kanade.tachiyomi.util.shouldDownloadNewChapters import eu.kanade.tachiyomi.util.shouldDownloadNewChapters
@ -94,7 +93,7 @@ class MangaPresenter(
/** /**
* Subscription to update the manga from the source. * Subscription to update the manga from the source.
*/ */
private var fetchMangaSubscription: Subscription? = null private var fetchMangaJob: Job? = null
/** /**
* List of chapters of the manga. It's always unfiltered and unsorted. * List of chapters of the manga. It's always unfiltered and unsorted.
@ -118,7 +117,7 @@ class MangaPresenter(
/** /**
* Subscription to retrieve the new list of chapters from the source. * Subscription to retrieve the new list of chapters from the source.
*/ */
private var fetchChaptersSubscription: Subscription? = null private var fetchChaptersJob: Job? = null
/** /**
* Subscription to observe download status changes. * Subscription to observe download status changes.
@ -286,26 +285,21 @@ class MangaPresenter(
* Fetch manga information from source. * Fetch manga information from source.
*/ */
fun fetchMangaFromSource(manualFetch: Boolean = false) { fun fetchMangaFromSource(manualFetch: Boolean = false) {
if (!fetchMangaSubscription.isNullOrUnsubscribed()) return if (fetchMangaJob?.isActive == true) return
fetchMangaSubscription = Observable.defer { fetchMangaJob = launchIO {
runAsObservable({ try {
val networkManga = source.getMangaDetails(manga.toMangaInfo()) val networkManga = source.getMangaDetails(manga.toMangaInfo())
val sManga = networkManga.toSManga() val sManga = networkManga.toSManga()
manga.prepUpdateCover(coverCache, sManga, manualFetch) manga.prepUpdateCover(coverCache, sManga, manualFetch)
manga.copyFrom(sManga) manga.copyFrom(sManga)
manga.initialized = true manga.initialized = true
db.insertManga(manga).executeAsBlocking() db.insertManga(manga).await()
manga
}) launchUI { view?.onFetchMangaInfoDone() }
} catch (e: Throwable) {
launchUI { view?.onFetchMangaInfoError(e) }
}
} }
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribeFirst(
{ view, _ ->
view.onFetchMangaInfoDone()
},
MangaController::onFetchMangaInfoError
)
} }
// SY --> // SY -->
@ -761,44 +755,26 @@ class MangaPresenter(
fun fetchChaptersFromSource(manualFetch: Boolean = false) { fun fetchChaptersFromSource(manualFetch: Boolean = false) {
hasRequested = true hasRequested = true
if (!fetchChaptersSubscription.isNullOrUnsubscribed()) return if (fetchChaptersJob?.isActive == true) return
fetchChaptersSubscription = /* SY --> */ if (source !is MergedSource) { fetchChaptersJob = launchIO {
// SY <-- try {
Observable.defer { if (source !is MergedSource) {
runAsObservable({ val chapters = source.getChapterList(manga.toMangaInfo())
source.getChapterList(manga.toMangaInfo())
.map { it.toSChapter() } .map { it.toSChapter() }
})
} val (newChapters, _) = syncChaptersWithSource(db, chapters, manga, source)
.subscribeOn(Schedulers.io())
.map { syncChaptersWithSource(db, it, manga, source) }
.doOnNext {
if (manualFetch) { if (manualFetch) {
downloadNewChapters(it.first) downloadNewChapters(newChapters)
} }
} else {
source.fetchChaptersForMergedManga(manga, manualFetch, true, dedupe)
} }
.observeOn(AndroidSchedulers.mainThread())
.subscribeFirst( launchUI { view?.onFetchChaptersDone() }
{ view, _ -> } catch (e: Throwable) {
view.onFetchChaptersDone() view?.onFetchChaptersError(e)
}, }
MangaController::onFetchChaptersError
)
// SY -->
} else {
Observable.defer { runAsObservable({ source.fetchChaptersForMergedManga(manga, manualFetch, true, dedupe) }) }
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.doOnNext {
}
.subscribeFirst(
{ view, _ ->
view.onFetchChaptersDone()
},
MangaController::onFetchChaptersError
)
} }
// SY <--
} }
/** /**