Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc code cleanup

Browse Source
This commit is contained in:
NerdNumber9 2019-04-12 03:12:16 -04:00
parent 349546cf87
commit d684eb5147
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/exh/EHSourceHelpers.kt
View File

@ -7,36 +7,29 @@ import eu.kanade.tachiyomi.source.online.english.HentaiCafe
* Source helpers * Source helpers
*/ */
// Lewd source IDs
const val LEWD_SOURCE_SERIES = 6900L const val LEWD_SOURCE_SERIES = 6900L
const val EH_SOURCE_ID = LEWD_SOURCE_SERIES + 1 const val EH_SOURCE_ID = LEWD_SOURCE_SERIES + 1
const val EXH_SOURCE_ID = LEWD_SOURCE_SERIES + 2 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_EN_SOURCE_ID = LEWD_SOURCE_SERIES + 5
const val PERV_EDEN_IT_SOURCE_ID = LEWD_SOURCE_SERIES + 6 const val PERV_EDEN_IT_SOURCE_ID = LEWD_SOURCE_SERIES + 6
const val NHENTAI_SOURCE_ID = LEWD_SOURCE_SERIES + 7 const val NHENTAI_SOURCE_ID = LEWD_SOURCE_SERIES + 7
val HENTAI_CAFE_SOURCE_ID = delegatedSourceId<HentaiCafe>()
val HENTAI_CAFE_SOURCE_ID = SourceManager.DELEGATED_SOURCES.entries.find {
it.value.newSourceClass == HentaiCafe::class
}!!.value.sourceId
const val TSUMINO_SOURCE_ID = LEWD_SOURCE_SERIES + 9 const val TSUMINO_SOURCE_ID = LEWD_SOURCE_SERIES + 9
const val HITOMI_SOURCE_ID = LEWD_SOURCE_SERIES + 10 const val HITOMI_SOURCE_ID = LEWD_SOURCE_SERIES + 10
fun isLewdSource(source: Long) = source in 6900..6999 || SourceManager.DELEGATED_SOURCES.any { private val DELEGATED_LEWD_SOURCES = listOf(
it.value.sourceId == source 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 fun isLewdSource(source: Long) = source in 6900..6999 || SourceManager.DELEGATED_SOURCES.filter {
|| source == EH_METADATA_SOURCE_ID it.value.newSourceClass in DELEGATED_LEWD_SOURCES
}.any {
fun isExSource(source: Long) = source == EXH_SOURCE_ID it.value.sourceId == source
|| 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

4
app/src/main/java/exh/ui/migration/MetadataFetchDialog.kt
View File

@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.preference.getOrDefault import eu.kanade.tachiyomi.data.preference.getOrDefault
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import exh.isExSource import exh.EXH_SOURCE_ID
import exh.isLewdSource import exh.isLewdSource
import timber.log.Timber import timber.log.Timber
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
@ -110,7 +110,7 @@ class MetadataFetchDialog {
} else { } else {
//Not logged in but have ExHentai galleries //Not logged in but have ExHentai galleries
if (!preferenceHelper.enableExhentai().getOrDefault()) { 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>" extra = "<b><font color='red'>If you use ExHentai, please log in first before fetching your library metadata!</font></b><br><br>"
} }
} }