From 8ca592f1ad3f37d34f0adc7bb9b1c8ec4fc44be6 Mon Sep 17 00:00:00 2001 From: Stephane Mensah <waptik@users.noreply.github.com> Date: Fri, 18 Oct 2019 11:21:05 +0000 Subject: [PATCH] Madara(Source: add WordRain-en) (#1669) Madara(Source: add WordRain) --- src/all/madara/build.gradle | 2 +- .../extension/all/madara/MadaraFactory.kt | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/all/madara/build.gradle b/src/all/madara/build.gradle index 306e55bc3..6424291b0 100644 --- a/src/all/madara/build.gradle +++ b/src/all/madara/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: Madara (multiple sources)' pkgNameSuffix = "all.madara" extClass = '.MadaraFactory' - extVersionCode = 20 + extVersionCode = 21 libVersion = '1.2' } diff --git a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt index 9e7df695e..8f87a5234 100644 --- a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt +++ b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt @@ -5,10 +5,12 @@ import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory import eu.kanade.tachiyomi.source.model.FilterList +import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.util.asJsoup import okhttp3.Headers +import okhttp3.HttpUrl import java.text.SimpleDateFormat import java.util.Locale import okhttp3.Response @@ -39,6 +41,7 @@ class MadaraFactory : SourceFactory { MangaSY(), ManwhaClub(), WuxiaWorld(), + WordRain(), YoManga(), ManyToon(), ChibiManga(), @@ -111,7 +114,7 @@ class TsubakiNoScan : Madara("Tsubaki No Scan", "https://tsubakinoscan.com/", "fr", dateFormat = SimpleDateFormat("dd/MM/yy", Locale.US)) class YokaiJump : Madara("Yokai Jump", "https://yokaijump.fr/", "fr", dateFormat = SimpleDateFormat("dd/MM/yy", Locale.US)) { - override fun searchMangaNextPageSelector() = "nav.navigation-ajax" + override fun searchMangaNextPageSelector() = "nav.navigation-ajax" } class ZManga : Madara("ZManga", "https://zmanga.org/", "es") { override fun searchMangaNextPageSelector() = "nav.navigation-ajax" @@ -151,6 +154,19 @@ class WuxiaWorld : Madara("WuxiaWorld", "https://wuxiaworld.site/", "en") { override fun searchMangaRequest(page: Int, query: String, filters: FilterList) = super.searchMangaRequest(page, "$query comics", filters) override fun popularMangaNextPageSelector() = "div.nav-previous.float-left" } +class WordRain : Madara("WordRain Translation", "https://wordrain69.com", "en") { + override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga-genre/manga/page/$page/?m_orderby=views", headers) + override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga-genre/manga/page/$page/?m_orderby=latest", headers) + override fun searchMangaParse(response: Response): MangasPage { + + val url = HttpUrl.parse(response.request().url().toString())!!.newBuilder() + .addQueryParameter("genre[]", "manga").build() + val request: Request = Request.Builder().url(url).build() + val call = client.newCall(request) + val res: Response = call.execute() + return super.searchMangaParse(res) + } +} class YoManga : Madara("Yo Manga", "https://yomanga.info/", "en") { override fun searchMangaNextPageSelector() = "nav.navigation-ajax" }