diff --git a/app/src/main/java/exh/util/MangaType.kt b/app/src/main/java/exh/util/MangaType.kt index 77413d5a1..141a456ec 100644 --- a/app/src/main/java/exh/util/MangaType.kt +++ b/app/src/main/java/exh/util/MangaType.kt @@ -34,9 +34,9 @@ fun Manga.mangaType(): MangaType { MangaType.TYPE_COMIC } else if (currentTags.any { tag -> tag.contains("chinese", ignoreCase = true) || isManhuaTag(tag) } || isManhuaSource(sourceName)) { MangaType.TYPE_MANHUA - } else if (currentTags.any { tag -> tag.contains("korean", ignoreCase = true) || isManhwaTag(tag) } || isWebtoonSource(sourceName)) { + } else if (currentTags.any { tag -> tag.contains("korean", ignoreCase = true) || isManhwaTag(tag) } || isManhwaSource(sourceName)) { MangaType.TYPE_MANHWA - } else if (currentTags.any { tag -> isWebtoonTag(tag) }) { + } else if (currentTags.any { tag -> isWebtoonTag(tag) } || isWebtoonSource(sourceName)) { MangaType.TYPE_WEBTOON } else { MangaType.TYPE_MANGA @@ -77,22 +77,66 @@ private fun isWebtoonTag(tag: String): Boolean { return tag.toLowerCase() in listOf("long strip", "webtoon") } -private fun isWebtoonSource(sourceName: String): Boolean { - return sourceName.contains("webtoon", true) || +/*private fun isMangaSource(sourceName: String): Boolean { + return +}*/ + +private fun isManhwaSource(sourceName: String): Boolean { + return sourceName.contains("getmanhwa", true) || + sourceName.contains("hiperdex", true) || + sourceName.contains("manhwa18", true) || + sourceName.contains("manhwascan", true) || + sourceName.contains("manwahentai.me", true) || + sourceName.contains("manwha club", true) || + sourceName.contains("manytoon", true) || sourceName.contains("manwha", true) || - sourceName.contains("toonily", true) + sourceName.contains("toonily", true) || + sourceName.contains("readmanhwa", true) +} + +private fun isWebtoonSource(sourceName: String): Boolean { + return sourceName.contains("mangatoon", true) || + sourceName.contains("manmanga", true) || + // sourceName.contains("tapas", true) || + sourceName.contains("toomics", true) || + sourceName.contains("webcomics", true) || + sourceName.contains("webtoons", true) || + sourceName.contains("webtoon", true) } private fun isComicSource(sourceName: String): Boolean { - return sourceName.contains("gunnerkrigg", true) || - sourceName.contains("dilbert", true) || + return sourceName.contains("ciayo comics", true) || + sourceName.contains("comicextra", true) || + sourceName.contains("comicpunch", true) || sourceName.contains("cyanide", true) || - sourceName.contains("xkcd", true) || - sourceName.contains("tapastic", true) + sourceName.contains("dilbert", true) || + sourceName.contains("existential comics", true) || + sourceName.contains("hiveworks comics", true) || + sourceName.contains("milftoon", true) || + sourceName.contains("myhentaicomics", true) || + sourceName.contains("myhentaigallery", true) || + sourceName.contains("gunnerkrigg", true) || + sourceName.contains("oglaf", true) || + sourceName.contains("patch friday", true) || + sourceName.contains("porncomix", true) || + sourceName.contains("questionable content", true) || + sourceName.contains("read comics online", true) || + sourceName.contains("readcomicsonline", true) || + sourceName.contains("swords comic", true) || + sourceName.contains("teabeer comics", true) || + sourceName.contains("xkcd", true) } private fun isManhuaSource(sourceName: String): Boolean { - return sourceName.contains("manhua", true) + return sourceName.contains("1st kiss manhua", true) || + sourceName.contains("hero manhua", true) || + sourceName.contains("manhuabox", true) || + sourceName.contains("manhuaus", true) || + sourceName.contains("manhuas world", true) || + sourceName.contains("manhuas.net", true) || + sourceName.contains("readmanhua", true) || + sourceName.contains("wuxiaworld", true) || + sourceName.contains("manhua", true) } enum class MangaType {