Handle delegated source id lists better using a LisenterMutableMap

Better source id comparisons

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

@@ -1,88 +0,0 @@
-package exh
-
-import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.source.online.all.Hitomi
-import eu.kanade.tachiyomi.source.online.all.MangaDex
-import eu.kanade.tachiyomi.source.online.all.NHentai
-import eu.kanade.tachiyomi.source.online.all.PervEden
-import eu.kanade.tachiyomi.source.online.english.EightMuses
-import eu.kanade.tachiyomi.source.online.english.HBrowse
-import eu.kanade.tachiyomi.source.online.english.HentaiCafe
-import eu.kanade.tachiyomi.source.online.english.Pururin
-import eu.kanade.tachiyomi.source.online.english.Tsumino
-
-/**
- * Source helpers
- */
-
-// Lewd source IDs
-const val LEWD_SOURCE_SERIES = 6900L
-const val EH_SOURCE_ID = LEWD_SOURCE_SERIES + 1
-const val EXH_SOURCE_ID = LEWD_SOURCE_SERIES + 2
-const val PERV_EDEN_EN_SOURCE_ID = 4673633799850248749
-const val PERV_EDEN_IT_SOURCE_ID = 1433898225963724122
-const val HENTAI_CAFE_SOURCE_ID = 260868874183818481
-const val PURURIN_SOURCE_ID = 2221515250486218861
-const val TSUMINO_SOURCE_ID = 6707338697138388238
-const val EIGHTMUSES_SOURCE_ID = 1802675169972965535
-const val HBROWSE_SOURCE_ID = 1401584337232758222
-const val MERGED_SOURCE_ID = LEWD_SOURCE_SERIES + 69
-
-private val DELEGATED_METADATA_SOURCES = listOf(
-    HentaiCafe::class,
-    Pururin::class,
-    Tsumino::class,
-    HBrowse::class,
-    EightMuses::class,
-    Hitomi::class,
-    PervEden::class,
-    NHentai::class
-)
-
-private val hitomiClass = listOf(Hitomi::class)
-private val nHentaiClass = listOf(NHentai::class)
-private val mangaDexClass = listOf(MangaDex::class)
-
-// Used to speed up isLewdSource
-val metadataDelegatedSourceIds by lazy {
-    SourceManager.currentDelegatedSources.filter {
-        it.value.newSourceClass in DELEGATED_METADATA_SOURCES
-    }.map { it.value.sourceId }.sorted()
-}
-
-val hitomiSourceIds by lazy {
-    SourceManager.currentDelegatedSources.filter {
-        it.value.newSourceClass in hitomiClass
-    }.map { it.value.sourceId }.sorted()
-}
-
-val nHentaiSourceIds by lazy {
-    SourceManager.currentDelegatedSources.filter {
-        it.value.newSourceClass in nHentaiClass
-    }.map { it.value.sourceId }.sorted()
-}
-
-val mangaDexSourceIds by lazy {
-    SourceManager.currentDelegatedSources.filter {
-        it.value.newSourceClass in mangaDexClass
-    }.map { it.value.sourceId }.sorted()
-}
-
-// This method MUST be fast!
-fun isMetadataSource(source: Long) = source in 6900..6999 ||
-    metadataDelegatedSourceIds.binarySearch(source) >= 0
-
-val LIBRARY_UPDATE_EXCLUDED_SOURCES by lazy {
-    listOf(
-        EH_SOURCE_ID,
-        EXH_SOURCE_ID,
-        HENTAI_CAFE_SOURCE_ID,
-        TSUMINO_SOURCE_ID,
-        PURURIN_SOURCE_ID,
-        *hitomiSourceIds.toTypedArray(),
-        *nHentaiSourceIds.toTypedArray()
-    )
-}
-
-fun Source.isEhBasedSource() = id == EH_SOURCE_ID || id == EXH_SOURCE_ID

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

@@ -26,6 +26,13 @@ import eu.kanade.tachiyomi.source.online.all.Hitomi
 import eu.kanade.tachiyomi.source.online.all.NHentai
 import exh.merged.sql.models.MergedMangaReference
 import exh.source.BlacklistedSources
+import exh.source.EH_SOURCE_ID
+import exh.source.HBROWSE_SOURCE_ID
+import exh.source.HENTAI_CAFE_SOURCE_ID
+import exh.source.MERGED_SOURCE_ID
+import exh.source.PERV_EDEN_EN_SOURCE_ID
+import exh.source.PERV_EDEN_IT_SOURCE_ID
+import exh.source.TSUMINO_SOURCE_ID
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
@@ -41,7 +48,7 @@ object EXHMigrations {
     private val db: DatabaseHelper by injectLazy()
     private val sourceManager: SourceManager by injectLazy()
 
-    private val logger = XLog.tag("EXHMigrations")
+    private val logger by lazy { XLog.tag("EXHMigrations") }
 
     /**
      * Performs a migration when the application is updated.

app/src/main/java/exh/debug/DebugFunctions.kt

@@ -10,15 +10,16 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.toSManga
-import exh.EH_SOURCE_ID
 import exh.EXHMigrations
-import exh.EXH_SOURCE_ID
 import exh.eh.EHentaiThrottleManager
 import exh.eh.EHentaiUpdateWorker
 import exh.metadata.metadata.EHentaiSearchMetadata
 import exh.metadata.metadata.base.getFlatMetadataForManga
 import exh.metadata.metadata.base.insertFlatMetadataAsync
 import exh.savedsearches.JsonSavedSearch
+import exh.source.EH_SOURCE_ID
+import exh.source.EXH_SOURCE_ID
+import exh.source.isEhBasedManga
 import exh.util.cancellable
 import exh.util.executeOnIO
 import exh.util.jobScheduler
@@ -54,9 +55,8 @@ object DebugFunctions {
             val metadataManga = db.getFavoriteMangaWithMetadata().executeOnIO()
 
             val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga ->
-                if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) {
-                    null
-                } else manga
+                if (manga.isEhBasedManga()) manga
+                else null
             }.toList()
 
             allManga.forEach { manga ->
@@ -77,9 +77,8 @@ object DebugFunctions {
             val metadataManga = db.getFavoriteMangaWithMetadata().executeOnIO()
 
             val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga ->
-                if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) {
-                    null
-                } else manga
+                if (manga.isEhBasedManga()) manga
+                else null
             }.toList()
             val eh = sourceManager.get(EH_SOURCE_ID)
             val ex = sourceManager.get(EXH_SOURCE_ID)
@@ -107,9 +106,8 @@ object DebugFunctions {
             val metadataManga = db.getFavoriteMangaWithMetadata().executeOnIO()
 
             val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga ->
-                if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) {
-                    null
-                } else manga
+                if (manga.isEhBasedManga()) manga
+                else null
             }.toList()
 
             allManga.forEach { manga ->
@@ -126,9 +124,8 @@ object DebugFunctions {
             val metadataManga = db.getFavoriteMangaWithMetadata().executeOnIO()
 
             val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga ->
-                if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) {
-                    null
-                } else manga
+                if (manga.isEhBasedManga()) manga
+                else null
             }.toList()
 
             allManga.forEach { manga ->

app/src/main/java/exh/eh/EHentaiUpdateWorker.kt

@@ -20,13 +20,12 @@ import eu.kanade.tachiyomi.source.model.toSChapter
 import eu.kanade.tachiyomi.source.model.toSManga
 import eu.kanade.tachiyomi.source.online.all.EHentai
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
-import exh.EH_SOURCE_ID
-import exh.EXH_SOURCE_ID
 import exh.debug.DebugToggles
 import exh.eh.EHentaiUpdateWorkerConstants.UPDATES_PER_ITERATION
 import exh.metadata.metadata.EHentaiSearchMetadata
 import exh.metadata.metadata.base.getFlatMetadataForManga
 import exh.metadata.metadata.base.insertFlatMetadataAsync
+import exh.source.isEhBasedManga
 import exh.util.cancellable
 import exh.util.executeOnIO
 import exh.util.jobScheduler
@@ -140,7 +139,7 @@ class EHentaiUpdateWorker : JobService() {
         logger.d("Filtering manga and raising metadata...")
         val curTime = System.currentTimeMillis()
         val allMeta = metadataManga.asFlow().cancellable().mapNotNull { manga ->
-            if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) {
+            if (!manga.isEhBasedManga()) {
                 return@mapNotNull null
             }
 

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

@@ -17,12 +17,13 @@ import eu.kanade.tachiyomi.source.online.all.EHentai
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.system.powerManager
 import eu.kanade.tachiyomi.util.system.toast
-import exh.EH_SOURCE_ID
-import exh.EXH_SOURCE_ID
 import exh.GalleryAddEvent
 import exh.GalleryAdder
 import exh.eh.EHentaiThrottleManager
 import exh.eh.EHentaiUpdateWorker
+import exh.source.EH_SOURCE_ID
+import exh.source.EXH_SOURCE_ID
+import exh.source.isEhBasedManga
 import exh.util.executeOnIO
 import exh.util.ignore
 import exh.util.trans
@@ -87,7 +88,7 @@ class FavoritesSyncHelper(val context: Context) {
         val libraryManga = db.getLibraryMangas().executeOnIO()
         val seenManga = HashSet<Long>(libraryManga.size)
         libraryManga.forEach {
-            if (it.source != EXH_SOURCE_ID && it.source != EH_SOURCE_ID) return@forEach
+            if (!it.isEhBasedManga()) return@forEach
 
             if (it.id in seenManga) {
                 val inCategories = db.getCategoriesForManga(it).executeOnIO()

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

@@ -3,9 +3,8 @@ package exh.favorites
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.source.online.all.EHentai
-import exh.EH_SOURCE_ID
-import exh.EXH_SOURCE_ID
 import exh.metadata.metadata.EHentaiSearchMetadata
+import exh.source.isEhBasedManga
 import exh.util.executeOnIO
 import io.realm.Realm
 import io.realm.RealmConfiguration
@@ -128,7 +127,7 @@ class LocalFavoritesStorage {
         }
 
     private fun validateDbManga(manga: Manga) =
-        manga.favorite && (manga.source == EH_SOURCE_ID || manga.source == EXH_SOURCE_ID)
+        manga.favorite && manga.isEhBasedManga()
 
     companion object {
         const val MAX_CATEGORIES = 9

app/src/main/java/exh/source/BlacklistedSources.kt

@@ -1,7 +1,5 @@
 package exh.source
 
-import exh.MERGED_SOURCE_ID
-
 object BlacklistedSources {
     val EHENTAI_EXT_SOURCES = listOf(
         8100626124886895451,

app/src/main/java/exh/source/SourceHelper.kt

@@ -0,0 +1,107 @@
+package exh.source
+
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.source.Source
+import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.source.online.all.Hitomi
+import eu.kanade.tachiyomi.source.online.all.MangaDex
+import eu.kanade.tachiyomi.source.online.all.NHentai
+import eu.kanade.tachiyomi.source.online.all.PervEden
+import eu.kanade.tachiyomi.source.online.english.EightMuses
+import eu.kanade.tachiyomi.source.online.english.HBrowse
+import eu.kanade.tachiyomi.source.online.english.HentaiCafe
+import eu.kanade.tachiyomi.source.online.english.Pururin
+import eu.kanade.tachiyomi.source.online.english.Tsumino
+
+/**
+ * Source helpers
+ */
+
+// Lewd source IDs
+const val LEWD_SOURCE_SERIES = 6900L
+const val EH_SOURCE_ID = LEWD_SOURCE_SERIES + 1
+const val EXH_SOURCE_ID = LEWD_SOURCE_SERIES + 2
+const val PERV_EDEN_EN_SOURCE_ID = 4673633799850248749
+const val PERV_EDEN_IT_SOURCE_ID = 1433898225963724122
+const val HENTAI_CAFE_SOURCE_ID = 260868874183818481
+const val PURURIN_SOURCE_ID = 2221515250486218861
+const val TSUMINO_SOURCE_ID = 6707338697138388238
+const val EIGHTMUSES_SOURCE_ID = 1802675169972965535
+const val HBROWSE_SOURCE_ID = 1401584337232758222
+const val MERGED_SOURCE_ID = LEWD_SOURCE_SERIES + 69
+
+private val DELEGATED_METADATA_SOURCES by lazy {
+    listOf(
+        HentaiCafe::class,
+        Pururin::class,
+        Tsumino::class,
+        HBrowse::class,
+        EightMuses::class,
+        Hitomi::class,
+        PervEden::class,
+        NHentai::class
+    )
+}
+
+// Used to speed up isLewdSource
+var metadataDelegatedSourceIds: List<Long> = emptyList()
+
+var hitomiSourceIds: List<Long> = emptyList()
+
+var nHentaiSourceIds: List<Long> = emptyList()
+
+var mangaDexSourceIds: List<Long> = emptyList()
+
+var LIBRARY_UPDATE_EXCLUDED_SOURCES = listOf(
+    EH_SOURCE_ID,
+    EXH_SOURCE_ID,
+    HENTAI_CAFE_SOURCE_ID,
+    TSUMINO_SOURCE_ID,
+    PURURIN_SOURCE_ID
+)
+
+fun handleSourceLibrary() {
+    metadataDelegatedSourceIds = SourceManager.currentDelegatedSources
+        .filter {
+            it.value.newSourceClass in DELEGATED_METADATA_SOURCES
+        }
+        .map { it.value.sourceId }
+        .sorted()
+
+    hitomiSourceIds = SourceManager.currentDelegatedSources
+        .filter {
+            it.value.newSourceClass == Hitomi::class
+        }
+        .map { it.value.sourceId }
+        .sorted()
+
+    nHentaiSourceIds = SourceManager.currentDelegatedSources
+        .filter {
+            it.value.newSourceClass == NHentai::class
+        }
+        .map { it.value.sourceId }
+        .sorted()
+
+    mangaDexSourceIds = SourceManager.currentDelegatedSources
+        .filter {
+            it.value.newSourceClass == MangaDex::class
+        }
+        .map { it.value.sourceId }
+        .sorted()
+
+    LIBRARY_UPDATE_EXCLUDED_SOURCES = listOf(
+        EH_SOURCE_ID,
+        EXH_SOURCE_ID,
+        HENTAI_CAFE_SOURCE_ID,
+        TSUMINO_SOURCE_ID,
+        PURURIN_SOURCE_ID
+    ) + hitomiSourceIds + nHentaiSourceIds
+}
+
+// This method MUST be fast!
+fun isMetadataSource(source: Long) = source in 6900..6999 ||
+    metadataDelegatedSourceIds.binarySearch(source) >= 0
+
+fun Source.isEhBasedSource() = id == EH_SOURCE_ID || id == EXH_SOURCE_ID
+
+fun Manga.isEhBasedManga() = source == EH_SOURCE_ID || source == EXH_SOURCE_ID

app/src/main/java/exh/uconfig/EHConfigurator.kt

@@ -8,9 +8,9 @@ import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.all.EHentai
 import eu.kanade.tachiyomi.util.asJsoup
-import exh.EH_SOURCE_ID
-import exh.EXH_SOURCE_ID
 import exh.log.maybeInjectEHLogger
+import exh.source.EH_SOURCE_ID
+import exh.source.EXH_SOURCE_ID
 import okhttp3.FormBody
 import okhttp3.OkHttpClient
 import okhttp3.Request

app/src/main/java/exh/util/LewdMangaChecker.kt

@@ -2,9 +2,8 @@ package exh.util
 
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.source.SourceManager
-import exh.EH_SOURCE_ID
-import exh.EXH_SOURCE_ID
-import exh.nHentaiSourceIds
+import exh.source.isEhBasedManga
+import exh.source.nHentaiSourceIds
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -12,7 +11,7 @@ fun Manga.isLewd(): Boolean {
     val sourceName = Injekt.get<SourceManager>().get(source)?.name
     val currentTags = getGenres().orEmpty()
 
-    if (source == EH_SOURCE_ID || source == EXH_SOURCE_ID || source in nHentaiSourceIds) {
+    if (isEhBasedManga() || source in nHentaiSourceIds) {
         return currentTags.none { tag -> isNonHentaiTag(tag) }
     }
 

app/src/main/java/exh/util/SourceTagsUtil.kt

@@ -2,13 +2,13 @@ package exh.util
 
 import android.graphics.Color
 import eu.kanade.tachiyomi.data.database.models.Manga
-import exh.EH_SOURCE_ID
-import exh.EXH_SOURCE_ID
-import exh.PURURIN_SOURCE_ID
-import exh.TSUMINO_SOURCE_ID
-import exh.hitomiSourceIds
 import exh.metadata.metadata.base.RaisedTag
-import exh.nHentaiSourceIds
+import exh.source.EH_SOURCE_ID
+import exh.source.EXH_SOURCE_ID
+import exh.source.PURURIN_SOURCE_ID
+import exh.source.TSUMINO_SOURCE_ID
+import exh.source.hitomiSourceIds
+import exh.source.nHentaiSourceIds
 import java.util.Locale
 
 object SourceTagsUtil {

app/src/main/java/exh/util/ViewExtensions.kt

@@ -3,9 +3,9 @@ package exh.util
 import android.content.Context
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
-import exh.EH_SOURCE_ID
-import exh.EXH_SOURCE_ID
 import exh.metadata.metadata.EHentaiSearchMetadata
+import exh.source.EH_SOURCE_ID
+import exh.source.EXH_SOURCE_ID
 
 /**
  * Replaces chips in a ChipGroup.