diff --git a/multisrc/overrides/madara/hmanhwa/src/hManhwa.kt b/multisrc/overrides/madara/hmanhwa/src/hManhwa.kt index 274848f0d..09bc7e41f 100644 --- a/multisrc/overrides/madara/hmanhwa/src/hManhwa.kt +++ b/multisrc/overrides/madara/hmanhwa/src/hManhwa.kt @@ -2,6 +2,13 @@ package eu.kanade.tachiyomi.extension.en.hmanhwa import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import java.text.SimpleDateFormat +import java.util.Locale @Nsfw -class hManhwa : Madara("hManhwa", "https://hmanhwa.com", "en") +class hManhwa : Madara( + "hManhwa", + "https://hmanhwa.com", + "en", + dateFormat = SimpleDateFormat("dd MMM", Locale.US) +) diff --git a/multisrc/overrides/madara/mangadna/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangadna/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..70eefef0d Binary files /dev/null and b/multisrc/overrides/madara/mangadna/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangadna/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangadna/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..bbbcee188 Binary files /dev/null and b/multisrc/overrides/madara/mangadna/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangadna/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangadna/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..8a6a87d7e Binary files /dev/null and b/multisrc/overrides/madara/mangadna/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangadna/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangadna/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..39738a9ec Binary files /dev/null and b/multisrc/overrides/madara/mangadna/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangadna/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangadna/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..27d9cd214 Binary files /dev/null and b/multisrc/overrides/madara/mangadna/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangadna/res/web_hi_res_512.png b/multisrc/overrides/madara/mangadna/res/web_hi_res_512.png new file mode 100644 index 000000000..c02682756 Binary files /dev/null and b/multisrc/overrides/madara/mangadna/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/mangadna/src/MangaDNA.kt b/multisrc/overrides/madara/mangadna/src/MangaDNA.kt new file mode 100644 index 000000000..6b970ea38 --- /dev/null +++ b/multisrc/overrides/madara/mangadna/src/MangaDNA.kt @@ -0,0 +1,48 @@ +package eu.kanade.tachiyomi.extension.en.mangadna + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.network.GET +import eu.kanade.tachiyomi.source.model.FilterList +import eu.kanade.tachiyomi.source.model.Page +import eu.kanade.tachiyomi.source.model.SManga +import java.util.Locale +import okhttp3.HttpUrl.Companion.toHttpUrlOrNull +import okhttp3.Request +import org.jsoup.nodes.Document +import org.jsoup.nodes.Element +import java.text.SimpleDateFormat +import java.util.Locale + +class MangaDNA : Madara( + "MangaDNA", + "https://mangadna.com", + "en", + dateFormat = SimpleDateFormat("dd MMM yyyy", Locale.US) +) { + + override fun popularMangaSelector() = "div.manga-item" + override val popularMangaUrlSelector = "div > h3 > a" + + override fun popularMangaRequest(page: Int): Request { + return GET("$baseUrl/manga/page/$page?orderby=trending") + } + + override fun latestUpdatesRequest(page: Int): Request { + return GET("$baseUrl/manga/page/$page?orderby=latest") + } + + + override val pageListParseSelector = "div.read-content img" + + override fun pageListParse(document: Document): List { + return document.select(pageListParseSelector).mapIndexed { index, element -> + Page( + index, + document.location(), + element?.let { + it.absUrl(if (it.hasAttr("data-src")) "data-src" else "src") + } + ) + } + } +} diff --git a/multisrc/overrides/madara/mangalazy/src/MangaLazy.kt b/multisrc/overrides/madara/mangalazy/src/MangaLazy.kt index c35a4b2fb..3aa4643d0 100644 --- a/multisrc/overrides/madara/mangalazy/src/MangaLazy.kt +++ b/multisrc/overrides/madara/mangalazy/src/MangaLazy.kt @@ -16,13 +16,5 @@ class MangaLazy : Madara("MangaLazy", "https://mangalazy.com", "en") { .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS)) .build() - override fun pageListParse(document: Document): List { - return document.select(pageListParseSelector).mapIndexed { index, element -> - Page( - index, - "", - element.select("img.d-block.mx-auto").attr("src") - ) - } - } + override val pageListParseSelector = ".reading-content div.z_content:nth-child(2) > img:nth-child(n)" } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index ec737a558..6c030a08a 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -91,7 +91,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Heroz Scanlation", "https://herozscans.com", "en", overrideVersionCode = 1), SingleLang("Himera Fansub", "https://himera-fansub.com", "tr"), SingleLang("Hiperdex", "https://hiperdex.com", "en", isNsfw = true, overrideVersionCode = 4), - SingleLang("hManhwa", "https://hmanhwa.com", "en", isNsfw = true), + SingleLang("hManhwa", "https://hmanhwa.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("Hscans", "https://hscans.com", "en", overrideVersionCode = 1), SingleLang("Hunter Fansub", "https://hunterfansub.com", "es", overrideVersionCode = 1), SingleLang("Ichirin No Hana Yuri", "https://ichirinnohanayuri.com.br", "pt-BR", overrideVersionCode = 3), @@ -152,6 +152,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("MangaBox", "https://mangabox.org", "en"), SingleLang("MangaClash", "https://mangaclash.com", "en", overrideVersionCode = 3), SingleLang("MangaCultivator", "https://mangacultivator.com", "en", overrideVersionCode = 1), + SingleLang("MangaDNA", "https://mangadna.com", "en"), SingleLang("MangaDods", "https://www.mangadods.com", "en", overrideVersionCode = 2), SingleLang("MangaEffect", "https://mangaeffect.com", "en", overrideVersionCode = 1), SingleLang("MangaFort", "https://mangafort.com", "en"), @@ -160,7 +161,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("MangaHZ", "https://mangahz.com", "en", isNsfw = true), SingleLang("MangaKitsune", "https://mangakitsune.com", "en", isNsfw = true, overrideVersionCode = 4), SingleLang("MangaKomi", "https://mangakomi.com", "en", overrideVersionCode = 4), - SingleLang("MangaLazy", "https://mangalazy.com", "en", isNsfw = true, overrideVersionCode = 1), + SingleLang("MangaLazy", "https://mangalazy.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("MangaLime", "https://mangalime.com", "en"), SingleLang("MangaLionz", "https://mangalionz.com", "ar"), SingleLang("MangaMe", "https://mangame.org", "en", overrideVersionCode = 1), diff --git a/src/en/manhuamanga/build.gradle b/src/en/manhuamanga/build.gradle index 87fd732a6..9aede82ec 100644 --- a/src/en/manhuamanga/build.gradle +++ b/src/en/manhuamanga/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'ManhuaManga.net' pkgNameSuffix = 'en.manhuamanga' extClass = '.ManhuaManga' - extVersionCode = 1 + extVersionCode = 2 libVersion = '1.2' containsNsfw = true } diff --git a/src/en/manhuamanga/src/eu/kanade/tachiyomi/extension/en/manhuamanga/ManhuaManga.kt b/src/en/manhuamanga/src/eu/kanade/tachiyomi/extension/en/manhuamanga/ManhuaManga.kt index 0de059e52..5640ed360 100644 --- a/src/en/manhuamanga/src/eu/kanade/tachiyomi/extension/en/manhuamanga/ManhuaManga.kt +++ b/src/en/manhuamanga/src/eu/kanade/tachiyomi/extension/en/manhuamanga/ManhuaManga.kt @@ -109,7 +109,7 @@ class ManhuaManga : ParsedHttpSource() { } override fun pageListParse(document: Document): List = mutableListOf().apply { - document.select(".chapter_beta_content p img").forEachIndexed { index, element -> + document.select("p img").forEachIndexed { index, element -> add(Page(index, "", element.attr("src"))) } } diff --git a/src/en/manhwamanga/build.gradle b/src/en/manhwamanga/build.gradle index 41ea8c6c7..b8fb44f92 100644 --- a/src/en/manhwamanga/build.gradle +++ b/src/en/manhwamanga/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'ManhwaManga.net' pkgNameSuffix = 'en.manhwamanga' extClass = '.ManhwaManga' - extVersionCode = 4 + extVersionCode = 5 libVersion = '1.2' containsNsfw = true } diff --git a/src/en/manhwamanga/res/mipmap-hdpi/ic_launcher.png b/src/en/manhwamanga/res/mipmap-hdpi/ic_launcher.png index 580694e1b..ef5e2ab53 100644 Binary files a/src/en/manhwamanga/res/mipmap-hdpi/ic_launcher.png and b/src/en/manhwamanga/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/en/manhwamanga/res/mipmap-mdpi/ic_launcher.png b/src/en/manhwamanga/res/mipmap-mdpi/ic_launcher.png index 8efd2f57f..8cca76001 100644 Binary files a/src/en/manhwamanga/res/mipmap-mdpi/ic_launcher.png and b/src/en/manhwamanga/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/en/manhwamanga/res/mipmap-xhdpi/ic_launcher.png b/src/en/manhwamanga/res/mipmap-xhdpi/ic_launcher.png index a600bdf93..dfafe6efd 100644 Binary files a/src/en/manhwamanga/res/mipmap-xhdpi/ic_launcher.png and b/src/en/manhwamanga/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/en/manhwamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/en/manhwamanga/res/mipmap-xxhdpi/ic_launcher.png index dd11d3f4e..4d91f8b3e 100644 Binary files a/src/en/manhwamanga/res/mipmap-xxhdpi/ic_launcher.png and b/src/en/manhwamanga/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/en/manhwamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/manhwamanga/res/mipmap-xxxhdpi/ic_launcher.png index a24fb6f44..a92c696a3 100644 Binary files a/src/en/manhwamanga/res/mipmap-xxxhdpi/ic_launcher.png and b/src/en/manhwamanga/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/en/manhwamanga/res/web_hi_res_512.png b/src/en/manhwamanga/res/web_hi_res_512.png index 2ef804be2..cda085eaf 100644 Binary files a/src/en/manhwamanga/res/web_hi_res_512.png and b/src/en/manhwamanga/res/web_hi_res_512.png differ