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

Support nhentai aliased tags

Browse Source 
Better source ID detection
This commit is contained in:
NerdNumber9 2019-04-13 12:18:42 -04:00
parent 8e9087226f
commit 8abe2d76b0
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
View File

@ -49,6 +49,7 @@ import eu.kanade.tachiyomi.util.toast
import eu.kanade.tachiyomi.util.truncateCenter import eu.kanade.tachiyomi.util.truncateCenter
import exh.EH_SOURCE_ID import exh.EH_SOURCE_ID
import exh.EXH_SOURCE_ID import exh.EXH_SOURCE_ID
import exh.NHENTAI_SOURCE_ID
import exh.ui.webview.WebViewActivity import exh.ui.webview.WebViewActivity
import jp.wasabeef.glide.transformations.CropSquareTransformation import jp.wasabeef.glide.transformations.CropSquareTransformation
import jp.wasabeef.glide.transformations.MaskTransformation import jp.wasabeef.glide.transformations.MaskTransformation
@ -138,7 +139,7 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
manga_genres_tags.setOnTagClickListener { tag -> manga_genres_tags.setOnTagClickListener { tag ->
//EXH Special case E-Hentai/ExHentai to use tag based search //EXH Special case E-Hentai/ExHentai to use tag based search
var text = tag var text = tag
if(isEHentaiBasedSource()) { if(isEHentaiBasedSource() || presenter.source.id == NHENTAI_SOURCE_ID) {
val parsed = parseTag(text) val parsed = parseTag(text)
text = wrapTag(parsed.first, parsed.second.substringBefore('|').trim()) text = wrapTag(parsed.first, parsed.second.substringBefore('|').trim())
} }
@ -556,19 +557,9 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
private fun parseTag(tag: String) = tag.substringBefore(':').trim() to tag.substringAfter(':').trim() private fun parseTag(tag: String) = tag.substringBefore(':').trim() to tag.substringAfter(':').trim()
private fun isEHentaiBasedSource(): Boolean { private fun isEHentaiBasedSource(): Boolean {
val mangaSourceText = manga_source.text val sourceId = presenter.source.id
return sourceId == EH_SOURCE_ID
sourceManager.get(EH_SOURCE_ID)?.let { || sourceId == EXH_SOURCE_ID
if(mangaSourceText.startsWith(it.name))
return true
}
sourceManager.get(EXH_SOURCE_ID)?.let {
if(mangaSourceText.startsWith(it.name))
return true
}
return false
} }
// <-- EH // <-- EH