From d684eb5147ed01fd3a9478b010303819b6b34f69 Mon Sep 17 00:00:00 2001
From: NerdNumber9 <nerd.number9@yandex.com>
Date: Fri, 12 Apr 2019 03:12:16 -0400
Subject: [PATCH] Misc code cleanup

---
 app/src/main/java/exh/EHSourceHelpers.kt      | 37 ++++++++-----------
 .../exh/ui/migration/MetadataFetchDialog.kt   |  4 +-
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/exh/EHSourceHelpers.kt b/app/src/main/java/exh/EHSourceHelpers.kt
index 57735d6a9..755495465 100755
--- a/app/src/main/java/exh/EHSourceHelpers.kt
+++ b/app/src/main/java/exh/EHSourceHelpers.kt
@@ -7,36 +7,29 @@ import eu.kanade.tachiyomi.source.online.english.HentaiCafe
  * 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 EH_METADATA_SOURCE_ID = LEWD_SOURCE_SERIES + 3
-const val EXH_METADATA_SOURCE_ID = LEWD_SOURCE_SERIES + 4
-
 const val PERV_EDEN_EN_SOURCE_ID = LEWD_SOURCE_SERIES + 5
 const val PERV_EDEN_IT_SOURCE_ID = LEWD_SOURCE_SERIES + 6
-
 const val NHENTAI_SOURCE_ID = LEWD_SOURCE_SERIES + 7
-
-val HENTAI_CAFE_SOURCE_ID = SourceManager.DELEGATED_SOURCES.entries.find {
-    it.value.newSourceClass == HentaiCafe::class
-}!!.value.sourceId
-
+val HENTAI_CAFE_SOURCE_ID = delegatedSourceId<HentaiCafe>()
 const val TSUMINO_SOURCE_ID = LEWD_SOURCE_SERIES + 9
-
 const val HITOMI_SOURCE_ID = LEWD_SOURCE_SERIES + 10
 
-fun isLewdSource(source: Long) = source in 6900..6999 || SourceManager.DELEGATED_SOURCES.any {
-    it.value.sourceId == source
+private val DELEGATED_LEWD_SOURCES = listOf(
+        HentaiCafe::class
+)
+
+private inline fun <reified T> delegatedSourceId(): Long {
+    return SourceManager.DELEGATED_SOURCES.entries.find {
+        it.value.newSourceClass == T::class
+    }!!.value.sourceId
 }
 
-fun isEhSource(source: Long) = source == EH_SOURCE_ID
-    || source == EH_METADATA_SOURCE_ID
-
-fun isExSource(source: Long) = source == EXH_SOURCE_ID
-        || source == EXH_METADATA_SOURCE_ID
-
-fun isPervEdenSource(source: Long) = source == PERV_EDEN_IT_SOURCE_ID
-|| source == PERV_EDEN_EN_SOURCE_ID
-
-fun isNhentaiSource(source: Long) = source == NHENTAI_SOURCE_ID
+fun isLewdSource(source: Long) = source in 6900..6999 || SourceManager.DELEGATED_SOURCES.filter {
+    it.value.newSourceClass in DELEGATED_LEWD_SOURCES
+}.any {
+    it.value.sourceId == source
+}
diff --git a/app/src/main/java/exh/ui/migration/MetadataFetchDialog.kt b/app/src/main/java/exh/ui/migration/MetadataFetchDialog.kt
index 6ad72cb1d..8b9a8e6ab 100755
--- a/app/src/main/java/exh/ui/migration/MetadataFetchDialog.kt
+++ b/app/src/main/java/exh/ui/migration/MetadataFetchDialog.kt
@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.source.SourceManager
-import exh.isExSource
+import exh.EXH_SOURCE_ID
 import exh.isLewdSource
 import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
@@ -110,7 +110,7 @@ class MetadataFetchDialog {
             } else {
                 //Not logged in but have ExHentai galleries
                 if (!preferenceHelper.enableExhentai().getOrDefault()) {
-                    it.find { isExSource(it.source) }?.let {
+                    it.find { it.source == EXH_SOURCE_ID }?.let {
                         extra = "<b><font color='red'>If you use ExHentai, please log in first before fetching your library metadata!</font></b><br><br>"
                     }
                 }