From 74eb7f83d6360e3d151acb5097eef0931b209cef Mon Sep 17 00:00:00 2001 From: devi Date: Thu, 28 Sep 2023 17:24:02 +0200 Subject: [PATCH] other fix --- .../parsers/site/madara/all/Manhwa18Cc.kt | 27 +++++++++---------- .../parsers/site/madara/ar/WebtoonEmpire.kt | 4 +-- .../kotatsu/parsers/site/madara/en/HScans.kt | 2 +- .../kotatsu/parsers/site/madara/id/Mgkomik.kt | 2 +- .../parsers/site/mangareader/en/RavenScans.kt | 2 +- .../parsers/site/mangareader/en/SuryaScans.kt | 2 +- .../parsers/site/mangareader/id/KataKomik.kt | 2 +- .../site/mangareader/id/WestmangaParser.kt | 2 +- .../parsers/site/mangareader/pt/MangasChan.kt | 2 +- .../site/mangareader/pt/Origamiorpheans.kt | 2 +- .../site/mangareader/pt/Silencescan.kt | 2 +- 11 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/Manhwa18Cc.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/Manhwa18Cc.kt index 06e883ad2..7233220e2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/Manhwa18Cc.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/Manhwa18Cc.kt @@ -21,6 +21,11 @@ internal class Manhwa18Cc(context: MangaLoaderContext) : override val selectChapter = "li.a-h" override val selectBodyPage = "div.read-content" + init { + paginator.firstPage = 1 + searchPaginator.firstPage = 1 + } + override suspend fun getListPage( page: Int, query: String?, @@ -28,36 +33,30 @@ internal class Manhwa18Cc(context: MangaLoaderContext) : sortOrder: SortOrder, ): List { val tag = tags.oneOrThrowIfMany() - val url = buildString { append("https://") append(domain) - val pages = page + 1 when { !query.isNullOrEmpty() -> { - append("/page/") - append(pages.toString()) - append("/?s=") + append("/search?q=") append(query.urlEncoded()) - append("&post_type=wp-manga&") + append("&page=") + append(page.toString()) } !tags.isNullOrEmpty() -> { append("/$tagPrefix") append(tag?.key.orEmpty()) - if (pages > 1) { - append("/page/") - append(pages.toString()) + if (page > 1) { + append(page.toString()) } append("?") } else -> { - append("/$listUrl") - if (pages > 1) { - append("page/") - append(pages) + if (page > 1) { + append(page) } append("?") } @@ -72,7 +71,6 @@ internal class Manhwa18Cc(context: MangaLoaderContext) : } } val doc = webClient.httpGet(url).parseHtml() - return doc.select("div.manga-lists div.manga-item").map { div -> val href = div.selectFirst("a")?.attrAsRelativeUrlOrNull("href") ?: div.parseFailed("Link not found") Manga( @@ -126,5 +124,4 @@ internal class Manhwa18Cc(context: MangaLoaderContext) : ) } } - } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/WebtoonEmpire.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/WebtoonEmpire.kt index 0d7eee880..b9ba5c2d3 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/WebtoonEmpire.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/WebtoonEmpire.kt @@ -7,7 +7,7 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("WEBTOONEMPIRE", "Webtoon Empire", "ar") internal class WebtoonEmpire(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.WEBTOONEMPIRE, "webtoonempire.org", pageSize = 10) { + MadaraParser(context, MangaSource.WEBTOONEMPIRE, "webtoonsempireron.com", pageSize = 10) { override val listUrl = "webtoon/" - override val datePattern = "d MMMM yyyy" + override val datePattern = "d MMMMŲŒ yyyy" } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/HScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/HScans.kt index 2fa0b3c43..833e79c0f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/HScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/HScans.kt @@ -5,7 +5,7 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("HSCANS", "Hscans", "en") +@MangaSourceParser("HSCANS", "HScans", "en") internal class HScans(context: MangaLoaderContext) : MadaraParser(context, MangaSource.HSCANS, "hscans.com", 10) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/id/Mgkomik.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/id/Mgkomik.kt index 9415eb9cc..dea68f671 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/id/Mgkomik.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/id/Mgkomik.kt @@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser import java.util.Locale -@MangaSourceParser("MGKOMIK", "Mgkomik", "id") +@MangaSourceParser("MGKOMIK", "Mg Komik", "id") internal class Mgkomik(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MGKOMIK, "mgkomik.id", 20) { override val tagPrefix = "genres/" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/RavenScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/RavenScans.kt index 379715891..ce34d8db1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/RavenScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/RavenScans.kt @@ -5,7 +5,7 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("RAVENSCANS", "Ravenscans", "en") +@MangaSourceParser("RAVENSCANS", "Raven Scans", "en") internal class RavenScans(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.RAVENSCANS, "ravenscans.com", pageSize = 10, searchPageSize = 10) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/SuryaScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/SuryaScans.kt index b3a0c46ff..e7945ac2b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/SuryaScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/SuryaScans.kt @@ -5,7 +5,7 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("SURYASCANS", "Suryascans", "en") +@MangaSourceParser("SURYASCANS", "Surya Scans", "en") internal class SuryaScans(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.SURYASCANS, "suryascans.com", pageSize = 5, searchPageSize = 5) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/KataKomik.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/KataKomik.kt index 65fc9bddb..3b9a49801 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/KataKomik.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/KataKomik.kt @@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser import java.util.* -@MangaSourceParser("KATAKOMIK", "Katakomik", "id") +@MangaSourceParser("KATAKOMIK", "Kata Komik", "id") internal class KataKomik(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.KATAKOMIK, "katakomik.online", pageSize = 20, searchPageSize = 20) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/WestmangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/WestmangaParser.kt index deaee47b8..d6bf72f62 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/WestmangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/WestmangaParser.kt @@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser import java.util.* -@MangaSourceParser("WESTMANGA", "Westmanga", "id") +@MangaSourceParser("WESTMANGA", "West Manga", "id") internal class WestmangaParser(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.WESTMANGA, "westmanga.info", pageSize = 20, searchPageSize = 10) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/MangasChan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/MangasChan.kt index 226c9d078..7528d6cd7 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/MangasChan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/MangasChan.kt @@ -5,7 +5,7 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("MANGASCHAN", "Mangaschan", "pt") +@MangaSourceParser("MANGASCHAN", "Mangas Chan", "pt") internal class MangasChan(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.MANGASCHAN, "mangaschan.net", pageSize = 20, searchPageSize = 20) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/Origamiorpheans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/Origamiorpheans.kt index 3cbe51bc5..4955efa8a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/Origamiorpheans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/Origamiorpheans.kt @@ -5,7 +5,7 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("ORIGAMIORPHEANS", "Origami orpheans", "pt") +@MangaSourceParser("ORIGAMIORPHEANS", "Origami Orpheans", "pt") internal class Origamiorpheans(context: MangaLoaderContext) : MangaReaderParser( context, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/Silencescan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/Silencescan.kt index 699f90cc4..8e8764e4c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/Silencescan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/Silencescan.kt @@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("SILENCESCAN", "Silencescan", "pt", ContentType.HENTAI) +@MangaSourceParser("SILENCESCAN", "Silence Scan", "pt", ContentType.HENTAI) internal class Silencescan(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.SILENCESCAN, "silencescan.com.br", pageSize = 35, searchPageSize = 35) {