From 69ba77f79244a2d140834cc57f86df38b12b261c Mon Sep 17 00:00:00 2001 From: Miftakhuddin Falaki <60594222+kikuKeii@users.noreply.github.com> Date: Sun, 26 Jul 2020 04:51:26 +0700 Subject: [PATCH] WP Mangastream - update Sekte Komik, KomikStation, KomikAV (#3891) * Update Komik Station, Sekte Komik, KomikAV Fix NextPageSelector and LastUpadet * Update Gradle * Add MangaP Co-authored-by: snakedoc83 --- src/all/wpmangastream/build.gradle | 2 +- .../all/wpmangastream/WPMangaStream.kt | 4 +-- .../all/wpmangastream/WPMangaStreamFactory.kt | 27 +++++++++++++------ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/all/wpmangastream/build.gradle b/src/all/wpmangastream/build.gradle index 197308a0e..a231ea83d 100644 --- a/src/all/wpmangastream/build.gradle +++ b/src/all/wpmangastream/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'WP Mangstream (multiple sources)' pkgNameSuffix = 'all.wpmangastream' extClass = '.WPMangaStreamFactory' - extVersionCode = 18 + extVersionCode = 19 libVersion = '1.2' } diff --git a/src/all/wpmangastream/src/eu/kanade/tachiyomi/extension/all/wpmangastream/WPMangaStream.kt b/src/all/wpmangastream/src/eu/kanade/tachiyomi/extension/all/wpmangastream/WPMangaStream.kt index 0d460a9cf..b0b12b265 100644 --- a/src/all/wpmangastream/src/eu/kanade/tachiyomi/extension/all/wpmangastream/WPMangaStream.kt +++ b/src/all/wpmangastream/src/eu/kanade/tachiyomi/extension/all/wpmangastream/WPMangaStream.kt @@ -155,7 +155,7 @@ abstract class WPMangaStream( override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element) override fun latestUpdatesFromElement(element: Element): SManga = popularMangaFromElement(element) - override fun popularMangaNextPageSelector(): String? = "a.next.page-numbers" + override fun popularMangaNextPageSelector(): String? = "a.next.page-numbers, a.r" override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector() override fun searchMangaNextPageSelector() = popularMangaNextPageSelector() @@ -218,7 +218,7 @@ abstract class WPMangaStream( } } else { try { - dateFormat.parse(date).time + dateFormat.parse(date)?.time ?: 0 } catch (_: Exception) { 0L } diff --git a/src/all/wpmangastream/src/eu/kanade/tachiyomi/extension/all/wpmangastream/WPMangaStreamFactory.kt b/src/all/wpmangastream/src/eu/kanade/tachiyomi/extension/all/wpmangastream/WPMangaStreamFactory.kt index 596ceada7..f27fb8b71 100644 --- a/src/all/wpmangastream/src/eu/kanade/tachiyomi/extension/all/wpmangastream/WPMangaStreamFactory.kt +++ b/src/all/wpmangastream/src/eu/kanade/tachiyomi/extension/all/wpmangastream/WPMangaStreamFactory.kt @@ -40,11 +40,15 @@ class WPMangaStreamFactory : SourceFactory { KomikTap(), Matakomik(), KomikindoCo(), - ReadKomik() + ReadKomik(), + MangaP() ) } -class SekteKomik : WPMangaStream("Sekte Komik (WP Manga Stream)", "https://sektekomik.com", "id") +class SekteKomik : WPMangaStream("Sekte Komik (WP Manga Stream)", "https://sektekomik.com", "id") { + override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga/?page=$page&order=popular", headers) + override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga/?page=$page&order=update", headers) +} class Kiryuu : WPMangaStream("Kiryuu (WP Manga Stream)", "https://kiryuu.co", "id") { override fun pageListParse(document: Document): List { return document.select("div#readerarea img").map { it.attr("abs:src") } @@ -52,8 +56,14 @@ class Kiryuu : WPMangaStream("Kiryuu (WP Manga Stream)", "https://kiryuu.co", "i .mapIndexed { i, image -> Page(i, "", image) } } } -class KomikAV : WPMangaStream("Komik AV (WP Manga Stream)", "https://komikav.com", "id") -class KomikStation : WPMangaStream("Komik Station (WP Manga Stream)", "https://komikstation.com", "id") +class KomikAV : WPMangaStream("Komik AV (WP Manga Stream)", "https://komikav.com", "id") { + override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga/?page=$page&order=popular", headers) + override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga/?page=$page&order=update", headers) +} +class KomikStation : WPMangaStream("Komik Station (WP Manga Stream)", "https://komikstation.com", "id") { + override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga/?page=$page&order=popular", headers) + override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga/?page=$page&order=update", headers) +} class KomikCast : WPMangaStream("Komik Cast (WP Manga Stream)", "https://komikcast.com", "id") { override fun popularMangaRequest(page: Int): Request { return GET("$baseUrl/daftar-komik/page/$page/?order=popular", headers) @@ -473,7 +483,6 @@ class KomikGo : WPMangaStream("Komik GO (WP Manga Stream)", "https://komikgo.com class KomikIndo : WPMangaStream("Komik Indo (WP Manga Stream)", "https://www.komikindo.web.id", "id") { override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga/?page=$page&order=popular", headers) override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga/?page=$page&order=latest", headers) - override fun popularMangaNextPageSelector() = "a.r" } class MangaSwat : WPMangaStream("MangaSwat", "https://mangaswat.com", "ar") { @@ -496,8 +505,6 @@ class MangaSwat : WPMangaStream("MangaSwat", "https://mangaswat.com", "ar") { .add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:76.0) Gecko/20100101 Firefox/76.0") .add("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3") - override fun popularMangaNextPageSelector() = "div.hpage a.r" - override fun mangaDetailsParse(document: Document): SManga { return SManga.create().apply { document.select("div.bigcontent").firstOrNull()?.let { infoElement -> @@ -629,7 +636,6 @@ class KomikTap : WPMangaStream("KomikTap", "https://komiktap.net", "id") { thumbnail_url = element.select("img").attr("abs:src") } } - override fun latestUpdatesNextPageSelector() = "div.hpage a.r" // Source's search is semi-broken, filtered search returns "no results" for page > 1 override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request = GET("$baseUrl/cari-manga/$query/page/$page/") override fun searchMangaNextPageSelector() = "a.next.page-numbers" @@ -647,3 +653,8 @@ class Matakomik : WPMangaStream("Matakomik", "https://matakomik.com", "id") { class KomikindoCo : WPMangaStream("Komikindo.co", "https://komikindo.co", "id") class ReadKomik : WPMangaStream("Readkomik", "https://readkomik.com", "en") + +class MangaP : WPMangaStream("MangaP", "https://mangap.me", "ar") { + override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga/?page=$page&order=popular", headers) + override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga/?page=$page&order=update", headers) +}