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

Remove language from manga type detection and ignore casing for tags (#26)

Browse Source 
* Remove language detection

* Ignore casing for tag detection

Co-authored-by: she11sh0cked <she11sh0cked@users.noreply.github.com>
This commit is contained in:
she11sh0cked 2020-05-24 19:09:06 +02:00 committed by GitHub
parent f3c8b37928
commit de593f458f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/exh/util/MangaType.kt
View File

@ -27,22 +27,21 @@ fun Manga.mangaType(context: Context): String {
*/ */
fun Manga.mangaType(): MangaType { fun Manga.mangaType(): MangaType {
val sourceName = Injekt.get<SourceManager>().getOrStub(source).name val sourceName = Injekt.get<SourceManager>().getOrStub(source).name
val currentTags = val currentTags = getGenres() ?: emptyList()
genre?.split(",")?.map { it.trim().toLowerCase(Locale.US) } ?: emptyList()
Log.d("MangaType", currentTags.joinToString(separator = "\n")) Log.d("MangaType", currentTags.joinToString(separator = "\n"))
return if (currentTags.any { tag -> tag.contains("japanese", ignoreCase = true) || isMangaTag(tag) }) { return if (currentTags.any { tag -> isMangaTag(tag) }) {
Log.d("MangaType", "isManga") Log.d("MangaType", "isManga")
MangaType.TYPE_MANGA MangaType.TYPE_MANGA
} else if (currentTags.any { tag -> isWebtoonTag(tag) } || isWebtoonSource(sourceName)) { } else if (currentTags.any { tag -> isWebtoonTag(tag) } || isWebtoonSource(sourceName)) {
Log.d("MangaType", "isWebtoon") Log.d("MangaType", "isWebtoon")
MangaType.TYPE_WEBTOON MangaType.TYPE_WEBTOON
} else if (currentTags.any { tag -> tag.contains("english", ignoreCase = true) || isComicTag(tag) } || isComicSource(sourceName)) { } else if (currentTags.any { tag -> isComicTag(tag) } || isComicSource(sourceName)) {
Log.d("MangaType", "isComic") Log.d("MangaType", "isComic")
MangaType.TYPE_COMIC MangaType.TYPE_COMIC
} else if (currentTags.any { tag -> tag.contains("chinese", ignoreCase = true) || isManhuaTag(tag) } || isManhuaSource(sourceName)) { } else if (currentTags.any { tag -> isManhuaTag(tag) } || isManhuaSource(sourceName)) {
Log.d("MangaType", "isManhua") Log.d("MangaType", "isManhua")
MangaType.TYPE_MANHUA MangaType.TYPE_MANHUA
} else if (currentTags.any { tag -> tag.contains("korean", ignoreCase = true) || isManhwaTag(tag) } || isManhwaSource(sourceName)) { } else if (currentTags.any { tag -> isManhwaTag(tag) } || isManhwaSource(sourceName)) {
Log.d("MangaType", "isManhwa") Log.d("MangaType", "isManhwa")
MangaType.TYPE_MANHWA MangaType.TYPE_MANHWA
} else { } else {
@ -66,28 +65,28 @@ fun Manga.defaultReaderType(): Int? {
} }
private fun isMangaTag(tag: String): Boolean { private fun isMangaTag(tag: String): Boolean {
return tag.contains("manga") || return tag.contains("manga", true) ||
tag.contains("манга") tag.contains("манга", true)
} }
private fun isManhuaTag(tag: String): Boolean { private fun isManhuaTag(tag: String): Boolean {
return tag.contains("manhua") || return tag.contains("manhua", true) ||
tag.contains("маньхуа") tag.contains("маньхуа", true)
} }
private fun isManhwaTag(tag: String): Boolean { private fun isManhwaTag(tag: String): Boolean {
return tag.contains("manhwa") || return tag.contains("manhwa", true) ||
tag.contains("манхва") tag.contains("манхва", true)
} }
private fun isComicTag(tag: String): Boolean { private fun isComicTag(tag: String): Boolean {
return tag.contains("comic") || return tag.contains("comic", true) ||
tag.contains("комикс") tag.contains("комикс", true)
} }
private fun isWebtoonTag(tag: String): Boolean { private fun isWebtoonTag(tag: String): Boolean {
return tag.contains("long strip") || return tag.contains("long strip", true) ||
tag.contains("webtoon") tag.contains("webtoon", true)
} }
/*private fun isMangaSource(sourceName: String): Boolean { /*private fun isMangaSource(sourceName: String): Boolean {