From 322292e34b33f5ee12f0d44048a93145adb21497 Mon Sep 17 00:00:00 2001 From: Luqman <riyanluqman@gmail.com> Date: Thu, 1 Dec 2022 10:51:44 +0700 Subject: [PATCH] Zbulu: fix chapter missing, removing UA (#14409) * Zbulu: fix chapter missing, removing UA - removing custom user-agent - fix chapter missing some source got chapter missing caused by custom theme/updated theme - reorder generator closes #13978 * add nsfw --- .../java/eu/kanade/tachiyomi/multisrc/zbulu/Zbulu.kt | 9 +++------ .../kanade/tachiyomi/multisrc/zbulu/ZbuluGenerator.kt | 10 +++++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/Zbulu.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/Zbulu.kt index 90929c0c9..aa2eb6c35 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/Zbulu.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/Zbulu.kt @@ -34,7 +34,6 @@ abstract class Zbulu( .build() override fun headersBuilder(): Headers.Builder = Headers.Builder() - .add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:75.0) Gecko/20100101 Firefox/75.0") .add("Content-Encoding", "identity") // Decreases calls, helps with Cloudflare @@ -122,7 +121,7 @@ abstract class Zbulu( // Chapters - override fun chapterListSelector() = "div.go-border" + override fun chapterListSelector() = ".chapters-wrapper div.go-border, .items-chapters a" override fun chapterListParse(response: Response): List<SChapter> { val chapters = mutableListOf<SChapter>() @@ -140,10 +139,8 @@ abstract class Zbulu( override fun chapterFromElement(element: Element): SChapter { return SChapter.create().apply { - element.select("a").let { - setUrlWithoutDomain(it.attr("href").addTrailingSlash()) - name = it.text() - } + setUrlWithoutDomain(element.select("a").attr("href")) + name = element.select("h2").text() date_upload = element.select("div.chapter-date")?.text().toDate() } } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/ZbuluGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/ZbuluGenerator.kt index 81506ac40..0e3d187f8 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/ZbuluGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zbulu/ZbuluGenerator.kt @@ -9,14 +9,14 @@ class ZbuluGenerator : ThemeSourceGenerator { override val themeClass = "Zbulu" - override val baseVersionCode: Int = 5 + override val baseVersionCode: Int = 6 override val sources = listOf( - SingleLang("HolyManga", "https://w30.holymanga.net", "en", overrideVersionCode = 2), - SingleLang("My Toon", "https://mytoon.net", "en", overrideVersionCode = 1), - SingleLang("Koo Manga", "https://ww9.koomanga.com", "en", overrideVersionCode = 1), + SingleLang("BeeManga", "https://ww1.beemanga.com", "en"), SingleLang("Bulu Manga", "https://ww8.bulumanga.net", "en", overrideVersionCode = 1), - SingleLang("BeeManga", "https://ww1.beemanga.com", "en") + SingleLang("HolyManga", "https://w30.holymanga.net", "en", isNsfw = true, overrideVersionCode = 2), + SingleLang("Koo Manga", "https://ww9.koomanga.com", "en", overrideVersionCode = 1), + SingleLang("My Toon", "https://mytoon.net", "en", isNsfw = true, overrideVersionCode = 1), ) companion object {