From 1569ea29d05d2fcb4dd728b9d6b5e64ee7cd201a Mon Sep 17 00:00:00 2001 From: Riztard Lanthorn Date: Wed, 31 Mar 2021 21:03:54 +0700 Subject: [PATCH] Update WPMangaStream factory code: add series type to genre (#6365) add series type(manga/manhwa/manhua/other) thinggy to genre for some source --- multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt | 5 +++++ .../overrides/wpmangastream/silencescan/src/SilenceScan.kt | 5 +++++ multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt | 5 +++++ .../kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt | 5 +++++ .../multisrc/wpmangastream/WPMangaStreamGenerator.kt | 2 +- 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt b/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt index 9166760ce..582d7897e 100644 --- a/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt +++ b/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt @@ -97,6 +97,11 @@ class KomikCast : WPMangaStream("Komik Cast", "https://komikcast.com", "id") { artist = infoElement.select("span:contains(Author:)").firstOrNull()?.ownText() description = infoElement.select("div.komik_info-description-sinopsis p").joinToString("\n") { it.text() } thumbnail_url = infoElement.select("div.komik_info-content-thumbnail img").imgAttr() + + // add manga/manhwa/manhua thinggy to genre + val type = document.select("span:contains(Type) a").firstOrNull()?.ownText() + genre += if (genre!!.contains(type.toString())) "" else if (!type.isNullOrEmpty() && !genre.isNullOrEmpty()) ", $type" + else if (!type.isNullOrEmpty() && genre.isNullOrEmpty()) "$type" else "" } } } diff --git a/multisrc/overrides/wpmangastream/silencescan/src/SilenceScan.kt b/multisrc/overrides/wpmangastream/silencescan/src/SilenceScan.kt index 84bd7923f..9aff6ab5e 100644 --- a/multisrc/overrides/wpmangastream/silencescan/src/SilenceScan.kt +++ b/multisrc/overrides/wpmangastream/silencescan/src/SilenceScan.kt @@ -39,6 +39,11 @@ class SilenceScan : WPMangaStream( description = infoEl.select("h2:contains(Sinopse) + div p").joinToString("\n") { it.text() } genre = infoEl.select("b:contains(Gêneros) + span a").joinToString { it.text() } thumbnail_url = infoEl.select("div.thumb img").imgAttr() + + // add manga/manhwa/manhua thinggy to genre + val type = document.select(".imptdt:contains(Tipo) a, a[href*=type\\=]").firstOrNull()?.ownText() + genre += if (genre!!.contains(type.toString())) "" else if (!type.isNullOrEmpty() && !genre.isNullOrEmpty()) ", $type" + else if (!type.isNullOrEmpty() && genre.isNullOrEmpty()) "$type" else "" } override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { diff --git a/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt b/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt index 581f73216..9a5f15418 100644 --- a/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt +++ b/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt @@ -28,6 +28,11 @@ class WestManga : WPMangaStream("West Manga", "https://westmanga.info", "id") { author = infoElement.select(".infotable tr:contains(Author) td:last-child").firstOrNull()?.ownText() description = infoElement.select(".entry-content-single[itemprop=\"description\"]").joinToString("\n") { it.text() } thumbnail_url = infoElement.select("div.thumb img").imgAttr() + + // add manga/manhwa/manhua thinggy to genre + val type = document.select(".infotable tr:contains(Type) td:last-child").firstOrNull()?.ownText() + genre += if (genre!!.contains(type.toString())) "" else if (!type.isNullOrEmpty() && !genre.isNullOrEmpty()) ", $type" + else if (!type.isNullOrEmpty() && genre.isNullOrEmpty()) "$type" else "" } } } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt index 0547ad294..950854648 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt @@ -171,6 +171,11 @@ abstract class WPMangaStream( artist = infoElement.select(".fmed b:contains(Artist)+span, .imptdt:contains(Artist) i").firstOrNull()?.ownText() description = infoElement.select("div.desc p, div.entry-content p").joinToString("\n") { it.text() } thumbnail_url = infoElement.select("div.thumb img").imgAttr() + + // add manga/manhwa/manhua thinggy to genre + val type = document.select("span:contains(Type) a, .imptdt:contains(Type) a, a[href*=type\\=], .infotable tr:contains(Type) td:last-child").firstOrNull()?.ownText() + genre += if (genre!!.contains(type.toString())) "" else if (!type.isNullOrEmpty() && !genre.isNullOrEmpty()) ", $type" + else if (!type.isNullOrEmpty() && genre.isNullOrEmpty()) "$type" else "" } } } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt index c9e5fc107..f03f530ce 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt @@ -9,7 +9,7 @@ class WPMangaStreamGenerator : ThemeSourceGenerator { override val themeClass = "WPMangaStream" - override val baseVersionCode: Int = 2 + override val baseVersionCode: Int = 3 override val sources = listOf( SingleLang("Reset Scans", "https://reset-scans.com", "en"),