From b8caf8e572b9b9d55fc5ddbb681eacc8d1cdb4ee Mon Sep 17 00:00:00 2001 From: devi Date: Tue, 5 Dec 2023 17:37:07 +0100 Subject: [PATCH] Minor update. --- .../kotatsu/parsers/site/all/ExHentaiParser.kt | 8 ++++---- .../kotatsu/parsers/site/all/MangaDexParser.kt | 2 +- .../kotatsu/parsers/site/madara/en/Manganelo.kt | 2 +- .../madara/{fr/Kataitake.kt => en/TheBlank.kt} | 10 ++++------ .../kotatsu/parsers/site/madara/es/MangaCrab.kt | 3 +-- .../kotatsu/parsers/site/madara/tr/LilyumFansub.kt | 10 ++++++++++ .../parsers/site/mangareader/cz/EvilManga.kt | 13 +++++++++++++ .../parsers/site/mangareader/id/KataKomik.kt | 5 +---- .../kotatsu/parsers/site/mangareader/tr/MilaSub.kt | 10 ++++++++++ .../parsers/site/mangareader/tr/RobinManga.kt | 10 ++++++++++ .../kotatsu/parsers/site/mmrcms/fr/MangaFr.kt | 14 -------------- 11 files changed, 55 insertions(+), 32 deletions(-) rename src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/{fr/Kataitake.kt => en/TheBlank.kt} (50%) create mode 100644 src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/LilyumFansub.kt create mode 100644 src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/cz/EvilManga.kt create mode 100644 src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/MilaSub.kt create mode 100644 src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/RobinManga.kt delete mode 100644 src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/fr/MangaFr.kt diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ExHentaiParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ExHentaiParser.kt index 66e6b100..268ab02e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ExHentaiParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ExHentaiParser.kt @@ -121,10 +121,10 @@ internal class ExHentaiParser( return root.children().mapNotNull { tr -> if (tr.childrenSize() != 2) return@mapNotNull null val (td1, td2) = tr.children() - val glink = td2.selectFirstOrThrow("div.glink") - val a = glink.parents().select("a").first() ?: glink.parseFailed("link not found") + val gLink = td2.selectFirstOrThrow("div.glink") + val a = gLink.parents().select("a").first() ?: gLink.parseFailed("link not found") val href = a.attrAsRelativeUrl("href") - val tagsDiv = glink.nextElementSibling() ?: glink.parseFailed("tags div not found") + val tagsDiv = gLink.nextElementSibling() ?: gLink.parseFailed("tags div not found") val mainTag = td2.selectFirst("div.cn")?.let { div -> MangaTag( title = div.text().toTitleCase(), @@ -134,7 +134,7 @@ internal class ExHentaiParser( } Manga( id = generateUid(href), - title = glink.text().cleanupTitle(), + title = gLink.text().cleanupTitle(), altTitle = null, url = href, publicUrl = a.absUrl("href"), diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaDexParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaDexParser.kt index b7a67d11..18a612c8 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaDexParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaDexParser.kt @@ -80,7 +80,7 @@ internal class MangaDexParser(context: MangaLoaderContext) : MangaParser(context } } filter.locale?.let { - append("&originalLanguage[]=") + append("&availableTranslatedLanguage[]=") append(it.language) } } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manganelo.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manganelo.kt index e942b7f0..c713c642 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manganelo.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manganelo.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("MANGANELO", "MangaNelo", "en") +@MangaSourceParser("MANGANELO", "MangaNelo.biz", "en") internal class Manganelo(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGANELO, "manganelo.biz", 10) { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/Kataitake.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/TheBlank.kt similarity index 50% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/Kataitake.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/TheBlank.kt index a6fc8259..38e44dfb 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/Kataitake.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/TheBlank.kt @@ -1,4 +1,4 @@ -package org.koitharu.kotatsu.parsers.site.madara.fr +package org.koitharu.kotatsu.parsers.site.madara.en import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser @@ -6,10 +6,8 @@ import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("KATAITAKE", "Kataitake", "fr", ContentType.HENTAI) -internal class Kataitake(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.KATAITAKE, "www.kataitake.fr", 10) { +@MangaSourceParser("THEBLANK", "TheBlank", "en", ContentType.HENTAI) +internal class TheBlank(context: MangaLoaderContext) : + MadaraParser(context, MangaSource.THEBLANK, "theblank.net") { override val datePattern = "dd/MM/yyyy" - override val tagPrefix = "genre/" - override val postReq = true } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/MangaCrab.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/MangaCrab.kt index 7de6eaf5..9e410a46 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/MangaCrab.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/MangaCrab.kt @@ -7,8 +7,7 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("MANGA_CRAB", "MangaCrab", "es") internal class MangaCrab(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGA_CRAB, "manga-crab.com") { - + MadaraParser(context, MangaSource.MANGA_CRAB, "mangacrab3.com") { override val datePattern = "dd/MM/yyyy" override val tagPrefix = "manga-genero/" override val listUrl = "series/" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/LilyumFansub.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/LilyumFansub.kt new file mode 100644 index 00000000..f5e65be5 --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/LilyumFansub.kt @@ -0,0 +1,10 @@ +package org.koitharu.kotatsu.parsers.site.madara.tr + +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("LILYUMFANSUB", "LilyumFansub", "tr") +internal class LilyumFansub(context: MangaLoaderContext) : + MadaraParser(context, MangaSource.LILYUMFANSUB, "lilyumfansub.com.tr", 16) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/cz/EvilManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/cz/EvilManga.kt new file mode 100644 index 00000000..f1ea3938 --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/cz/EvilManga.kt @@ -0,0 +1,13 @@ +package org.koitharu.kotatsu.parsers.site.mangareader.cz + +import org.koitharu.kotatsu.parsers.MangaLoaderContext +import org.koitharu.kotatsu.parsers.MangaSourceParser +import org.koitharu.kotatsu.parsers.model.ContentType +import org.koitharu.kotatsu.parsers.model.MangaSource +import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser + +@MangaSourceParser("EVILMANGA", "EvilManga", "cs", ContentType.HENTAI) +internal class EvilManga(context: MangaLoaderContext) : + MangaReaderParser(context, MangaSource.EVILMANGA, "evil-manga.eu", pageSize = 20, searchPageSize = 10) { + override val datePattern = "d MMMM, yyyy" +} 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 40a4893c..1d541e95 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 @@ -8,9 +8,6 @@ import java.util.* @MangaSourceParser("KATAKOMIK", "KataKomik", "id") internal class KataKomik(context: MangaLoaderContext) : - MangaReaderParser(context, MangaSource.KATAKOMIK, "katakomik.online", pageSize = 20, searchPageSize = 20) { - - override val datePattern = "MMM d, yyyy" + MangaReaderParser(context, MangaSource.KATAKOMIK, "katakomik.my.id", pageSize = 20, searchPageSize = 10) { override val sourceLocale: Locale = Locale.ENGLISH - } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/MilaSub.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/MilaSub.kt new file mode 100644 index 00000000..16f78b1d --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/MilaSub.kt @@ -0,0 +1,10 @@ +package org.koitharu.kotatsu.parsers.site.mangareader.tr + +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.mangareader.MangaReaderParser + +@MangaSourceParser("MILASUB", "MilaSub", "tr") +internal class MilaSub(context: MangaLoaderContext) : + MangaReaderParser(context, MangaSource.MILASUB, "www.milasub.com", pageSize = 20, searchPageSize = 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/RobinManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/RobinManga.kt new file mode 100644 index 00000000..fb02bea4 --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/RobinManga.kt @@ -0,0 +1,10 @@ +package org.koitharu.kotatsu.parsers.site.mangareader.tr + +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.mangareader.MangaReaderParser + +@MangaSourceParser("ROBINMANGA", "RobinManga", "tr") +internal class RobinManga(context: MangaLoaderContext) : + MangaReaderParser(context, MangaSource.ROBINMANGA, "www.robinmanga.com", pageSize = 20, searchPageSize = 25) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/fr/MangaFr.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/fr/MangaFr.kt deleted file mode 100644 index bdf51ad2..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/fr/MangaFr.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.mmrcms.fr - -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.mmrcms.MmrcmsParser -import java.util.Locale - -@MangaSourceParser("MANGAFR", "MangaFr", "fr") -internal class MangaFr(context: MangaLoaderContext) : - MmrcmsParser(context, MangaSource.MANGAFR, "manga-fr.cc") { - override val imgUpdated = ".jpg" - override val sourceLocale: Locale = Locale.ENGLISH -}