diff --git a/app/src/main/java/exh/GalleryAdder.kt b/app/src/main/java/exh/GalleryAdder.kt index 65493e0e5..97eb2da4c 100755 --- a/app/src/main/java/exh/GalleryAdder.kt +++ b/app/src/main/java/exh/GalleryAdder.kt @@ -7,6 +7,7 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Manga +import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.online.UrlImportableSource import eu.kanade.tachiyomi.source.online.all.EHentai @@ -14,6 +15,8 @@ import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource import eu.kanade.tachiyomi.util.lang.awaitSingle import exh.source.getMainSource import exh.util.executeOnIO +import uy.kohesive.injekt.Injekt +import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy class GalleryAdder { @@ -22,6 +25,11 @@ class GalleryAdder { private val sourceManager: SourceManager by injectLazy() + private val filters: Pair, Set> = run { + val preferences = Injekt.get() + preferences.enabledLanguages().get() to preferences.disabledSources().get().map { it.toLong() }.toSet() + } + private val logger = XLog.tag("GalleryAdder").enableStackTrace(2).build() fun pickSource(url: String): List { @@ -30,7 +38,7 @@ class GalleryAdder { .map { it.getMainSource() } .filterIsInstance() .filter { - try { + it.lang in filters.first && it.id !in filters.second && try { it.matchesUri(uri) } catch (e: Exception) { false @@ -63,7 +71,7 @@ class GalleryAdder { .map { it.getMainSource() } .filterIsInstance() .find { - try { + it.lang in filters.first && it.id !in filters.second && try { it.matchesUri(uri) } catch (e: Exception) { false