From 9fa091c275a2e77bb1c91391cba9c6d16d644d03 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Fri, 30 Sep 2022 23:10:27 +0600 Subject: [PATCH] Fix "Read Attack on Titan Shingeki no Kyojin Manga" (#13640) Also sort MangaCatalogGenerator sources --- .../ReadAttackOnTitanShingekiNoKyojinManga.kt | 19 ++++------ .../mangacatalog/MangaCatalogGenerator.kt | 38 +++++++++---------- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/src/ReadAttackOnTitanShingekiNoKyojinManga.kt b/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/src/ReadAttackOnTitanShingekiNoKyojinManga.kt index fdf24e505..241d23204 100644 --- a/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/src/ReadAttackOnTitanShingekiNoKyojinManga.kt +++ b/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/src/ReadAttackOnTitanShingekiNoKyojinManga.kt @@ -4,7 +4,7 @@ import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog import eu.kanade.tachiyomi.source.model.SChapter import org.jsoup.nodes.Element -class ReadAttackOnTitanShingekiNoKyojinManga : MangaCatalog("Read Attack on Titan Shingeki no Kyojin Manga", "https://ww7.readsnk.com", "en") { +class ReadAttackOnTitanShingekiNoKyojinManga : MangaCatalog("Read Attack on Titan Shingeki no Kyojin Manga", "https://ww8.readsnk.com", "en") { override val sourceList = listOf( Pair("Shingeki No Kyojin", "$baseUrl/manga/shingeki-no-kyojin/"), Pair("Colored", "$baseUrl/manga/shingeki-no-kyojin-colored/"), @@ -20,17 +20,14 @@ class ReadAttackOnTitanShingekiNoKyojinManga : MangaCatalog("Read Attack on Tita Pair("No Regrets Colored", "$baseUrl/manga/attack-on-titan-no-regrets-colored/"), ).sortedBy { it.first }.distinctBy { it.second } - override fun chapterListSelector(): String = "div.w-full > .bg-white > .flex" + override fun chapterListSelector(): String = "div.w-full div.grid div.col-span-3" override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { - val name1 = element.select(".flex > a.text-gray-900").text() - val name2 = element.select(".flex > div.text-xs").text() - if (name2 == "") { - name = name1 - } else { - name = "$name1 - $name2" - } - url = element.select(".ml-auto div.flex a").attr("abs:href") - date_upload = System.currentTimeMillis() + val urlElemnt = element.selectFirst("a") + name = listOfNotNull( + urlElemnt.text(), + element.selectFirst("div.xs").text().takeUnless { it.isBlank() } + ).joinToString(" - ") { it.trim() } + url = urlElemnt.attr("abs:href") } } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalogGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalogGenerator.kt index 4b4702780..1610ff942 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalogGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalogGenerator.kt @@ -12,30 +12,30 @@ class MangaCatalogGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 3 override val sources = listOf( - SingleLang("Read Boku no Hero Academia My Hero Academia Manga", "https://ww6.readmha.com", "en", className = "ReadBokuNoHeroAcademiaMyHeroAcademiaManga", overrideVersionCode = 2), - SingleLang("Read One-Punch Man Manga Online", "https://ww3.readopm.com", "en", className = "ReadOnePunchManMangaOnlineTwo", pkgName = "readonepunchmanmangaonlinetwo", overrideVersionCode = 1), // exact same name as the one in mangamainac extension - SingleLang("Read Tokyo Ghoul Re & Tokyo Ghoul Manga Online", "https://ww8.tokyoghoulre.com", "en", className = "ReadTokyoGhoulReTokyoGhoulMangaOnline", overrideVersionCode = 1), - SingleLang("Read Nanatsu no Taizai 7 Deadly Sins Manga Online", "https://ww3.read7deadlysins.com", "en", className = "ReadNanatsuNoTaizai7DeadlySinsMangaOnline", overrideVersionCode = 2), - SingleLang("Read Kaguya-sama Manga Online", "https://ww1.readkaguyasama.com", "en", className = "ReadKaguyaSamaMangaOnline", overrideVersionCode = 1), - SingleLang("Read Jujutsu Kaisen Manga Online", "https://ww1.readjujutsukaisen.com", "en", overrideVersionCode = 1), - SingleLang("Read Tower of God Manhwa Manga Online", "https://ww1.readtowerofgod.com", "en", className = "ReadTowerOfGodManhwaMangaOnline", overrideVersionCode = 2), - SingleLang("Read Hunter x Hunter Manga Online", "https://ww2.readhxh.com", "en", overrideVersionCode = 1), - SingleLang("Read Solo Leveling Manga Manhwa Online", "https://readsololeveling.org", "en", className = "ReadSoloLevelingMangaManhwaOnline", overrideVersionCode = 2), - SingleLang("Read The Promised Neverland Manga Online", "https://ww3.readneverland.com", "en", overrideVersionCode = 1), - SingleLang("Read Attack on Titan Shingeki no Kyojin Manga", "https://ww7.readsnk.com", "en", className = "ReadAttackOnTitanShingekiNoKyojinManga", overrideVersionCode = 2), + SingleLang("Read Attack on Titan Shingeki no Kyojin Manga", "https://ww8.readsnk.com", "en", className = "ReadAttackOnTitanShingekiNoKyojinManga", overrideVersionCode = 3), SingleLang("Read Berserk Manga", "https://readberserk.com", "en"), - SingleLang("Read Fairy Tail & Edens Zero Manga Online", "https://ww4.readfairytail.com", "en", className = "ReadFairyTailEdensZeroMangaOnline", overrideVersionCode = 1), - SingleLang("Read One Piece Manga Online", "https://ww8.readonepiece.com", "en"), - SingleLang("Read Dr. Stone Manga Online", "https://ww3.readdrstone.com", "en", className = "ReadDrStoneMangaOnline"), + SingleLang("Read Boku no Hero Academia My Hero Academia Manga", "https://ww6.readmha.com", "en", className = "ReadBokuNoHeroAcademiaMyHeroAcademiaManga", overrideVersionCode = 2), SingleLang("Read Chainsaw Man Manga Online", "https://ww1.readchainsawman.com", "en"), + SingleLang("Read Dr. Stone Manga Online", "https://ww3.readdrstone.com", "en", className = "ReadDrStoneMangaOnline"), SingleLang("Read Dragon Ball Super Chou Manga Online", "https://ww6.dbsmanga.com", "en", className = "ReadDragonBallSuperChouMangaOnline", overrideVersionCode = 1), - SingleLang("Read Kingdom Manga Online", "https://ww2.readkingdom.com", "en"), - SingleLang("Read Naruto Boruto Samurai 8 Manga Online", "https://ww7.readnaruto.com", "en", className = "ReadNarutoBorutoSamurai8MangaOnline", overrideVersionCode = 1), - SingleLang("Read Vinland Saga Manga Online", "https://ww1.readvinlandsaga.com", "en"), - SingleLang("Read Haikyuu!! Manga Online", "https://ww6.readhaikyuu.com", "en", className = "ReadHaikyuuMangaOnline"), + SingleLang("Read Fairy Tail & Edens Zero Manga Online", "https://ww4.readfairytail.com", "en", className = "ReadFairyTailEdensZeroMangaOnline", overrideVersionCode = 1), SingleLang("Read Goblin Slayer Manga Online", "https://manga.watchgoblinslayer.com", "en"), - SingleLang("Read Sword Art Online Manga Online", "https://manga.watchsao.tv", "en"), + SingleLang("Read Haikyuu!! Manga Online", "https://ww6.readhaikyuu.com", "en", className = "ReadHaikyuuMangaOnline"), + SingleLang("Read Hunter x Hunter Manga Online", "https://ww2.readhxh.com", "en", overrideVersionCode = 1), + SingleLang("Read Jujutsu Kaisen Manga Online", "https://ww1.readjujutsukaisen.com", "en", overrideVersionCode = 1), + SingleLang("Read Kaguya-sama Manga Online", "https://ww1.readkaguyasama.com", "en", className = "ReadKaguyaSamaMangaOnline", overrideVersionCode = 1), + SingleLang("Read Kingdom Manga Online", "https://ww2.readkingdom.com", "en"), + SingleLang("Read Nanatsu no Taizai 7 Deadly Sins Manga Online", "https://ww3.read7deadlysins.com", "en", className = "ReadNanatsuNoTaizai7DeadlySinsMangaOnline", overrideVersionCode = 2), + SingleLang("Read Naruto Boruto Samurai 8 Manga Online", "https://ww7.readnaruto.com", "en", className = "ReadNarutoBorutoSamurai8MangaOnline", overrideVersionCode = 1), SingleLang("Read Noblesse Manhwa Online", "https://ww2.readnoblesse.com", "en"), + SingleLang("Read One Piece Manga Online", "https://ww8.readonepiece.com", "en"), + SingleLang("Read One-Punch Man Manga Online", "https://ww3.readopm.com", "en", className = "ReadOnePunchManMangaOnlineTwo", pkgName = "readonepunchmanmangaonlinetwo", overrideVersionCode = 1), // exact same name as the one in mangamainac extension + SingleLang("Read Solo Leveling Manga Manhwa Online", "https://readsololeveling.org", "en", className = "ReadSoloLevelingMangaManhwaOnline", overrideVersionCode = 2), + SingleLang("Read Sword Art Online Manga Online", "https://manga.watchsao.tv", "en"), + SingleLang("Read The Promised Neverland Manga Online", "https://ww3.readneverland.com", "en", overrideVersionCode = 1), + SingleLang("Read Tokyo Ghoul Re & Tokyo Ghoul Manga Online", "https://ww8.tokyoghoulre.com", "en", className = "ReadTokyoGhoulReTokyoGhoulMangaOnline", overrideVersionCode = 1), + SingleLang("Read Tower of God Manhwa Manga Online", "https://ww1.readtowerofgod.com", "en", className = "ReadTowerOfGodManhwaMangaOnline", overrideVersionCode = 2), + SingleLang("Read Vinland Saga Manga Online", "https://ww1.readvinlandsaga.com", "en"), ) companion object {