From d494bf19ee55dbe50d01a65b1b292344449ae7b7 Mon Sep 17 00:00:00 2001 From: devi Date: Mon, 2 Oct 2023 17:29:07 +0200 Subject: [PATCH] Small fix --- .../kotatsu/parsers/site/madara/all/Ero18x.kt | 3 +-- .../kotatsu/parsers/site/madara/ar/MangaStarz.kt | 2 +- .../kotatsu/parsers/site/madara/ar/MangaStarzCom.kt | 12 ------------ .../kotatsu/parsers/site/madara/tr/Jiangzaitoon.kt | 4 ++-- .../kotatsu/parsers/site/pt/UnionMangasParser.kt | 13 ++++--------- .../parsers/site/ru/grouple/AllHentaiParser.kt | 2 +- 6 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/MangaStarzCom.kt diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/Ero18x.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/Ero18x.kt index 37a796f2..fe37616a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/Ero18x.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/Ero18x.kt @@ -12,7 +12,7 @@ import java.util.Locale @MangaSourceParser("ERO18X", "Ero18x", "", ContentType.HENTAI) internal class Ero18x(context: MangaLoaderContext) : MadaraParser(context, MangaSource.ERO18X, "ero18x.com", 10) { - override val datePattern = "MMMM d" + override val datePattern = "MM/dd" override val sourceLocale: Locale = Locale.ENGLISH override val withoutAjax = true @@ -23,7 +23,6 @@ internal class Ero18x(context: MangaLoaderContext) : val href = a.attrAsRelativeUrl("href") val link = href + stylepage val dateText = li.selectFirst("a.c-new-tag")?.attr("title") ?: li.selectFirst(selectDate)?.text() - val name = a.selectFirst("p")?.text() ?: a.ownText() MangaChapter( id = generateUid(href), diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/MangaStarz.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/MangaStarz.kt index 152976ff..8104bddd 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/MangaStarz.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/MangaStarz.kt @@ -7,6 +7,6 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("MANGASTARZ", "Manga Starz", "ar") internal class MangaStarz(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGASTARZ, "mangastarz.com", pageSize = 10) { + MadaraParser(context, MangaSource.MANGASTARZ, "mangastarz.org", pageSize = 10) { override val datePattern = "d MMMM، yyyy" } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/MangaStarzCom.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/MangaStarzCom.kt deleted file mode 100644 index 53e93022..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/MangaStarzCom.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.ar - -import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.model.MangaSource -import org.koitharu.kotatsu.parsers.site.madara.MadaraParser - -@MangaSourceParser("MANGASTARZCOM", "Manga Starz .Com", "ar") -internal class MangaStarzCom(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGASTARZCOM, "mangastarz.com", 10) { - override val datePattern = "d MMMM، yyyy" -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Jiangzaitoon.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Jiangzaitoon.kt index 3ad8c1fe..985f1fc3 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Jiangzaitoon.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Jiangzaitoon.kt @@ -8,7 +8,7 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("JIANGZAITOON", "Jiangzaitoon", "tr", ContentType.HENTAI) internal class Jiangzaitoon(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.JIANGZAITOON, "jiangzaitoon.co") { + MadaraParser(context, MangaSource.JIANGZAITOON, "jiangzaitoon.cc") { override val postreq = true - override val datePattern = "dd MMMM yyyy" + override val datePattern = "d MMMM yyyy" } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/UnionMangasParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/UnionMangasParser.kt index 8454cd93..c9f2e326 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/UnionMangasParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/UnionMangasParser.kt @@ -20,7 +20,7 @@ class UnionMangasParser(context: MangaLoaderContext) : PagedMangaParser(context, SortOrder.POPULARITY, ) - override val configKeyDomain = ConfigKey.Domain("guimah.com") + override val configKeyDomain = ConfigKey.Domain("unionmangasbr.top", "guimah.com") override suspend fun getListPage( page: Int, @@ -47,7 +47,7 @@ class UnionMangasParser(context: MangaLoaderContext) : PagedMangaParser(context, ).addPathSegment(page.toString()) val doc = webClient.httpGet(url.build()).parseHtml() val root = doc.selectFirstOrThrow("div.tamanho-bloco-perfil") - return root.select(".lista-perfil-mangas-novos").map { div -> + return root.select(".lista-mangas").map { div -> val a = div.selectFirstOrThrow("a") val img = div.selectFirstOrThrow("img") val href = a.attrAsRelativeUrl("href") @@ -71,11 +71,7 @@ class UnionMangasParser(context: MangaLoaderContext) : PagedMangaParser(context, override suspend fun getDetails(manga: Manga): Manga { val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml() - val root = if (doc.selectFirst(".perfil-d-manga") == null) { - doc.selectFirstOrThrow(".perfil-p-manga") - } else { - doc.selectFirstOrThrow(".perfil-d-manga") - } + val root = doc.selectFirstOrThrow(".perfil-d-manga, .perfil-p-manga, .manga-pagina") val dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.ROOT) return manga.copy( rating = root.select("h2") @@ -117,8 +113,7 @@ class UnionMangasParser(context: MangaLoaderContext) : PagedMangaParser(context, override suspend fun getPages(chapter: MangaChapter): List { val fullUrl = chapter.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() - val root = doc.body().selectFirstOrThrow("article") - return root.selectOrThrow("img[pag]").mapNotNull { img -> + return doc.body().selectOrThrow("img[pag]").mapNotNull { img -> val href = img.attrAsRelativeUrl("src") if (href.startsWith("/images/banner")) { return@mapNotNull null diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/AllHentaiParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/AllHentaiParser.kt index b487ad3b..c6cd0de9 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/AllHentaiParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/AllHentaiParser.kt @@ -19,7 +19,7 @@ internal class AllHentaiParser( context: MangaLoaderContext, ) : GroupleParser(context, MangaSource.ALLHENTAI, 1) { - override val configKeyDomain = ConfigKey.Domain("z.allhen.online", "2023.allhen.online") + override val configKeyDomain = ConfigKey.Domain("24.allhen.online", "z.allhen.online", "2023.allhen.online") override val defaultIsNsfw = true override val authUrl: String