migrate pagers to coroutines

az4521 · az4521 · commit 4a4029c151ca · 2024-01-30T03:24:25.000Z
diff --git a/app/build.gradle b/app/build.gradle
@@ -68,6 +68,10 @@ android {
             versionNameSuffix "-${getCommitCount()}"
             applicationIdSuffix ".debug"
             ext.enableCrashlytics = false
+            minifyEnabled true
+            shrinkResources true
+            zipAlignEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         releaseTest {
             applicationIdSuffix ".rt"
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt
@@ -33,11 +33,13 @@ import eu.kanade.tachiyomi.ui.source.filter.TriStateSectionItem
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.removeCovers
+import eu.kanade.tachiyomi.util.system.withUIContext
 import exh.isEhBasedSource
 import exh.savedsearches.EXHSavedSearch
 import exh.savedsearches.JsonSavedSearch
 import java.lang.RuntimeException
 import java.util.Date
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.catch
@@ -49,7 +51,6 @@ import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.put
-import rx.Observable
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
@@ -113,6 +114,7 @@ open class BrowseSourcePresenter(
      * Subscription for the pager.
      */
     private var pagerSubscription: Subscription? = null
+    private var nextPageJob: Job? = null
 
     /**
      * Subscription for one request from the pager.
@@ -184,14 +186,16 @@ open class BrowseSourcePresenter(
     fun requestNext() {
         if (!hasNextPage()) return
 
-        pageSubscription?.let { remove(it) }
-        pageSubscription = Observable.defer { pager.requestNext() }
-            .subscribeFirst(
-                { _, _ ->
-                    // Nothing to do when onNext is emitted.
-                },
-                BrowseSourceController::onAddPageError
-            )
+        nextPageJob?.cancel()
+        nextPageJob = launchIO {
+            try {
+                pager.requestNextPage()
+            } catch (e: Throwable) {
+                withUIContext {
+                    view().subscribe { view -> view?.onAddPageError(e) }
+                }
+            }
+        }
     }
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/ExhPager.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/ExhPager.kt
@@ -3,14 +3,12 @@ package eu.kanade.tachiyomi.ui.source.browse
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
+import eu.kanade.tachiyomi.util.lang.awaitSingle
 import exh.EH_SOURCE_ID
-import rx.Observable
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
 
 open class ExhPager(val source: CatalogueSource, val query: String, val filters: FilterList) : Pager() {
 
-    override fun requestNext(): Observable<MangasPage> {
+    override suspend fun requestNextPage() {
         val page = currentPage
 
         val observable = if (query.isBlank() && filters.isEmpty()) {
@@ -19,16 +17,13 @@ open class ExhPager(val source: CatalogueSource, val query: String, val filters:
             source.fetchSearchManga(page, query, filters)
         }
 
-        return observable
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .doOnNext {
-                if (it.mangas.isNotEmpty()) {
-                    onPageReceived(it)
-                } else {
-                    throw NoResultsException()
-                }
-            }
+        val mangasPage = observable.awaitSingle()
+
+        if (mangasPage.mangas.isNotEmpty()) {
+            onPageReceived(mangasPage)
+        } else {
+            throw NoResultsException()
+        }
     }
 
     override fun onPageReceived(mangasPage: MangasPage) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/Pager.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/Pager.kt
@@ -19,8 +19,7 @@ abstract class Pager(var currentPage: Int = 1) {
         return results.asObservable()
     }
 
-    abstract fun requestNext(): Observable<MangasPage>
-
+    abstract suspend fun requestNextPage()
     open fun onPageReceived(mangasPage: MangasPage) {
         val page = currentPage
         currentPage++
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/RecommendsPager.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/RecommendsPager.kt
@@ -27,7 +27,6 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
-import rx.Observable
 import timber.log.Timber
 
 abstract class API(_endpoint: String) {
@@ -248,7 +247,7 @@ class Anilist() : API("https://graphql.anilist.co/") {
 open class RecommendsPager(
     val manga: Manga,
     val smart: Boolean = true,
-    var preferredApi: API = API.MYANIMELIST
+    var preferredApi: API = API.ANILIST
 ) : Pager() {
     private val apiList = API_MAP.toMutableMap()
     private var currentApi: API? = null
@@ -292,7 +291,7 @@ open class RecommendsPager(
         }
     }
 
-    override fun requestNext(): Observable<MangasPage> {
+    override suspend fun requestNextPage() {
         if (smart) {
             preferredApi =
                 if (manga.mangaType() != MangaType.TYPE_MANGA) API.ANILIST else preferredApi
@@ -301,8 +300,6 @@ open class RecommendsPager(
         currentApi = preferredApi
 
         getRecs(currentApi!!)
-
-        return Observable.just(MangasPage(listOf(), false))
     }
 
     companion object {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/SourcePager.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/SourcePager.kt
@@ -2,14 +2,10 @@ package eu.kanade.tachiyomi.ui.source.browse
 
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.FilterList
-import eu.kanade.tachiyomi.source.model.MangasPage
-import rx.Observable
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
-
+import eu.kanade.tachiyomi.util.lang.awaitSingle
 open class SourcePager(val source: CatalogueSource, val query: String, val filters: FilterList) : Pager() {
 
-    override fun requestNext(): Observable<MangasPage> {
+    override suspend fun requestNextPage() {
         val page = currentPage
 
         val observable = if (query.isBlank() && filters.isEmpty()) {
@@ -18,15 +14,12 @@ open class SourcePager(val source: CatalogueSource, val query: String, val filte
             source.fetchSearchManga(page, query, filters)
         }
 
-        return observable
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .doOnNext {
-                if (it.mangas.isNotEmpty()) {
-                    onPageReceived(it)
-                } else {
-                    throw NoResultsException()
-                }
-            }
+        val mangasPage = observable.awaitSingle()
+
+        if (mangasPage.mangas.isNotEmpty()) {
+            onPageReceived(mangasPage)
+        } else {
+            throw NoResultsException()
+        }
     }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/latest/ExhLatestUpdatesPager.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/latest/ExhLatestUpdatesPager.kt
@@ -3,20 +3,16 @@ package eu.kanade.tachiyomi.ui.source.latest
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.ui.source.browse.Pager
-import rx.Observable
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
+import eu.kanade.tachiyomi.util.lang.awaitSingle
 
 /**
  * ExhLatestUpdatesPager inherited from the Exh Pager.
  */
 class ExhLatestUpdatesPager(val source: CatalogueSource) : Pager() {
 
-    override fun requestNext(): Observable<MangasPage> {
-        return source.fetchLatestUpdates(currentPage)
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .doOnNext { onPageReceived(it) }
+    override suspend fun requestNextPage() {
+        val mangasPage = source.fetchLatestUpdates(currentPage).awaitSingle()
+        onPageReceived(mangasPage)
     }
 
     override fun onPageReceived(mangasPage: MangasPage) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/latest/LatestUpdatesPager.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/latest/LatestUpdatesPager.kt
@@ -1,21 +1,16 @@
 package eu.kanade.tachiyomi.ui.source.latest
 
 import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.ui.source.browse.Pager
-import rx.Observable
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
+import eu.kanade.tachiyomi.util.lang.awaitSingle
 
 /**
  * LatestUpdatesPager inherited from the general Pager.
  */
 class LatestUpdatesPager(val source: CatalogueSource) : Pager() {
 
-    override fun requestNext(): Observable<MangasPage> {
-        return source.fetchLatestUpdates(currentPage)
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .doOnNext { onPageReceived(it) }
+    override suspend fun requestNextPage() {
+        val mangasPage = source.fetchLatestUpdates(currentPage).awaitSingle()
+        onPageReceived(mangasPage)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ abstract class Pager(var currentPage: Int = 1) {`
`19`	`19`	`return results.asObservable()`
`20`	`20`	`}`
`21`	`21`
`22`		`- abstract fun requestNext(): Observable<MangasPage>`
`23`		`-`
	`22`	`+ abstract suspend fun requestNextPage()`
`24`	`23`	`open fun onPageReceived(mangasPage: MangasPage) {`
`25`	`24`	`val page = currentPage`
`26`	`25`	`currentPage++`