Significantly improve browsing speed (near instantaneous) (#1946)

(cherry picked from commit c8ffabc84a096207c1997ab69fc86176f3b53f00)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
#	data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt
#	data/src/main/java/tachiyomi/data/source/SourcePagingSource.kt
#	data/src/main/sqldelight/tachiyomi/data/mangas.sq
#	domain/src/main/java/tachiyomi/domain/manga/interactor/NetworkToLocalManga.kt
#	domain/src/main/java/tachiyomi/domain/manga/repository/MangaRepository.kt
#	domain/src/main/java/tachiyomi/domain/source/repository/SourceRepository.kt

app/src/main/java/exh/GalleryAdder.kt

@@ -136,7 +136,7 @@ class GalleryAdder(
 
             // Use manga in DB if possible, otherwise, make a new manga
             var manga = getManga.await(cleanedMangaUrl, source.id)
-                ?: networkToLocalManga.await(
+                ?: networkToLocalManga(
                     Manga.create().copy(
                         source = source.id,
                         url = cleanedMangaUrl,

app/src/main/java/exh/favorites/LocalFavoritesStorage.kt

@@ -1,6 +1,5 @@
 package exh.favorites
 
-import eu.kanade.domain.manga.model.toDomainManga
 import eu.kanade.tachiyomi.source.online.all.EHentai
 import exh.metadata.metadata.EHentaiSearchMetadata
 import exh.source.EXH_SOURCE_ID
@@ -11,6 +10,7 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.toList
+import mihon.domain.manga.model.toDomainManga
 import tachiyomi.domain.category.interactor.GetCategories
 import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.manga.interactor.DeleteFavoriteEntries

app/src/main/java/exh/md/follows/MangaDexFollowsPagingSource.kt

@@ -2,12 +2,12 @@ package exh.md.follows
 
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.online.all.MangaDex
-import tachiyomi.data.source.SourcePagingSource
+import tachiyomi.data.source.BaseSourcePagingSource
 
 /**
  * LatestUpdatesPager inherited from the general Pager.
  */
-class MangaDexFollowsPagingSource(val mangadex: MangaDex) : SourcePagingSource(mangadex) {
+class MangaDexFollowsPagingSource(val mangadex: MangaDex) : BaseSourcePagingSource(mangadex) {
 
     override suspend fun requestNextPage(currentPage: Int): MangasPage {
         return mangadex.fetchFollows(currentPage)

app/src/main/java/exh/md/follows/MangaDexFollowsScreenModel.kt

@@ -8,12 +8,12 @@ import exh.source.getMainSource
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
+import tachiyomi.data.source.BaseSourcePagingSource
 import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.source.repository.SourcePagingSourceType
 
 class MangaDexFollowsScreenModel(sourceId: Long) : BrowseSourceScreenModel(sourceId, null) {
 
-    override fun createSourcePagingSource(query: String, filters: FilterList): SourcePagingSourceType {
+    override fun createSourcePagingSource(query: String, filters: FilterList): BaseSourcePagingSource {
         return MangaDexFollowsPagingSource(source.getMainSource() as MangaDex)
     }
 

app/src/main/java/exh/recs/RecommendsScreenModel.kt

@@ -4,7 +4,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.produceState
 import cafe.adriel.voyager.core.model.StateScreenModel
-import eu.kanade.domain.manga.model.toDomainManga
 import eu.kanade.presentation.util.ioCoroutineScope
 import eu.kanade.tachiyomi.source.CatalogueSource
 import exh.recs.sources.RecommendationPagingSource
@@ -23,6 +22,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import mihon.domain.manga.model.toDomainManga
 import tachiyomi.domain.manga.interactor.GetManga
 import tachiyomi.domain.manga.interactor.NetworkToLocalManga
 import tachiyomi.domain.manga.model.Manga
@@ -85,7 +85,7 @@ open class RecommendsScreenModel(
                             val recSourceId = recSource.associatedSourceId
                             if (recSourceId != null) {
                                 // If the recommendation is associated with a source, resolve it
-                                networkToLocalManga.await(it.toDomainManga(recSourceId))
+                                networkToLocalManga(it.toDomainManga(recSourceId))
                             } else {
                                 // Otherwise, skip this step. The user will be prompted to choose a source via SmartSearch
                                 it.toDomainManga(-1)

app/src/main/java/exh/recs/batch/RecommendationSearchHelper.kt

@@ -5,7 +5,6 @@ import android.net.wifi.WifiManager
 import android.os.PowerManager
 import androidx.annotation.StringRes
 import androidx.core.net.toUri
-import eu.kanade.domain.manga.model.toDomainManga
 import eu.kanade.domain.manga.model.toSManga
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.SManga
@@ -26,6 +25,7 @@ import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
+import mihon.domain.manga.model.toDomainManga
 import tachiyomi.data.source.NoResultsException
 import tachiyomi.domain.UnsortedPreferences
 import tachiyomi.domain.library.model.LibraryManga
@@ -201,8 +201,7 @@ class RecommendationSearchHelper(val context: Context) {
         return filterNot { manga ->
             // Source recommendations can be directly resolved, if the recommendation is from the same source
             recSource.associatedSourceId?.let { srcId ->
-                return@filterNot networkToLocalManga
-                    .await(manga.toDomainManga(srcId))
+                return@filterNot networkToLocalManga(manga.toDomainManga(srcId))
                     .let { local -> libraryManga.any { it.id == local.id } }
             }
 

app/src/main/java/exh/recs/sources/RecommendationPagingSource.kt

@@ -14,8 +14,8 @@ import exh.source.isMdBasedSource
 import kotlinx.serialization.json.Json
 import logcat.LogPriority
 import tachiyomi.core.common.util.system.logcat
+import tachiyomi.data.source.BaseSourcePagingSource
 import tachiyomi.data.source.NoResultsException
-import tachiyomi.data.source.SourcePagingSource
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.track.interactor.GetTracks
 import tachiyomi.i18n.sy.SYMR
@@ -29,7 +29,7 @@ import uy.kohesive.injekt.injectLazy
 abstract class RecommendationPagingSource(
     protected val manga: Manga,
     source: CatalogueSource? = null,
-) : SourcePagingSource(source) {
+) : BaseSourcePagingSource(source) {
     // Display name
     abstract val name: String
 

app/src/main/java/exh/smartsearch/SmartSourceSearchEngine.kt

@@ -1,9 +1,9 @@
 package exh.smartsearch
 
-import eu.kanade.domain.manga.model.toDomainManga
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.SManga
+import mihon.domain.manga.model.toDomainManga
 import tachiyomi.domain.manga.model.Manga
 
 class SmartSourceSearchEngine(

app/src/main/java/exh/ui/smartsearch/SmartSearchScreenModel.kt

@@ -28,7 +28,7 @@ class SmartSearchScreenModel(
             val result = try {
                 val resultManga = smartSearchEngine.smartSearch(source, config.origTitle)
                 if (resultManga != null) {
-                    val localManga = networkToLocalManga.await(resultManga)
+                    val localManga = networkToLocalManga(resultManga)
                     SearchResults.Found(localManga)
                 } else {
                     SearchResults.NotFound