From 71affd155ca51b3b396e3130a907b5f04cefc359 Mon Sep 17 00:00:00 2001 From: devi Date: Tue, 6 Aug 2024 18:20:35 +0200 Subject: [PATCH] Some Fix --- .../kotatsu/parsers/site/en/AsuraScansParser.kt | 2 +- .../kotatsu/parsers/site/heancms/HeanCms.kt | 4 +++- .../parsers/site/heancms/en/ReaperComics.kt | 1 + .../kotatsu/parsers/site/iken/en/VortexScans.kt | 4 +++- .../{mangareader => madara}/pt/AncientComics.kt | 15 ++++++--------- .../kotatsu/parsers/site/madara/pt/HuntersScan.kt | 3 ++- .../kotatsu/parsers/site/madara/pt/LunarScan.kt | 6 ++---- .../kotatsu/parsers/site/madara/tr/Grimelek.kt | 2 +- .../parsers/site/mangareader/id/Comicaso.kt | 4 +--- 9 files changed, 20 insertions(+), 21 deletions(-) rename src/main/kotlin/org/koitharu/kotatsu/parsers/site/{mangareader => madara}/pt/AncientComics.kt (50%) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/AsuraScansParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/AsuraScansParser.kt index 0fd9795cf..27019eb35 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/AsuraScansParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/AsuraScansParser.kt @@ -164,7 +164,7 @@ internal class AsuraScansParser(context: MangaLoaderContext) : override suspend fun getPages(chapter: MangaChapter): List { val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml() - return doc.select("div > img[alt=chapter]").map { img -> + return doc.select("div > img[alt*=chapter]").map { img -> val urlPage = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found") MangaPage( id = generateUid(urlPage), diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/HeanCms.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/HeanCms.kt index d81cad200..62bd0442c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/HeanCms.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/HeanCms.kt @@ -164,10 +164,12 @@ internal abstract class HeanCms( ) } + protected open val selectPages = ".flex > img:not([alt])" + override suspend fun getPages(chapter: MangaChapter): List { val fullUrl = chapter.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() - return doc.select(".flex > img:not([alt])").map { img -> + return doc.select(selectPages).map { img -> val url = img.src() ?: img.parseFailed("Image src not found") MangaPage( id = generateUid(url), diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/en/ReaperComics.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/en/ReaperComics.kt index 5e3d1416e..5cec88c47 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/en/ReaperComics.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/en/ReaperComics.kt @@ -10,4 +10,5 @@ internal class ReaperComics(context: MangaLoaderContext) : HeanCms(context, MangaParserSource.REAPERCOMICS, "reaperscans.com") { override val cdn = "media.reaperscans.com/file/4SRBHm//" override val paramsUpdated = "updated_at" + override val selectPages = ".flex > img" } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/iken/en/VortexScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/iken/en/VortexScans.kt index b0a72b7e7..4ef992e93 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/iken/en/VortexScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/iken/en/VortexScans.kt @@ -7,4 +7,6 @@ import org.koitharu.kotatsu.parsers.site.iken.IkenParser @MangaSourceParser("VORTEXSCANS", "VortexScans", "en") internal class VortexScans(context: MangaLoaderContext) : - IkenParser(context, MangaParserSource.VORTEXSCANS, "vortexscans.org") + IkenParser(context, MangaParserSource.VORTEXSCANS, "vortexscans.org") { + override val selectPages = "main section img" +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/AncientComics.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/AncientComics.kt similarity index 50% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/AncientComics.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/AncientComics.kt index bd37dbdf8..a05282c3b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/AncientComics.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/AncientComics.kt @@ -1,16 +1,13 @@ -package org.koitharu.kotatsu.parsers.site.mangareader.pt +package org.koitharu.kotatsu.parsers.site.madara.pt import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaParserSource -import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser +import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("ANCIENTCOMICS", "AncientComics", "pt") internal class AncientComics(context: MangaLoaderContext) : - MangaReaderParser( - context, - MangaParserSource.ANCIENTCOMICS, - "ancientcomics.com.br", - pageSize = 20, - searchPageSize = 20, - ) + MadaraParser(context, MangaParserSource.ANCIENTCOMICS, "ancientcomics.com.br") { + override val datePattern: String = "dd/MM/yyyy" + override val withoutAjax = true +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/HuntersScan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/HuntersScan.kt index 2f6b55251..9f2ad9a8e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/HuntersScan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/HuntersScan.kt @@ -7,8 +7,9 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("HUNTERSSCAN", "HuntersScan", "pt") internal class HuntersScan(context: MangaLoaderContext) : - MadaraParser(context, MangaParserSource.HUNTERSSCAN, "huntersscan.xyz", pageSize = 50) { + MadaraParser(context, MangaParserSource.HUNTERSSCAN, "huntersscan.net", pageSize = 50) { override val withoutAjax = true override val datePattern = "MM/dd/yyyy" override val tagPrefix = "series-genre/" + override val listUrl = "series/" } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/LunarScan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/LunarScan.kt index cd372dccc..9f8e0662a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/LunarScan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/LunarScan.kt @@ -7,8 +7,6 @@ import org.koitharu.kotatsu.parsers.model.MangaParserSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @Broken -@MangaSourceParser("LUNARSCAN", "LunarScan.com.br", "pt") +@MangaSourceParser("LUNARSCAN", "LunarrScan.com", "pt") internal class LunarScan(context: MangaLoaderContext) : - MadaraParser(context, MangaParserSource.LUNARSCAN, "lunarscan.com.br") { - override val listUrl = "obra/" -} + MadaraParser(context, MangaParserSource.LUNARSCAN, "lunarrscan.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Grimelek.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Grimelek.kt index 2d6524faf..3b7f2ef12 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Grimelek.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Grimelek.kt @@ -8,7 +8,7 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser //This source requires an account. @MangaSourceParser("GRIMELEK", "Grimelek", "tr") internal class Grimelek(context: MangaLoaderContext) : - MadaraParser(context, MangaParserSource.GRIMELEK, "grimelek.mom", 20) { + MadaraParser(context, MangaParserSource.GRIMELEK, "grimelek.me", 20) { override val datePattern = "d MMMM yyyy" override val listUrl = "seri/" } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/Comicaso.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/Comicaso.kt index 34f550f05..f8e7f77ec 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/Comicaso.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/Comicaso.kt @@ -1,15 +1,13 @@ package org.koitharu.kotatsu.parsers.site.mangareader.id -import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaParserSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@Broken @MangaSourceParser("COMICASO", "Comicaso", "id") internal class Comicaso(context: MangaLoaderContext) : - MangaReaderParser(context, MangaParserSource.COMICASO, "comicaso.com", pageSize = 20, searchPageSize = 10) { + MangaReaderParser(context, MangaParserSource.COMICASO, "comicaso.org", pageSize = 20, searchPageSize = 10) { override val encodedSrc = true override val isTagsExclusionSupported = false }