From b8a4865f45d8cf93516aeb92c25947d2524cc247 Mon Sep 17 00:00:00 2001 From: happywillow0 <45346080+happywillow0@users.noreply.github.com> Date: Thu, 9 Apr 2020 23:46:36 -0400 Subject: [PATCH] Madara - Add Websites (#2631) Madara - Add Websites --- src/all/madara/build.gradle | 2 +- .../extension/all/madara/MadaraFactory.kt | 43 +++++++++++++++++-- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/all/madara/build.gradle b/src/all/madara/build.gradle index f99c8389d..551acbfeb 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 = 66 + extVersionCode = 67 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 2b36941b7..5355a0ec0 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 @@ -3,13 +3,22 @@ package eu.kanade.tachiyomi.extension.all.madara import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -import eu.kanade.tachiyomi.source.model.* +import eu.kanade.tachiyomi.source.model.Filter +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.source.model.SManga import eu.kanade.tachiyomi.util.asJsoup -import okhttp3.* +import okhttp3.Headers +import okhttp3.HttpUrl +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element import java.text.SimpleDateFormat -import java.util.* +import java.util.Locale class MadaraFactory : SourceFactory { override fun createSources(): List = listOf( @@ -86,7 +95,11 @@ class MadaraFactory : SourceFactory { MangaLord(), PornComix(), MangaRead(), - UnknownScans() + UnknownScans(), + Manga68(), + ManhuaBox(), + RaiderScans(), + PojokManga() ) } @@ -530,3 +543,25 @@ class PornComix : Madara("PornComix", "https://www.porncomixonline.net", "en") class MangaRead : Madara("Manga Read", "https://mangaread.co", "en", SimpleDateFormat("yyyy-MM-dd", Locale.US)) class UnknownScans : Madara("Unknown Scans", "https://unknoscans.com", "en") + +class Manga68 : Madara("Manga68", "https://manga68.com", "en") { + override val pageListParseSelector = "div.page-break, div.text-left p" + override fun pageListParse(document: Document): List { + return document.select(pageListParseSelector).mapIndexed { index, element -> + Page(index, "", element.select("img").first()?.let { + it.absUrl(/*if (it.hasAttr("data-lazy-src")) "data-lazy-src" else */if (it.hasAttr("data-src")) "data-src" else "src") + }) + }.filter { it.imageUrl!!.startsWith("http") } + } +} + +class ManhuaBox : Madara("ManhuaBox", "https://manhuabox.net", "en") { + override val pageListParseSelector = "div.page-break, div.text-left p img" +} + +class RaiderScans : Madara("Raider Scans", "https://raiderscans.com", "en") + +class PojokManga : Madara("Pojok Manga", "https://pojokmanga.com", "id", SimpleDateFormat("MMM dd, yyyy", Locale.US)) + + +