diff --git a/multisrc/overrides/fmreader/epikmanga/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/fmreader/epikmanga/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..78315edd6 Binary files /dev/null and b/multisrc/overrides/fmreader/epikmanga/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/epikmanga/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/fmreader/epikmanga/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..b615a208a Binary files /dev/null and b/multisrc/overrides/fmreader/epikmanga/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/epikmanga/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/fmreader/epikmanga/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..17dd18b7c Binary files /dev/null and b/multisrc/overrides/fmreader/epikmanga/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/epikmanga/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/fmreader/epikmanga/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..e1852c8f4 Binary files /dev/null and b/multisrc/overrides/fmreader/epikmanga/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/epikmanga/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/fmreader/epikmanga/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..acc820c5c Binary files /dev/null and b/multisrc/overrides/fmreader/epikmanga/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/epikmanga/res/web_hi_res_512.png b/multisrc/overrides/fmreader/epikmanga/res/web_hi_res_512.png new file mode 100644 index 000000000..f8d907de4 Binary files /dev/null and b/multisrc/overrides/fmreader/epikmanga/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/fmreader/heroscan/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/fmreader/heroscan/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..807361f17 Binary files /dev/null and b/multisrc/overrides/fmreader/heroscan/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/heroscan/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/fmreader/heroscan/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..5892088bb Binary files /dev/null and b/multisrc/overrides/fmreader/heroscan/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/heroscan/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/fmreader/heroscan/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..8049a51db Binary files /dev/null and b/multisrc/overrides/fmreader/heroscan/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/heroscan/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/fmreader/heroscan/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..6049f5f25 Binary files /dev/null and b/multisrc/overrides/fmreader/heroscan/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/heroscan/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/fmreader/heroscan/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..a3033af3d Binary files /dev/null and b/multisrc/overrides/fmreader/heroscan/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/heroscan/res/web_hi_res_512.png b/multisrc/overrides/fmreader/heroscan/res/web_hi_res_512.png new file mode 100644 index 000000000..e36bee415 Binary files /dev/null and b/multisrc/overrides/fmreader/heroscan/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/fmreader/kisslove/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/fmreader/kisslove/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..96aa4eacd Binary files /dev/null and b/multisrc/overrides/fmreader/kisslove/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/kisslove/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/fmreader/kisslove/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..758455806 Binary files /dev/null and b/multisrc/overrides/fmreader/kisslove/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/kisslove/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/fmreader/kisslove/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..39639633c Binary files /dev/null and b/multisrc/overrides/fmreader/kisslove/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/kisslove/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/fmreader/kisslove/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..e17702e9e Binary files /dev/null and b/multisrc/overrides/fmreader/kisslove/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/kisslove/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/fmreader/kisslove/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..a2c3159f0 Binary files /dev/null and b/multisrc/overrides/fmreader/kisslove/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/kisslove/res/web_hi_res_512.png b/multisrc/overrides/fmreader/kisslove/res/web_hi_res_512.png new file mode 100644 index 000000000..c9a9c3134 Binary files /dev/null and b/multisrc/overrides/fmreader/kisslove/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..f2999b29a Binary files /dev/null and b/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..c984d44dd Binary files /dev/null and b/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..435c9f8ac Binary files /dev/null and b/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..e3fb49e7c Binary files /dev/null and b/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..20ee53a36 Binary files /dev/null and b/multisrc/overrides/fmreader/ksgroupscans/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/ksgroupscans/res/web_hi_res_512.png b/multisrc/overrides/fmreader/ksgroupscans/res/web_hi_res_512.png new file mode 100644 index 000000000..e4994fbed Binary files /dev/null and b/multisrc/overrides/fmreader/ksgroupscans/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/fmreader/mangatr/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/fmreader/mangatr/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..14035980a Binary files /dev/null and b/multisrc/overrides/fmreader/mangatr/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/mangatr/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/fmreader/mangatr/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..b1aa653e8 Binary files /dev/null and b/multisrc/overrides/fmreader/mangatr/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/mangatr/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/fmreader/mangatr/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..73a642028 Binary files /dev/null and b/multisrc/overrides/fmreader/mangatr/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/mangatr/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/fmreader/mangatr/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..892acb0dd Binary files /dev/null and b/multisrc/overrides/fmreader/mangatr/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/mangatr/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/fmreader/mangatr/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..6eb90718c Binary files /dev/null and b/multisrc/overrides/fmreader/mangatr/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/fmreader/mangatr/res/web_hi_res_512.png b/multisrc/overrides/fmreader/mangatr/res/web_hi_res_512.png new file mode 100644 index 000000000..35a7f9deb Binary files /dev/null and b/multisrc/overrides/fmreader/mangatr/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt b/multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt index d38764321..50a7417fc 100644 --- a/multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt +++ b/multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt @@ -1,10 +1,12 @@ package eu.kanade.tachiyomi.extension.en.manhwa18 +import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.fmreader.FMReader import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Page import okhttp3.Request +@Nsfw class Manhwa18 : FMReader("Manhwa18", "https://manhwa18.com", "en") { override fun imageRequest(page: Page): Request { return if (page.imageUrl!!.contains("manhwa18")) { @@ -14,4 +16,4 @@ class Manhwa18 : FMReader("Manhwa18", "https://manhwa18.com", "en") { } } override fun getGenreList() = getAdultGenreList() -} \ No newline at end of file +} diff --git a/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt b/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt index 43faabdc6..c91843740 100644 --- a/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt +++ b/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt @@ -1,5 +1,6 @@ package eu.kanade.tachiyomi.extension.all.manhwa18net +import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.fmreader.FMReader import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.Source @@ -14,6 +15,7 @@ class Manhwa18NetFactory : SourceFactory { ) } +@Nsfw class Manhwa18Net : FMReader("Manhwa18.net", "https://manhwa18.net", "en") { override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/$requestPath?listType=pagination&page=$page&sort=views&sort_type=DESC&ungenre=raw", headers) @@ -29,6 +31,7 @@ class Manhwa18Net : FMReader("Manhwa18.net", "https://manhwa18.net", "en") { override fun getGenreList() = getAdultGenreList() } +@Nsfw class Manhwa18NetRaw : FMReader("Manhwa18.net", "https://manhwa18.net", "ko") { override val requestPath = "manga-list-genre-raw.html" override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { diff --git a/multisrc/overrides/fmreader/manhwasmut/src/ManhwaSmut.kt b/multisrc/overrides/fmreader/manhwasmut/src/ManhwaSmut.kt index a5913f36a..31aae1dad 100644 --- a/multisrc/overrides/fmreader/manhwasmut/src/ManhwaSmut.kt +++ b/multisrc/overrides/fmreader/manhwasmut/src/ManhwaSmut.kt @@ -1,11 +1,13 @@ package eu.kanade.tachiyomi.extension.en.manhwasmut +import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.fmreader.FMReader import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Page import okhttp3.Request +@Nsfw class ManhwaSmut : FMReader("ManhwaSmut", "https://manhwasmut.com", "en") { private val noReferer = headersBuilder().removeAll("Referer").build() override fun imageRequest(page: Page): Request = GET(page.imageUrl!!, if (page.imageUrl!!.contains("toonily")) noReferer else headers) -} \ No newline at end of file +} diff --git a/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..e007d2666 Binary files /dev/null and b/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..22c3f7721 Binary files /dev/null and b/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..54f3c5e67 Binary files /dev/null and b/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..f77dfe995 Binary files /dev/null and b/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..76bfacecf Binary files /dev/null and b/multisrc/overrides/wpmangareader/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangareader/hikariscan/res/web_hi_res_512.png b/multisrc/overrides/wpmangareader/hikariscan/res/web_hi_res_512.png new file mode 100644 index 000000000..2be281c52 Binary files /dev/null and b/multisrc/overrides/wpmangareader/hikariscan/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/wpmangareader/ngomik/src/Ngomik.kt b/multisrc/overrides/wpmangareader/ngomik/src/Ngomik.kt new file mode 100644 index 000000000..106ee33d5 --- /dev/null +++ b/multisrc/overrides/wpmangareader/ngomik/src/Ngomik.kt @@ -0,0 +1,12 @@ +package eu.kanade.tachiyomi.extension.id.ngomik + +import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader +import okhttp3.Headers + +class Ngomik : WPMangaReader("Ngomik", "https://ngomik.net", "id", "/all-komik") { + private val userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36" + + override fun headersBuilder(): Headers.Builder = Headers.Builder() + .add("User-Agent", userAgent) + .add("Referer", baseUrl) +} diff --git a/multisrc/overrides/wpmangareader/turktoon/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/turktoon/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..debab0c63 Binary files /dev/null and b/multisrc/overrides/wpmangareader/turktoon/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangareader/turktoon/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/turktoon/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..07c3a9dfe Binary files /dev/null and b/multisrc/overrides/wpmangareader/turktoon/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangareader/turktoon/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/turktoon/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..b8e973b1b Binary files /dev/null and b/multisrc/overrides/wpmangareader/turktoon/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangareader/turktoon/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/turktoon/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..eaf1910aa Binary files /dev/null and b/multisrc/overrides/wpmangareader/turktoon/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangareader/turktoon/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/turktoon/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..08ef9267e Binary files /dev/null and b/multisrc/overrides/wpmangareader/turktoon/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangareader/turktoon/res/web_hi_res_512.png b/multisrc/overrides/wpmangareader/turktoon/res/web_hi_res_512.png new file mode 100644 index 000000000..c906e8362 Binary files /dev/null and b/multisrc/overrides/wpmangareader/turktoon/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt b/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt index 582d7897e..a19ede0f5 100644 --- a/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt +++ b/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt @@ -98,14 +98,29 @@ class KomikCast : WPMangaStream("Komik Cast", "https://komikcast.com", "id") { 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 "" + // add series type(manga/manhwa/manhua/other) thinggy to genre + document.select(seriesTypeSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && genre!!.contains(it, true).not()) { + genre += if (genre!!.isEmpty()) it else ", $it" + } + } + + // add alternative name to manga description + document.select(altNameSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && it !="N/A" && it != "-") { + description += when { + description!!.isEmpty() -> altName + it + else -> "\n\n$altName" + it + } + } + } } } } + override val seriesTypeSelector = "span:contains(Type) a" + override val altNameSelector = ".komik_info-content-native" + override fun chapterListSelector() = "div.komik_info-chapters li" override fun chapterFromElement(element: Element): SChapter { diff --git a/multisrc/overrides/wpmangastream/komikstation/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/komikstation/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..ee28782d4 Binary files /dev/null and b/multisrc/overrides/wpmangastream/komikstation/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/komikstation/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/komikstation/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..604eed8b2 Binary files /dev/null and b/multisrc/overrides/wpmangastream/komikstation/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/komikstation/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/komikstation/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..16e1d720b Binary files /dev/null and b/multisrc/overrides/wpmangastream/komikstation/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/komikstation/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/komikstation/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..bbfe6b20f Binary files /dev/null and b/multisrc/overrides/wpmangastream/komikstation/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/komikstation/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/komikstation/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..b465a32cd Binary files /dev/null and b/multisrc/overrides/wpmangastream/komikstation/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/komikstation/res/web_hi_res_512.png b/multisrc/overrides/wpmangastream/komikstation/res/web_hi_res_512.png new file mode 100644 index 000000000..491429c19 Binary files /dev/null and b/multisrc/overrides/wpmangastream/komikstation/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..cafc06c2d Binary files /dev/null and b/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..5ba544b22 Binary files /dev/null and b/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..3aefd2203 Binary files /dev/null and b/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..859a61cb9 Binary files /dev/null and b/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..f8cf1ee2c Binary files /dev/null and b/multisrc/overrides/wpmangastream/liebeschneehiver/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/liebeschneehiver/res/web_hi_res_512.png b/multisrc/overrides/wpmangastream/liebeschneehiver/res/web_hi_res_512.png new file mode 100644 index 000000000..62223ed38 Binary files /dev/null and b/multisrc/overrides/wpmangastream/liebeschneehiver/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..88e9a2170 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..06f89e6ca Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..cac62f053 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..a42b9cffe Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..0061eafe5 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangakyo/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangakyo/res/web_hi_res_512.png b/multisrc/overrides/wpmangastream/mangakyo/res/web_hi_res_512.png new file mode 100644 index 000000000..c99ae07e7 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangakyo/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..c38eb0f6a Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..721301b2a Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..3e8ba7df1 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..7757d24e1 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..03c3d74f7 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangaproz/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangaproz/res/web_hi_res_512.png b/multisrc/overrides/wpmangastream/mangaproz/res/web_hi_res_512.png new file mode 100644 index 000000000..adf745b18 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangaproz/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..2cd84f335 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..db49ab7c8 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..9ba020142 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..331bdab72 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..1b4d2ba43 Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangaswat/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/mangaswat/res/web_hi_res_512.png b/multisrc/overrides/wpmangastream/mangaswat/res/web_hi_res_512.png new file mode 100644 index 000000000..963f86a5e Binary files /dev/null and b/multisrc/overrides/wpmangastream/mangaswat/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..d1d684035 Binary files /dev/null and b/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..088bb65f5 Binary files /dev/null and b/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..d513c441e Binary files /dev/null and b/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..8803fd9e5 Binary files /dev/null and b/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..5f2e349bd Binary files /dev/null and b/multisrc/overrides/wpmangastream/nonstopscans/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/nonstopscans/res/web_hi_res_512.png b/multisrc/overrides/wpmangastream/nonstopscans/res/web_hi_res_512.png new file mode 100644 index 000000000..f067b08b2 Binary files /dev/null and b/multisrc/overrides/wpmangastream/nonstopscans/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..cad8792e7 Binary files /dev/null and b/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..842540e29 Binary files /dev/null and b/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..4facc1596 Binary files /dev/null and b/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..60852998d Binary files /dev/null and b/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..833ebb3a3 Binary files /dev/null and b/multisrc/overrides/wpmangastream/noxsubs/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/noxsubs/res/web_hi_res_512.png b/multisrc/overrides/wpmangastream/noxsubs/res/web_hi_res_512.png new file mode 100644 index 000000000..d7f5c4ce6 Binary files /dev/null and b/multisrc/overrides/wpmangastream/noxsubs/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..3a331c5bb Binary files /dev/null and b/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..a7513e106 Binary files /dev/null and b/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..c217f988e Binary files /dev/null and b/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..ec867c650 Binary files /dev/null and b/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..3f9ace4da Binary files /dev/null and b/multisrc/overrides/wpmangastream/rawkuma/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/rawkuma/res/web_hi_res_512.png b/multisrc/overrides/wpmangastream/rawkuma/res/web_hi_res_512.png new file mode 100644 index 000000000..10ba4bad2 Binary files /dev/null and b/multisrc/overrides/wpmangastream/rawkuma/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/wpmangastream/readkomik/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/readkomik/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..ab422128c Binary files /dev/null and b/multisrc/overrides/wpmangastream/readkomik/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/readkomik/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/readkomik/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..4cec5bff9 Binary files /dev/null and b/multisrc/overrides/wpmangastream/readkomik/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/readkomik/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/readkomik/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..842a23cf8 Binary files /dev/null and b/multisrc/overrides/wpmangastream/readkomik/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/readkomik/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/readkomik/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..c59884608 Binary files /dev/null and b/multisrc/overrides/wpmangastream/readkomik/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/readkomik/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/readkomik/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..00367e71b Binary files /dev/null and b/multisrc/overrides/wpmangastream/readkomik/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/readkomik/res/web_hi_res_512.png b/multisrc/overrides/wpmangastream/readkomik/res/web_hi_res_512.png new file mode 100644 index 000000000..a6b7ac496 Binary files /dev/null and b/multisrc/overrides/wpmangastream/readkomik/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/wpmangastream/silencescan/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/silencescan/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..93f01396c Binary files /dev/null and b/multisrc/overrides/wpmangastream/silencescan/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/silencescan/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/silencescan/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..c4431156b Binary files /dev/null and b/multisrc/overrides/wpmangastream/silencescan/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/silencescan/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/silencescan/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..49c725229 Binary files /dev/null and b/multisrc/overrides/wpmangastream/silencescan/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/silencescan/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/silencescan/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..8a7557144 Binary files /dev/null and b/multisrc/overrides/wpmangastream/silencescan/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/silencescan/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/silencescan/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..e263f177c Binary files /dev/null and b/multisrc/overrides/wpmangastream/silencescan/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/wpmangastream/silencescan/res/web_hi_res_512.png b/multisrc/overrides/wpmangastream/silencescan/res/web_hi_res_512.png new file mode 100644 index 000000000..b888ac94f Binary files /dev/null and b/multisrc/overrides/wpmangastream/silencescan/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/wpmangastream/silencescan/src/SilenceScan.kt b/multisrc/overrides/wpmangastream/silencescan/src/SilenceScan.kt index 9aff6ab5e..e26137379 100644 --- a/multisrc/overrides/wpmangastream/silencescan/src/SilenceScan.kt +++ b/multisrc/overrides/wpmangastream/silencescan/src/SilenceScan.kt @@ -37,15 +37,35 @@ class SilenceScan : WPMangaStream( artist = infoEl.select("b:contains(Artista) + span").text() status = parseStatus(infoEl.select("div.imptdt:contains(Status) i").text()) 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 "" + val genres = infoEl.select("b:contains(Gêneros) + span a") + .map { element -> element.text().toLowerCase() } + .toMutableSet() + + // add series type(manga/manhwa/manhua/other) thinggy to genre + document.select(seriesTypeSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && genres.contains(it).not()) { + genres.add(it.toLowerCase()) + } + } + + genre = genres.toList().map { it.capitalize() }.joinToString(", ") + + // add alternative name to manga description + document.select(altNameSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && it !="N/A" && it != "-") { + description += when { + description!!.isEmpty() -> altName + it + else -> "\n\n$altName" + it + } + } + } } + override val seriesTypeSelector = ".imptdt:contains(Tipo) a, a[href*=type\\=]" + override val altNameSelector = ".wd-full:contains(Alt) span" + override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { name = element.select("span.chapternum").text() scanlator = this@SilenceScan.name diff --git a/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt b/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt index 9a5f15418..d9c36f325 100644 --- a/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt +++ b/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt @@ -29,13 +29,27 @@ class WestManga : WPMangaStream("West Manga", "https://westmanga.info", "id") { 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 "" + // add series type(manga/manhwa/manhua/other) thinggy to genre + document.select(seriesTypeSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && genre!!.contains(it, true).not()) { + genre += if (genre!!.isEmpty()) it else ", $it" + } + } + + // add alternative name to manga description + document.select(altNameSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && it !="N/A" && it != "-") { + description += when { + description!!.isEmpty() -> altName + it + else -> "\n\n$altName" + it + } + } + } } } } + + override val seriesTypeSelector = ".infotable tr:contains(Type) td:last-child" override fun getGenreList(): List = listOf( Genre("4 Koma", "344"), Genre("Action", "13"), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt index 6f586f695..daa70b886 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt @@ -159,14 +159,29 @@ abstract class FMReader( val infoElement = document.select("div.row").first() return SManga.create().apply { - author = infoElement.select("li a.btn-info").text() + infoElement.select("li a.btn-info").text().let { + if (it.contains("Updating", true).not()) author = it + } genre = infoElement.select("li a.btn-danger").joinToString { it.text() } status = parseStatus(infoElement.select("li a.btn-success").first()?.text()) description = document.select("div.detail .content, div.row ~ div.row:has(h3:first-child) p, .summary-content p").text().trim() thumbnail_url = infoElement.select("img.thumbnail").imgAttr() + + // add alternative name to manga description + infoElement.select(altNameSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && it.contains("Updating", true).not()) { + description += when { + description!!.isEmpty() -> altName + it + else -> "\n\n$altName" + it + } + } + } } } + open val altNameSelector = "li:contains(Other names)" + open val altName = "Alternative Name" // the alt name already contains ": " eg. ": alt name1, alt name2" + // languages: en, vi, tr fun parseStatus(status: String?): Int { val completedWords = setOf("completed", "complete", "incomplete", "đã hoàn thành", "tamamlandı", "hoàn thành") diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReaderGenerator.kt index 073fb3ef3..28ed3c8f6 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReaderGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReaderGenerator.kt @@ -10,48 +10,23 @@ class FMReaderGenerator : ThemeSourceGenerator { override val themeClass = "FMReader" - override val baseVersionCode: Int = 1 + override val baseVersionCode: Int = 2 /** For future sources: when testing and popularMangaRequest() returns a Jsoup error instead of results * most likely the fix is to override popularMangaNextPageSelector() */ override val sources = listOf( - SingleLang( - "18LHPlus", - "https://18lhplus.com", - "en", - className = "EighteenLHPlus" - ), + SingleLang("18LHPlus", "https://18lhplus.com", "en", className = "EighteenLHPlus"), SingleLang("Epik Manga", "https://www.epikmanga.com", "tr"), - SingleLang( - "HanaScan (RawQQ)", - "https://hanascan.com", - "ja", - className = "HanaScanRawQQ" - ), + SingleLang("HanaScan (RawQQ)", "https://hanascan.com", "ja", className = "HanaScanRawQQ"), SingleLang("HeroScan", "https://heroscan.com", "en"), SingleLang("KissLove", "https://kissaway.net", "ja"), - SingleLang( - "LHTranslation", - "https://lhtranslation.net", - "en", - overrideVersionCode = 1 - ), + SingleLang("LHTranslation", "https://lhtranslation.net", "en", overrideVersionCode = 1), SingleLang("Manga-TR", "https://manga-tr.com", "tr", className = "MangaTR"), - SingleLang("ManhuaScan", "https://manhuascan.com", "en"), - SingleLang("Manhwa18", "https://manhwa18.com", "en"), - MultiLang( - "Manhwa18.net", - "https://manhwa18.net", - listOf("en", "ko"), - className = "Manhwa18NetFactory" - ), - SingleLang( - "ManhwaSmut", - "https://manhwasmut.com", - "en", - overrideVersionCode = 1 - ), + SingleLang("ManhuaScan", "https://manhuascan.com", "en", isNsfw = true), + SingleLang("Manhwa18", "https://manhwa18.com", "en", isNsfw = true), + MultiLang("Manhwa18.net", "https://manhwa18.net", listOf("en", "ko"), className = "Manhwa18NetFactory", isNsfw = true), + SingleLang("ManhwaSmut", "https://manhwasmut.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("RawLH", "https://lovehug.net", "ja"), SingleLang("Say Truyen", "https://saytruyen.com", "vi"), SingleLang("KSGroupScans", "https://ksgroupscans.com", "en"), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt index 4b63502d4..84fbcb7ba 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt @@ -154,9 +154,22 @@ abstract class MangaBox( ?.replace("""<\s*br\s*/?>""".toRegex(), "\n") ?.replace("<[^>]*>".toRegex(), "") thumbnail_url = document.select(thumbnailSelector).attr("abs:src") + + // add alternative name to manga description + document.select(altNameSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not()) { + description += when { + description!!.isEmpty() -> altName + it + else -> "\n\n$altName" + it + } + } + } } } + open val altNameSelector = ".story-alternative, tr:has(.info-alternative) h2" + open val altName = "Alternative Name" + ": " + private fun parseStatus(status: String?) = when { status == null -> SManga.UNKNOWN status.contains("Ongoing") -> SManga.ONGOING diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBoxGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBoxGenerator.kt index 3b8abd2ed..407226214 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBoxGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBoxGenerator.kt @@ -9,7 +9,7 @@ class MangaBoxGenerator : ThemeSourceGenerator { override val themeClass = "MangaBox" - override val baseVersionCode: Int = 1 + override val baseVersionCode: Int = 2 override val sources = listOf( SingleLang("Mangakakalot", "https://mangakakalot.com", "en"), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt index dcee38a40..4cb8df952 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt @@ -186,16 +186,33 @@ abstract class NepNep( SManga.create().apply { title = info.select("h1").text() author = info.select("li.list-group-item:has(span:contains(Author)) a").first()?.text() - genre = info.select("li.list-group-item:has(span:contains(Genre)) a").joinToString { it.text() } status = info.select("li.list-group-item:has(span:contains(Status)) a:contains(scan)").text().toStatus() description = info.select("div.Content").text() thumbnail_url = info.select("img").attr("abs:src") - // add manga/manhwa/manhua thinggy to genre - val type = info.select("li.list-group-item:has(span:contains(Type)) a, a[href*=type\\=]").firstOrNull()?.ownText() - genre += if (genre!!.contains(type.toString(), true) || type == "-") "" - else if (!type.isNullOrEmpty() && !genre.isNullOrEmpty()) ", $type" - else if (!type.isNullOrEmpty() && genre.isNullOrEmpty()) "$type" else "" + val genres = info.select("li.list-group-item:has(span:contains(Genre)) a") + .map { element -> element.text() } + .toMutableSet() + + // add series type(manga/manhwa/manhua/other) thinggy to genre + info.select("li.list-group-item:has(span:contains(Type)) a, a[href*=type\\=]").firstOrNull()?.ownText()?.let { + if (it.isEmpty().not()) { + genres.add(it) + } + } + + genre = genres.toList().joinToString(", ") + + // add alternative name to manga description + val altName = "Alternative Name: " + info.select("li.list-group-item:has(span:contains(Alter))").firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && it !="N/A") { + description += when { + description!!.isEmpty() -> altName + it + else -> "\n\n$altName" + it + } + } + } } } } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNepGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNepGenerator.kt index 5265967ac..6e4e94dfc 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNepGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNepGenerator.kt @@ -9,7 +9,7 @@ class NepNepGenerator : ThemeSourceGenerator { override val themeClass = "NepNep" - override val baseVersionCode: Int = 2 + override val baseVersionCode: Int = 3 override val sources = listOf( SingleLang("MangaSee", "https://mangasee123.com", "en", overrideVersionCode = 20), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt index 1f594e931..62dec0237 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt @@ -30,12 +30,12 @@ abstract class WPMangaReader( override val client: OkHttpClient = network.cloudflareClient // popular - override fun popularMangaSelector() = ".utao .uta .imgu, .listupd .bs .bsx " + override fun popularMangaSelector() = ".utao .uta .imgu, .listupd .bs .bsx, .listo .bs .bsx" override fun popularMangaRequest(page: Int) = GET("$baseUrl$mangaUrlDirectory/?page=$page&order=popular", headers) override fun popularMangaFromElement(element: Element) = SManga.create().apply { - thumbnail_url = element.select("img").attr("src") + thumbnail_url = element.select("img").attr("abs:src") title = element.select("a").attr("title") setUrlWithoutDomain(element.select("a").attr("href")) } @@ -84,15 +84,31 @@ abstract class WPMangaReader( .text() ) - thumbnail_url = document.select(".infomanga > div[itemprop=image] img, .thumb img").attr("src") + thumbnail_url = document.select(".infomanga > div[itemprop=image] img, .thumb img").attr("abs:src") description = document.select(".desc, .entry-content[itemprop=description]").joinToString("\n") { it.text() } // add series type(manga/manhwa/manhua/other) 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 "" + document.select(seriesTypeSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && genre!!.contains(it, true).not()) { + genre += if (genre!!.isEmpty()) it else ", $it" + } + } + + // add alternative name to manga description + document.select(altNameSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not()) { + description += when { + description!!.isEmpty() -> altName + it + else -> "\n\n$altName" + it + } + } + } } + open val seriesTypeSelector = "span:contains(Type) a, .imptdt:contains(Type) a, a[href*=type\\=], .infotable tr:contains(Type) td:last-child" + open val altNameSelector = ".alternative, .seriestualt" + open val altName = "Alternative Name" + ": " + private fun parseStatus(status: String) = when { status.contains("Ongoing") -> SManga.ONGOING status.contains("Completed") -> SManga.COMPLETED diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt index a0c8a03e1..4d339d42a 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt @@ -9,7 +9,7 @@ class WPMangaReaderGenerator : ThemeSourceGenerator { override val themeClass = "WPMangaReader" - override val baseVersionCode: Int = 3 + override val baseVersionCode: Int = 4 override val sources = listOf( SingleLang("Hikari Scan", "https://hikariscan.com.br", "pt-BR", overrideVersionCode = 1), 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 950854648..a811fd2a4 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 @@ -165,21 +165,42 @@ abstract class WPMangaStream( override fun mangaDetailsParse(document: Document): SManga { return SManga.create().apply { document.select("div.bigcontent, div.animefull, div.main-info").firstOrNull()?.let { infoElement -> - genre = infoElement.select("span:contains(Genre) a, .mgen a").joinToString { it.text() } status = parseStatus(infoElement.select("span:contains(Status:), .imptdt:contains(Status) i").firstOrNull()?.ownText()) author = infoElement.select("span:contains(Author:), span:contains(Pengarang:), .fmed b:contains(Author)+span, .imptdt:contains(Author) i").firstOrNull()?.ownText() 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 "" + val genres = infoElement.select("span:contains(Genre) a, .mgen a") + .map { element -> element.text().toLowerCase() } + .toMutableSet() + + // add series type(manga/manhwa/manhua/other) thinggy to genre + document.select(seriesTypeSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && genres.contains(it).not()) { + genres.add(it.toLowerCase()) + } + } + + genre = genres.toList().map { it.capitalize() }.joinToString(", ") + + // add alternative name to manga description + document.select(altNameSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && it !="N/A" && it != "-") { + description += when { + description!!.isEmpty() -> altName + it + else -> "\n\n$altName" + it + } + } + } } } } + open val seriesTypeSelector = "span:contains(Type) a, .imptdt:contains(Type) a, a[href*=type\\=], .infotable tr:contains(Type) td:last-child" + open val altNameSelector = ".alternative, .wd-full:contains(Alt) span, .alter, .seriestualt" + open val altName = "Alternative Name" + ": " + protected fun parseStatus(element: String?): Int = when { element == null -> SManga.UNKNOWN listOf("ongoing", "publishing").any { it.contains(element, ignoreCase = true) } -> SManga.ONGOING 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 c985c1257..c23727391 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 = 3 + override val baseVersionCode: Int = 4 override val sources = listOf( SingleLang("KlanKomik", "https://klankomik.com", "id"), diff --git a/src/en/mangapark/build.gradle b/src/en/mangapark/build.gradle index 8a9310aae..5025c3ce3 100644 --- a/src/en/mangapark/build.gradle +++ b/src/en/mangapark/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'MangaPark' pkgNameSuffix = 'en.mangapark' extClass = '.MangaPark' - extVersionCode = 17 + extVersionCode = 18 libVersion = '1.2' } diff --git a/src/en/mangapark/src/eu/kanade/tachiyomi/extension/en/mangapark/MangaPark.kt b/src/en/mangapark/src/eu/kanade/tachiyomi/extension/en/mangapark/MangaPark.kt index fdd0b6e52..d11cd0df8 100644 --- a/src/en/mangapark/src/eu/kanade/tachiyomi/extension/en/mangapark/MangaPark.kt +++ b/src/en/mangapark/src/eu/kanade/tachiyomi/extension/en/mangapark/MangaPark.kt @@ -115,6 +115,18 @@ class MangaPark : ConfigurableSource, ParsedHttpSource() { } description = document.getElementsByClass("summary").text().trim() + + // add alternative name to manga description + val altName = "Alternative Name: " + document.select(".attr > tbody > tr:contains(Alter) td").firstOrNull()?.ownText()?.let { + if (it.isEmpty().not()) { + description += when { + description!!.isEmpty() -> altName + it + else -> "\n\n$altName" + it + } + } + } + } // force network to make sure chapter prefs take effect diff --git a/src/id/komiku/build.gradle b/src/id/komiku/build.gradle index f6f785815..c488de8da 100644 --- a/src/id/komiku/build.gradle +++ b/src/id/komiku/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Komiku' pkgNameSuffix = 'id.komiku' extClass = '.Komiku' - extVersionCode = 10 + extVersionCode = 11 libVersion = '1.2' } diff --git a/src/id/komiku/src/eu/kanade/tachiyomi/extension/id/komiku/Komiku.kt b/src/id/komiku/src/eu/kanade/tachiyomi/extension/id/komiku/Komiku.kt index bdcbe7ddc..ef868ec2b 100644 --- a/src/id/komiku/src/eu/kanade/tachiyomi/extension/id/komiku/Komiku.kt +++ b/src/id/komiku/src/eu/kanade/tachiyomi/extension/id/komiku/Komiku.kt @@ -232,11 +232,13 @@ class Komiku : ParsedHttpSource() { status = parseStatus(document.select("table.inftable tr > td:contains(Status) + td").text()) thumbnail_url = document.select("div.ims > img").attr("abs:src") - // add manga/manhwa/manhua thinggy to genre - val type = document.select("table.inftable tr:contains(Jenis) a, table.inftable tr:has(a[href*=category\\/]) a, a[href*=category\\/]").text() - genre += if (genre!!.contains(type.toString(), true) || type == "-") "" - else if (!type.isNullOrEmpty() && !genre.isNullOrEmpty()) ", $type" - else if (!type.isNullOrEmpty() && genre.isNullOrEmpty()) "$type" else "" + // add series type(manga/manhwa/manhua/other) thinggy to genre + val seriesTypeSelector = "table.inftable tr:contains(Jenis) a, table.inftable tr:has(a[href*=category\\/]) a, a[href*=category\\/]" + document.select(seriesTypeSelector).firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && genre!!.contains(it, true).not()) { + genre += if (genre!!.isEmpty()) it else ", $it" + } + } } private fun parseStatus(status: String) = when { diff --git a/src/id/maidmanga/build.gradle b/src/id/maidmanga/build.gradle index 7ddaff0d2..495deefb4 100644 --- a/src/id/maidmanga/build.gradle +++ b/src/id/maidmanga/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Maid - Manga' pkgNameSuffix = 'id.maidmanga' extClass = '.MaidManga' - extVersionCode = 6 + extVersionCode = 7 libVersion = '1.2' } diff --git a/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt b/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt index 71165bc83..2641981ab 100644 --- a/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt +++ b/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt @@ -104,11 +104,23 @@ class MaidManga : ParsedHttpSource() { status = parseStatus(document.select("div.block span.status").text()) author = document.select("ul.series-infolist li b:contains(Author) + span").text() - // add manga/manhwa/manhua thinggy to genre - val type = document.select("div.block span.type").text() - genre += if (genre!!.contains(type.toString(), true) || type == "-") "" - else if (!type.isNullOrEmpty() && !genre.isNullOrEmpty()) ", $type" - else if (!type.isNullOrEmpty() && genre.isNullOrEmpty()) "$type" else "" + // add series type(manga/manhwa/manhua/other) thinggy to genre + document.select("div.block span.type").firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && it != "-" && genre!!.contains(it, true).not()) { + genre += if (genre!!.isEmpty()) it else ", $it" + } + } + + // add alternative name to manga description + val altName = "Alternative Name: " + document.select(".series-title span").firstOrNull()?.ownText()?.let { + if (it.isEmpty().not()) { + description += when { + description!!.isEmpty() -> altName + it + else -> "\n\n$altName" + it + } + } + } } } diff --git a/src/id/manhuaid/build.gradle b/src/id/manhuaid/build.gradle index d2179af5f..2f0ba6b2b 100644 --- a/src/id/manhuaid/build.gradle +++ b/src/id/manhuaid/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'ManhuaID' pkgNameSuffix = 'id.manhuaid' extClass = '.ManhuaID' - extVersionCode = 5 + extVersionCode = 6 libVersion = '1.2' } diff --git a/src/id/manhuaid/src/eu/kanade/tachiyomi/extension/id/manhuaid/ManhuaID.kt b/src/id/manhuaid/src/eu/kanade/tachiyomi/extension/id/manhuaid/ManhuaID.kt index 8cc04bebc..0c6f589b6 100644 --- a/src/id/manhuaid/src/eu/kanade/tachiyomi/extension/id/manhuaid/ManhuaID.kt +++ b/src/id/manhuaid/src/eu/kanade/tachiyomi/extension/id/manhuaid/ManhuaID.kt @@ -68,11 +68,12 @@ class ManhuaID : ParsedHttpSource() { } thumbnail_url = document.select("img.img-fluid").attr("abs:src") - // add manga/manhwa/manhua thinggy to genre - val type = document.select("table tr:contains(Type) a, table a[href*=type]").firstOrNull()?.ownText() - genre += if (genre!!.contains(type.toString(), true) || type == "-") "" - else if (!type.isNullOrEmpty() && !genre.isNullOrEmpty()) ", $type" - else if (!type.isNullOrEmpty() && genre.isNullOrEmpty()) "$type" else "" + // add series type(manga/manhwa/manhua/other) thinggy to genre + document.select("table tr:contains(Type) a, table a[href*=type]").firstOrNull()?.ownText()?.let { + if (it.isEmpty().not() && genre!!.contains(it, true).not()) { + genre += if (genre!!.isEmpty()) it else ", $it" + } + } } private fun parseStatus(status: String) = when {