From e43c9f64896b0b47724db8d8ba3d31276ac16ae4 Mon Sep 17 00:00:00 2001 From: devi Date: Sat, 14 Oct 2023 10:08:00 +0200 Subject: [PATCH] Add small sources, fix , rename sources , remove code not used, remove dead sources, typo. --- .../parsers/site/all/ComickFunParser.kt | 6 +- .../animebootstrap/AnimeBootstrapParser.kt | 4 +- .../parsers/site/animebootstrap/fr/PapScan.kt | 4 +- .../parsers/site/en/CloneMangaParser.kt | 2 +- .../kotatsu/parsers/site/en/ComicExtra.kt | 2 +- .../kotatsu/parsers/site/en/LikeManga.kt | 2 +- .../kotatsu/parsers/site/en/Mangaowl.kt | 2 +- .../kotatsu/parsers/site/en/Manhwa18Parser.kt | 2 +- .../parsers/site/es/TuMangaOnlineParser.kt | 8 +- .../parsers/site/fmreader/FmreaderParser.kt | 12 +- .../parsers/site/fmreader/en/Manhwa18Com.kt | 12 +- .../parsers/site/fmreader/es/OlimpoScans.kt | 2 +- .../kotatsu/parsers/site/fmreader/ja/Klz9.kt | 12 +- .../parsers/site/fmreader/ja/WeLoveManga.kt | 13 +- .../parsers/site/foolslide/FoolSlideParser.kt | 10 +- .../site/foolslide/en/AssortedScans.kt | 4 +- .../site/foolslide/en/Deathtollscans.kt | 2 +- .../parsers/site/foolslide/en/Seinagi.kt | 2 +- .../site/foolslide/es/Pzykosis666hFansub.kt | 2 +- .../site/foolslide/es/SeinagiAdulto.kt | 2 +- .../site/heancmsalt/es/CerberuSeries.kt | 2 +- .../parsers/site/id/DoujinDesuParser.kt | 2 +- .../parsers/site/ja/NicovideoSeigaParser.kt | 2 +- .../parsers/site/madara/all/ManhwaRaw.kt | 7 +- .../parsers/site/madara/ar/Azoranov.kt | 2 +- .../ar/{Manga_Lek.kt => MangaLekCom.kt} | 2 +- .../parsers/site/madara/ar/Mangarbic.kt | 2 +- .../parsers/site/madara/ar/PewPiece.kt | 2 +- .../kotatsu/parsers/site/madara/en/GdScans.kt | 2 +- .../kotatsu/parsers/site/madara/en/HManhwa.kt | 2 +- .../kotatsu/parsers/site/madara/en/HScans.kt | 2 +- .../site/madara/en/Itsyourightmanhua.kt | 2 +- .../parsers/site/madara/en/Jaiminisbox.kt | 2 +- .../kotatsu/parsers/site/madara/en/JiManga.kt | 2 +- .../parsers/site/madara/en/MangaEffect.kt | 2 +- .../parsers/site/madara/en/MangaOwlBlog.kt | 2 +- .../parsers/site/madara/en/MangaOwlIo.kt | 2 +- .../parsers/site/madara/en/MangaowlOne.kt | 2 +- .../parsers/site/madara/en/Manhuaes.kt | 2 +- .../parsers/site/madara/en/Manhuaga.kt | 2 +- .../parsers/site/madara/en/Manhuasy.kt | 2 +- .../parsers/site/madara/en/Manhuaus.kt | 2 +- .../parsers/site/madara/en/Manhwa18App.kt | 2 +- .../parsers/site/madara/en/Manhwa18Org.kt | 2 +- .../parsers/site/madara/en/Manhwa2Read.kt | 2 +- .../parsers/site/madara/en/Manhwaden.kt | 2 +- .../parsers/site/madara/en/Manhwasco.kt | 2 +- .../parsers/site/madara/en/Painfulnightz.kt | 2 +- .../parsers/site/madara/en/PawManga.kt | 2 +- .../site/madara/en/PetrotechSociety.kt | 2 +- .../parsers/site/madara/en/Rio2MangaNet.kt | 2 +- .../site/madara/en/ShootingStarScans.kt | 2 +- .../parsers/site/madara/en/StkissMangaBlog.kt | 2 +- .../parsers/site/madara/en/StkissMangaCom.kt | 2 +- .../parsers/site/madara/en/StkissMangaTv.kt | 2 +- .../parsers/site/madara/en/SumManga.kt | 2 +- .../parsers/site/madara/es/Copypastescan.kt | 2 +- .../parsers/site/madara/es/Lectorunitoon.kt | 2 +- .../parsers/site/madara/es/Mangaxico.kt | 2 +- .../site/madara/es/NoblesseTranslations.kt | 2 +- .../parsers/site/madara/es/RightdarkScan.kt | 2 +- .../parsers/site/madara/es/TempleScanEsp.kt | 2 +- .../parsers/site/madara/es/TopComicPorno.kt | 2 +- .../parsers/site/madara/fr/HhentaiFr.kt | 2 +- .../parsers/site/madara/fr/Readergen.kt | 2 +- .../parsers/site/madara/id/Komiksay.kt | 2 +- .../site/madara/it/Beyondtheataraxia.kt | 2 +- .../parsers/site/madara/pt/Fbsquads.kt | 2 +- .../parsers/site/madara/pt/Leitorizakaya.kt | 2 +- .../parsers/site/madara/pt/Pirulitorosa.kt | 2 +- .../parsers/site/madara/pt/WickedWitchScan.kt | 2 +- .../kotatsu/parsers/site/madara/pt/Ycscan.kt | 2 +- .../parsers/site/madara/tr/Jiangzaitoon.kt | 2 +- .../kotatsu/parsers/site/madara/tr/Mangawt.kt | 2 +- .../parsers/site/madara/tr/Timenaight.kt | 2 +- .../parsers/site/madara/tr/Webtoonevreni.kt | 2 +- .../parsers/site/madara/tr/Webtoontr.kt | 2 +- .../parsers/site/madtheme/MadthemeParser.kt | 4 +- .../parsers/site/madtheme/en/Mangaxyz.kt | 2 +- .../parsers/site/manga18/Manga18Parser.kt | 4 +- .../parsers/site/manga18/zh/Hanman18.kt | 4 +- .../parsers/site/mangabox/MangaboxParser.kt | 4 +- .../parsers/site/mangabox/en/Mangairo.kt | 2 +- .../parsers/site/mangabox/en/Mangakakalot.kt | 2 +- .../parsers/site/mangareader/ar/Areascans.kt | 2 +- .../parsers/site/mangareader/ar/AresManga.kt | 2 +- .../site/mangareader/ar/Mangaatrend.kt | 2 +- .../parsers/site/mangareader/en/FreakComic.kt | 2 +- .../site/mangareader/en/ManhwaLover.kt | 2 +- .../parsers/site/mangareader/en/Manhwax.kt | 2 +- .../parsers/site/mangareader/en/Manjanoon.kt | 10 + .../parsers/site/mangareader/en/RaiScans.kt | 12 ++ .../parsers/site/mangareader/en/RealmScans.kt | 2 +- .../mangareader/es/AiyuMangaScanlation.kt | 2 +- .../parsers/site/mangareader/es/Raikiscan.kt | 2 +- .../site/mangareader/es/Senpaiediciones.kt | 2 +- .../site/mangareader/es/Shadowmangas.kt | 2 +- .../site/mangareader/fr/EpsilonscanParser.kt | 2 +- .../parsers/site/mangareader/id/Duniakomik.kt | 2 +- .../site/mangareader/id/KomiklokalCfd.kt | 4 +- .../parsers/site/mangareader/id/Lianscans.kt | 2 +- .../site/mangareader/pl/SkanlacjeFeniksy.kt | 2 +- .../site/mangareader/pt/Mundomangakun.kt | 2 +- .../parsers/site/mangareader/tr/Ayatoon.kt | 2 +- .../site/mangareader/tr/Golgebahcesi.kt | 2 +- .../site/mangareader/tr/Mangaefendisi.kt | 2 +- .../parsers/site/mangareader/tr/Mangaokutr.kt | 2 +- .../site/mangareader/tr/Raindropteamfan.kt | 2 +- .../parsers/site/mmrcms/MmrcmsParser.kt | 4 +- .../kotatsu/parsers/site/mmrcms/ar/Onma.kt | 2 +- .../parsers/site/mmrcms/fr/JpMangas.kt | 2 +- .../parsers/site/mmrcms/fr/JpScanVf.kt | 2 +- .../kotatsu/parsers/site/mmrcms/id/Mangaid.kt | 2 +- .../parsers/site/mmrcms/pt/Animaregia.kt | 2 +- .../otakusanctuary/OtakuSanctuaryParser.kt | 1 - .../kotatsu/parsers/site/pt/BrMangas.kt | 2 +- .../kotatsu/parsers/site/pt/GoldenManga.kt | 139 -------------- .../parsers/site/pt/UnionMangasParser.kt | 174 ------------------ .../kotatsu/parsers/site/ru/DesuMeParser.kt | 2 +- .../kotatsu/parsers/site/ru/NudeMoonParser.kt | 2 - .../kotatsu/parsers/site/ru/RemangaParser.kt | 2 +- .../site/ru/grouple/ReadmangaParser.kt | 2 +- .../site/ru/grouple/SelfMangaParser.kt | 2 +- .../parsers/site/ru/rulib/YaoiLibParser.kt | 2 +- .../kotatsu/parsers/site/sinmh/SinmhParser.kt | 4 +- .../parsers/site/uk/HentaiUkrParser.kt | 16 +- .../parsers/site/uk/MangaInUaParser.kt | 2 +- .../kotatsu/parsers/site/vi/HentaiVNParser.kt | 11 +- .../kotatsu/parsers/site/vi/YurinekoParser.kt | 2 +- .../parsers/site/wpcomics/WpComicsParser.kt | 4 +- .../parsers/site/zmanga/ZMangaParser.kt | 4 +- .../parsers/site/zmanga/id/KomikIndoInfo.kt | 2 +- .../kotatsu/parsers/site/zmanga/id/MaidId.kt | 3 +- .../parsers/site/zmanga/id/ShiroDoujin.kt | 3 +- 134 files changed, 198 insertions(+), 509 deletions(-) rename src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/{Manga_Lek.kt => MangaLekCom.kt} (88%) create mode 100644 src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/Manjanoon.kt create mode 100644 src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/RaiScans.kt delete mode 100644 src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/GoldenManga.kt delete mode 100644 src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/UnionMangasParser.kt diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ComickFunParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ComickFunParser.kt index 0f50b4b5..7bca28a6 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ComickFunParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ComickFunParser.kt @@ -85,7 +85,7 @@ internal class ComickFunParser(context: MangaLoaderContext) : MangaParser(contex coverUrl = jo.getString("cover_url"), largeCoverUrl = null, description = jo.getStringOrNull("desc"), - tags = jo.selectGenres("genres", tagsMap), + tags = jo.selectGenres(tagsMap), state = runCatching { if (jo.getBoolean("translation_completed")) { MangaState.FINISHED @@ -203,8 +203,8 @@ internal class ComickFunParser(context: MangaLoaderContext) : MangaParser(contex return chaptersBuilder.toList() } - private fun JSONObject.selectGenres(name: String, tags: SparseArrayCompat): Set { - val array = optJSONArray(name) ?: return emptySet() + private fun JSONObject.selectGenres(tags: SparseArrayCompat): Set { + val array = optJSONArray("genres") ?: return emptySet() val res = ArraySet(array.length()) for (i in 0 until array.length()) { val id = array.getInt(i) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/AnimeBootstrapParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/AnimeBootstrapParser.kt index 0b1c33fa..1df0d2c6 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/AnimeBootstrapParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/AnimeBootstrapParser.kt @@ -114,7 +114,7 @@ internal abstract class AnimeBootstrapParser( val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.selectFirstOrThrow(selectDesc).html() @@ -141,7 +141,7 @@ internal abstract class AnimeBootstrapParser( protected open val selectChapter = "div.anime__details__episodes a" - protected open suspend fun getChapters(manga: Manga, doc: Document): List { + protected open suspend fun getChapters(doc: Document): List { return doc.body().select(selectChapter).mapChapters(reversed = true) { i, a -> val href = a.attr("href") MangaChapter( diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/fr/PapScan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/fr/PapScan.kt index 175fef3a..90ea3064 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/fr/PapScan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/fr/PapScan.kt @@ -102,7 +102,7 @@ internal class PapScan(context: MangaLoaderContext) : val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.selectFirstOrThrow(selectDesc).html() @@ -126,7 +126,7 @@ internal class PapScan(context: MangaLoaderContext) : ) } - override suspend fun getChapters(manga: Manga, doc: Document): List { + override suspend fun getChapters(doc: Document): List { val dateFormat = SimpleDateFormat(datePattern, sourceLocale) return doc.body().select(selectChapter).mapChapters(reversed = true) { i, li -> val href = li.selectFirstOrThrow("a").attr("href") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/CloneMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/CloneMangaParser.kt index 5e5327e2..de747b60 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/CloneMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/CloneMangaParser.kt @@ -9,7 +9,7 @@ import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* import java.util.* -@MangaSourceParser("CLONEMANGA", "CloneManga", "en") +@MangaSourceParser("CLONEMANGA", "Clone Manga", "en") internal class CloneMangaParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.CLONEMANGA) { override val sortOrders: Set = Collections.singleton( diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ComicExtra.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ComicExtra.kt index 82d0a4a5..731545bb 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ComicExtra.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ComicExtra.kt @@ -11,7 +11,7 @@ import org.koitharu.kotatsu.parsers.util.* import java.text.SimpleDateFormat import java.util.* -@MangaSourceParser("COMICEXTRA", "ComicExtra", "en") +@MangaSourceParser("COMICEXTRA", "Comic Extra", "en") internal class ComicExtra(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.COMICEXTRA, 25) { override val sortOrders: Set = EnumSet.of(SortOrder.POPULARITY, SortOrder.UPDATED, SortOrder.NEWEST) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/LikeManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/LikeManga.kt index 8c349aef..8af451c4 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/LikeManga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/LikeManga.kt @@ -14,7 +14,7 @@ import java.text.DateFormat import java.text.SimpleDateFormat import java.util.* -@MangaSourceParser("LIKEMANGA", "LikeManga", "en") +@MangaSourceParser("LIKEMANGA", "Like Manga", "en") internal class LikeManga(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.LIKEMANGA, 36) { override val sortOrders: Set = EnumSet.of(SortOrder.UPDATED, SortOrder.POPULARITY, SortOrder.NEWEST) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Mangaowl.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Mangaowl.kt index 7df8fd72..af416793 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Mangaowl.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Mangaowl.kt @@ -14,7 +14,7 @@ import org.koitharu.kotatsu.parsers.util.json.mapJSON import java.text.SimpleDateFormat import java.util.* -@MangaSourceParser("MANGAOWL", "Mangaowl", "en") +@MangaSourceParser("MANGAOWL", "Manga Owl .To", "en") internal class Mangaowl(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.MANGAOWL, pageSize = 24) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Parser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Parser.kt index 35547add..b73ace20 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Parser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Parser.kt @@ -9,7 +9,7 @@ import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* import java.util.* -@MangaSourceParser("MANHWA18", "Manhwa18", "en", type = ContentType.HENTAI) +@MangaSourceParser("MANHWA18", "Manhwa 18", "en", type = ContentType.HENTAI) class Manhwa18Parser(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.MANHWA18, pageSize = 18, searchPageSize = 18) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TuMangaOnlineParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TuMangaOnlineParser.kt index 24e2c976..ba4329b0 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TuMangaOnlineParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TuMangaOnlineParser.kt @@ -99,12 +99,12 @@ class TuMangaOnlineParser(context: MangaLoaderContext) : PagedMangaParser( state = parseStatus(contents.select("span.book-status").text().orEmpty()), author = contents.selectFirst("h5.card-title")?.attr("title")?.substringAfter(", "), chapters = if (doc.select("div.chapters").isEmpty()) { - doc.select(oneShotChapterListSelector()).mapChapters(reversed = true) { _, item -> + doc.select(oneShotChapterListSelector).mapChapters(reversed = true) { _, item -> oneShotChapterFromElement(item) } } else { val chapters = ChaptersListBuilder(10) - doc.select(regularChapterListSelector()).reversed().forEachIndexed { i, item -> + doc.select(regularChapterListSelector).reversed().forEachIndexed { i, item -> val chaptername = item.select("div.col-10.text-truncate").text().replace(" ", " ").trim() val scanelement = item.select("ul.chapter-list > li") scanelement.forEach { chapters.add(regularChapterFromElement(it, chaptername, i)) } @@ -114,7 +114,7 @@ class TuMangaOnlineParser(context: MangaLoaderContext) : PagedMangaParser( ) } - private fun oneShotChapterListSelector() = "div.chapter-list-element > ul.list-group li.list-group-item" + private val oneShotChapterListSelector = "div.chapter-list-element > ul.list-group li.list-group-item" private fun oneShotChapterFromElement(element: Element): MangaChapter { val href = element.selectFirstOrThrow("div.row > .text-right > a").attrAsRelativeUrl("href") @@ -130,7 +130,7 @@ class TuMangaOnlineParser(context: MangaLoaderContext) : PagedMangaParser( ) } - private fun regularChapterListSelector() = "div.chapters > ul.list-group li.p-0.list-group-item" + private val regularChapterListSelector = "div.chapters > ul.list-group li.p-0.list-group-item" private fun regularChapterFromElement(element: Element, chName: String, number: Int): MangaChapter { val href = element.selectFirstOrThrow("div.row > .text-right > a").attrAsRelativeUrl("href") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/FmreaderParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/FmreaderParser.kt index e0627d8b..a533f25e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/FmreaderParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/FmreaderParser.kt @@ -27,7 +27,7 @@ internal abstract class FmreaderParser( SortOrder.ALPHABETICAL, ) - protected open val listeurl = "/manga-list.html" + protected open val listUrl = "/manga-list.html" protected open val datePattern = "MMMM d, yyyy" protected open val tagPrefix = "manga-list-genre-" @@ -66,7 +66,7 @@ internal abstract class FmreaderParser( val url = buildString { append("https://") append(domain) - append(listeurl) + append(listUrl) append("?page=") append(page.toString()) when { @@ -114,7 +114,7 @@ internal abstract class FmreaderParser( protected open val selectBodyTag = "ul.filter-type li a" override suspend fun getTags(): Set { - val doc = webClient.httpGet("https://$domain/$listeurl").parseHtml() + val doc = webClient.httpGet("https://$domain/$listUrl").parseHtml() return doc.select(selectBodyTag).mapNotNullToSet { a -> val href = a.attr("href").substringAfter(tagPrefix).substringBeforeLast(".html") MangaTag( @@ -134,7 +134,7 @@ internal abstract class FmreaderParser( override suspend fun getDetails(manga: Manga): Manga = coroutineScope { val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.selectFirstOrThrow(selectDesc).html() val stateDiv = doc.selectFirst(selectState) val state = stateDiv?.let { @@ -167,7 +167,7 @@ internal abstract class FmreaderParser( protected open val selectDate = "div.chapter-time" protected open val selectChapter = "ul.list-chapters a" - protected open suspend fun getChapters(manga: Manga, doc: Document): List { + protected open suspend fun getChapters(doc: Document): List { val dateFormat = SimpleDateFormat(datePattern, sourceLocale) return doc.body().select(selectChapter).mapChapters(reversed = true) { i, a -> val href = a.attrAsRelativeUrl("href") @@ -193,10 +193,8 @@ internal abstract class FmreaderParser( override suspend fun getPages(chapter: MangaChapter): List { val fullUrl = chapter.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() - return doc.select(selectPage).map { img -> val url = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found") - MangaPage( id = generateUid(url), url = url, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/en/Manhwa18Com.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/en/Manhwa18Com.kt index eeb9c7d1..cd4ddfe0 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/en/Manhwa18Com.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/en/Manhwa18Com.kt @@ -10,11 +10,11 @@ import org.koitharu.kotatsu.parsers.site.fmreader.FmreaderParser import org.koitharu.kotatsu.parsers.util.* import java.text.SimpleDateFormat -@MangaSourceParser("MANHWA18COM", "Manhwa18 .Com", "en", ContentType.HENTAI) +@MangaSourceParser("MANHWA18COM", "Manhwa 18 .Com", "en", ContentType.HENTAI) internal class Manhwa18Com(context: MangaLoaderContext) : FmreaderParser(context, MangaSource.MANHWA18COM, "manhwa18.com") { - override val listeurl = "/tim-kiem" + override val listUrl = "/tim-kiem" override val selectState = "div.info-item:contains(Status) span.info-value " override val selectAlt = "div.info-item:contains(Other name) span.info-value " override val selectTag = "div.info-item:contains(Genre) span.info-value a" @@ -45,7 +45,7 @@ internal class Manhwa18Com(context: MangaLoaderContext) : else -> append("last_update") } } else { - append(listeurl) + append(listUrl) append("?page=") append(page.toString()) when { @@ -87,7 +87,7 @@ internal class Manhwa18Com(context: MangaLoaderContext) : } override suspend fun getTags(): Set { - val doc = webClient.httpGet("https://$domain/$listeurl").parseHtml() + val doc = webClient.httpGet("https://$domain/$listUrl").parseHtml() return doc.select(selectBodyTag).mapNotNullToSet { a -> val href = a.attr("href").substringAfterLast("/") MangaTag( @@ -101,7 +101,7 @@ internal class Manhwa18Com(context: MangaLoaderContext) : override suspend fun getDetails(manga: Manga): Manga = coroutineScope { val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.selectFirstOrThrow(selectDesc).html() val stateDiv = doc.selectFirst(selectState) val state = stateDiv?.let { @@ -129,7 +129,7 @@ internal class Manhwa18Com(context: MangaLoaderContext) : ) } - override suspend fun getChapters(manga: Manga, doc: Document): List { + override suspend fun getChapters(doc: Document): List { val dateFormat = SimpleDateFormat(datePattern, sourceLocale) return doc.body().select(selectChapter).mapChapters(reversed = true) { i, a -> val href = a.attrAsRelativeUrl("href") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/es/OlimpoScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/es/OlimpoScans.kt index 78e171a7..7cbaba4d 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/es/OlimpoScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/es/OlimpoScans.kt @@ -25,7 +25,7 @@ internal class OlimpoScans(context: MangaLoaderContext) : val url = buildString { append("https://") append(domain) - append(listeurl) + append(listUrl) append("?page=") append(page.toString()) when { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/ja/Klz9.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/ja/Klz9.kt index 0f2a327d..9d363040 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/ja/Klz9.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/ja/Klz9.kt @@ -37,7 +37,7 @@ internal class Klz9(context: MangaLoaderContext) : val url = buildString { append("https://") append(domain) - append("/$listeurl") + append("/$listUrl") append("?page=") append(page.toString()) when { @@ -81,12 +81,12 @@ internal class Klz9(context: MangaLoaderContext) : } } - override suspend fun getChapters(manga: Manga, doc: Document): List { + override suspend fun getChapters(doc: Document): List { val slug = doc.selectFirstOrThrow("div.h0rating").attr("slug") - val docload = + val docLoad = webClient.httpGet("https://$domain/app/manga/controllers/cont.listChapter.php?slug=$slug").parseHtml() val dateFormat = SimpleDateFormat(datePattern, sourceLocale) - return docload.body().select(selectChapter).mapChapters(reversed = true) { i, a -> + return docLoad.body().select(selectChapter).mapChapters(reversed = true) { i, a -> val href = "/" + a.selectFirstOrThrow("a.chapter").attrAsRelativeUrl("href") val dateText = a.selectFirst(selectDate)?.text() MangaChapter( @@ -109,8 +109,8 @@ internal class Klz9(context: MangaLoaderContext) : val fullUrl = chapter.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() val cid = doc.selectFirstOrThrow("#chapter").attr("value") - val docload = webClient.httpGet("https://$domain/app/manga/controllers/cont.listImg.php?cid=$cid").parseHtml() - return docload.select(selectPage).map { img -> + val docLoad = webClient.httpGet("https://$domain/app/manga/controllers/cont.listImg.php?cid=$cid").parseHtml() + return docLoad.select(selectPage).map { img -> val url = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found") MangaPage( diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/ja/WeLoveManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/ja/WeLoveManga.kt index 88072395..2fbc3bd2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/ja/WeLoveManga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/ja/WeLoveManga.kt @@ -3,7 +3,6 @@ package org.koitharu.kotatsu.parsers.site.fmreader.ja import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.model.MangaPage import org.koitharu.kotatsu.parsers.model.MangaSource @@ -11,16 +10,16 @@ import org.koitharu.kotatsu.parsers.site.fmreader.FmreaderParser import org.koitharu.kotatsu.parsers.util.* import java.text.SimpleDateFormat -@MangaSourceParser("WELOVEMANGA", "WeLoveManga", "ja") +@MangaSourceParser("WELOVEMANGA", "We Love Manga", "ja") internal class WeLoveManga(context: MangaLoaderContext) : FmreaderParser(context, MangaSource.WELOVEMANGA, "welovemanga.one") { - override suspend fun getChapters(manga: Manga, doc: Document): List { + override suspend fun getChapters(doc: Document): List { val mid = doc.selectFirstOrThrow("div.cmt input").attr("value") - val docload = + val docLoad = webClient.httpGet("https://$domain/app/manga/controllers/cont.Listchapter.php?mid=$mid").parseHtml() val dateFormat = SimpleDateFormat(datePattern, sourceLocale) - return docload.body().select(selectChapter).mapChapters(reversed = true) { i, a -> + return docLoad.body().select(selectChapter).mapChapters(reversed = true) { i, a -> val href = a.selectFirstOrThrow("a").attrAsRelativeUrl("href") val dateText = a.selectFirst(selectDate)?.text() MangaChapter( @@ -43,8 +42,8 @@ internal class WeLoveManga(context: MangaLoaderContext) : val fullUrl = chapter.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() val cid = doc.selectFirstOrThrow("#chapter").attr("value") - val docload = webClient.httpGet("https://$domain/app/manga/controllers/cont.listImg.php?cid=$cid").parseHtml() - return docload.select("img").map { img -> + val docLoad = webClient.httpGet("https://$domain/app/manga/controllers/cont.listImg.php?cid=$cid").parseHtml() + return docLoad.select("img").map { img -> val url = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found") MangaPage( diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/FoolSlideParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/FoolSlideParser.kt index ee9298d3..77b750e9 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/FoolSlideParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/FoolSlideParser.kt @@ -38,7 +38,6 @@ internal abstract class FoolSlideParser( tags: Set?, sortOrder: SortOrder, ): List { - val doc = if (!query.isNullOrEmpty()) { val url = buildString { append("https://$domain/$searchUrl") @@ -62,7 +61,6 @@ internal abstract class FoolSlideParser( } webClient.httpGet(url).parseHtml() } - return doc.select("div.list div.group").map { div -> val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href") Manga( @@ -90,26 +88,22 @@ internal abstract class FoolSlideParser( override suspend fun getDetails(manga: Manga): Manga = coroutineScope { val fullUrl = manga.url.toAbsoluteUrl(domain) val testAdultPage = webClient.httpGet(fullUrl).parseHtml() - val doc = if (testAdultPage.selectFirst("div.info form") != null) { webClient.httpPost(fullUrl, "adult=true").parseHtml() } else { testAdultPage } - val chapters = getChapters(manga, doc) - + val chapters = getChapters(doc) val desc = if (doc.selectFirstOrThrow(selectInfo).html().contains("")) { doc.selectFirstOrThrow(selectInfo).text().substringAfterLast(": ") } else { doc.selectFirstOrThrow(selectInfo).text() } - val author = if (doc.selectFirstOrThrow(selectInfo).html().contains("")) { doc.selectFirstOrThrow(selectInfo).text().substringAfter(": ").substringBefore("Art") } else { null } - manga.copy( coverUrl = doc.selectFirst(".thumbnail img")?.src() ?: manga.coverUrl, description = desc, @@ -124,7 +118,7 @@ internal abstract class FoolSlideParser( protected open val selectDate = ".meta_r" protected open val selectChapter = "div.list div.element" - protected open suspend fun getChapters(manga: Manga, doc: Document): List { + protected open suspend fun getChapters(doc: Document): List { val dateFormat = SimpleDateFormat(datePattern, sourceLocale) return doc.body().select(selectChapter).mapChapters(reversed = true) { i, div -> val a = div.selectFirstOrThrow(".title a") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/AssortedScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/AssortedScans.kt index 4cecfd20..f90c64ed 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/AssortedScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/AssortedScans.kt @@ -77,7 +77,7 @@ internal class AssortedScans(context: MangaLoaderContext) : } else { testAdultPage } - val chapters = getChapters(manga, doc) + val chapters = getChapters(doc) val desc = doc.getElementById("series-desc")?.selectFirst("div")?.html() val alt = doc.getElementById("series-aliases")?.selectFirst("div.alias")?.text() val author = doc.getElementById("series-authors")?.selectFirst("div.author")?.text() @@ -97,7 +97,7 @@ internal class AssortedScans(context: MangaLoaderContext) : ) } - override suspend fun getChapters(manga: Manga, doc: Document): List { + override suspend fun getChapters(doc: Document): List { return doc.body().select("div.chapter").mapChapters(reversed = true) { i, div -> val a = div.selectFirstOrThrow("a") val href = a.attrAsRelativeUrl("href") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/Deathtollscans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/Deathtollscans.kt index b4809534..9e4efb94 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/Deathtollscans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/Deathtollscans.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.foolslide.FoolSlideParser -@MangaSourceParser("DEATHTOLLSCANS", "DeathToll Scans", "en") +@MangaSourceParser("DEATHTOLLSCANS", "Death Toll Scans", "en") internal class Deathtollscans(context: MangaLoaderContext) : FoolSlideParser(context, MangaSource.DEATHTOLLSCANS, "reader.deathtollscans.net", 26) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/Seinagi.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/Seinagi.kt index 30777302..6bd2bcf8 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/Seinagi.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/Seinagi.kt @@ -21,7 +21,7 @@ internal class Seinagi(context: MangaLoaderContext) : } else { testAdultPage } - val chapters = getChapters(manga, doc) + val chapters = getChapters(doc) val desc = if (doc.selectFirstOrThrow(selectInfo).html().contains("Description")) { doc.selectFirstOrThrow(selectInfo).text().substringAfter("Description: ").substringBefore("Readings") } else { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/es/Pzykosis666hFansub.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/es/Pzykosis666hFansub.kt index cc6fe49b..90802ac7 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/es/Pzykosis666hFansub.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/es/Pzykosis666hFansub.kt @@ -19,7 +19,7 @@ internal class Pzykosis666hFansub(context: MangaLoaderContext) : } else { testAdultPage } - val chapters = getChapters(manga, doc) + val chapters = getChapters(doc) val desc = if (doc.selectFirstOrThrow(selectInfo).html().contains("Descripción")) { doc.selectFirstOrThrow(selectInfo).text().substringAfter("Descripción: ").substringBefore("Lecturas") } else { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/es/SeinagiAdulto.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/es/SeinagiAdulto.kt index 13af6283..261a6fba 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/es/SeinagiAdulto.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/es/SeinagiAdulto.kt @@ -25,7 +25,7 @@ internal class SeinagiAdulto(context: MangaLoaderContext) : } else { testAdultPage } - val chapters = getChapters(manga, doc) + val chapters = getChapters(doc) val desc = if (doc.selectFirstOrThrow(selectInfo).html().contains("Descripción")) { doc.selectFirstOrThrow(selectInfo).text().substringAfter("Descripción: ").substringBefore("Lecturas") } else { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancmsalt/es/CerberuSeries.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancmsalt/es/CerberuSeries.kt index 2e06abcb..2d46d626 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancmsalt/es/CerberuSeries.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancmsalt/es/CerberuSeries.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.heancmsalt.HeanCmsAlt -@MangaSourceParser("LEGIONSCANS", "CerberuSeries", "es") +@MangaSourceParser("LEGIONSCANS", "Cerberus Series", "es") internal class CerberuSeries(context: MangaLoaderContext) : HeanCmsAlt(context, MangaSource.LEGIONSCANS, "cerberuseries.xyz") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/DoujinDesuParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/DoujinDesuParser.kt index bfa5c2d8..079259c4 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/DoujinDesuParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/DoujinDesuParser.kt @@ -9,7 +9,7 @@ import org.koitharu.kotatsu.parsers.util.* import java.text.SimpleDateFormat import java.util.* -@MangaSourceParser("DOUJINDESU", "DoujinDesu", "id") +@MangaSourceParser("DOUJINDESU", "Doujin Desu", "id") class DoujinDesuParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.DOUJINDESU, pageSize = 18) { override val configKeyDomain: ConfigKey.Domain diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ja/NicovideoSeigaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ja/NicovideoSeigaParser.kt index dfec0e09..0937a065 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ja/NicovideoSeigaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ja/NicovideoSeigaParser.kt @@ -12,7 +12,7 @@ import java.util.* private const val STATUS_ONGOING = "連載" private const val STATUS_FINISHED = "完結" -@MangaSourceParser("NICOVIDEO_SEIGA", "NicoVideo Seiga", "ja") +@MangaSourceParser("NICOVIDEO_SEIGA", "Nico Video Seiga", "ja") class NicovideoSeigaParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.NICOVIDEO_SEIGA), MangaParserAuthProvider { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/ManhwaRaw.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/ManhwaRaw.kt index 29fae1b2..a6c6dca1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/ManhwaRaw.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/ManhwaRaw.kt @@ -13,13 +13,11 @@ import org.koitharu.kotatsu.parsers.util.generateUid import org.koitharu.kotatsu.parsers.util.mapChapters import org.koitharu.kotatsu.parsers.util.parseFailed import java.text.SimpleDateFormat -import java.util.Locale @MangaSourceParser("MANHWARAW", "Manhwa Raw", "", ContentType.HENTAI) internal class ManhwaRaw(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHWARAW, "manhwa-raw.com", 10) { - override val datePattern = "MMMM d" - override val sourceLocale: Locale = Locale.ENGLISH + override val datePattern = "MM/dd" override val withoutAjax = true override suspend fun getChapters(manga: Manga, doc: Document): List { @@ -29,8 +27,7 @@ internal class ManhwaRaw(context: MangaLoaderContext) : val href = a?.attrAsRelativeUrlOrNull("href") ?: li.parseFailed("Link is missing") 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() + val name = a.selectFirst("h4")?.text() ?: a.ownText() MangaChapter( id = generateUid(href), name = name, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/Azoranov.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/Azoranov.kt index d6db69af..d044fab9 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/Azoranov.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/Azoranov.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("AZORANOV", "Azoranov", "ar") +@MangaSourceParser("AZORANOV", "Azora Nov", "ar") internal class Azoranov(context: MangaLoaderContext) : MadaraParser(context, MangaSource.AZORANOV, "azoranov.com", pageSize = 10) { override val tagPrefix = "series-genre/" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/Manga_Lek.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/MangaLekCom.kt similarity index 88% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/Manga_Lek.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/MangaLekCom.kt index 019f2152..88360559 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/Manga_Lek.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/MangaLekCom.kt @@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("MANGA_LEK", "Manga-Lek", "ar") -internal class Manga_Lek(context: MangaLoaderContext) : +internal class MangaLekCom(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGA_LEK, "manga-lek.com") { override val listUrl = "mangalek/" override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/Mangarbic.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/Mangarbic.kt index f673d214..369ef62a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/Mangarbic.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/Mangarbic.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("MANGARBIC", "Mangarbic", "ar") +@MangaSourceParser("MANGARBIC", "Manga Arabic", "ar") internal class Mangarbic(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGARBIC, "mangarabic.com") { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/PewPiece.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/PewPiece.kt index dfb8cd21..e39b0cd7 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/PewPiece.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/PewPiece.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("PEWPIECE", "PewPiece", "ar") +@MangaSourceParser("PEWPIECE", "Pew Piece", "ar") internal class PewPiece(context: MangaLoaderContext) : MadaraParser(context, MangaSource.PEWPIECE, "pewpiece.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/GdScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/GdScans.kt index 2ed02980..d730d17f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/GdScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/GdScans.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("GDSCANS", "GdScans", "en") +@MangaSourceParser("GDSCANS", "Gd Scans", "en") internal class GdScans(context: MangaLoaderContext) : MadaraParser(context, MangaSource.GDSCANS, "gdscans.com", 10) { override val tagPrefix = "webtoon-genre/" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/HManhwa.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/HManhwa.kt index 91cbd3bc..04ef7cfa 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/HManhwa.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/HManhwa.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.madara.MadaraParser -@MangaSourceParser("HMANHWA", "HManhwa", "en", ContentType.HENTAI) +@MangaSourceParser("HMANHWA", "H Manhwa", "en", ContentType.HENTAI) internal class HManhwa(context: MangaLoaderContext) : MadaraParser(context, MangaSource.HMANHWA, "hmanhwa.com") { override val tagPrefix = "manhwa-genre/" 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 833e79c0..e1302a7e 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", "H Scans", "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/en/Itsyourightmanhua.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Itsyourightmanhua.kt index 84a79ebf..a53ba4fb 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Itsyourightmanhua.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Itsyourightmanhua.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("ITSYOURIGHTMANHUA", "Itsyourightmanhua", "en") +@MangaSourceParser("ITSYOURIGHTMANHUA", "Its You Right Manhua", "en") internal class Itsyourightmanhua(context: MangaLoaderContext) : MadaraParser(context, MangaSource.ITSYOURIGHTMANHUA, "itsyourightmanhua.com", 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Jaiminisbox.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Jaiminisbox.kt index 4964cd94..543cef5e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Jaiminisbox.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Jaiminisbox.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("JAIMINISBOX", "Jaiminisbox", "en") +@MangaSourceParser("JAIMINISBOX", "Jaiminis Box", "en") internal class Jaiminisbox(context: MangaLoaderContext) : MadaraParser(context, MangaSource.JAIMINISBOX, "jaiminisbox.net") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/JiManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/JiManga.kt index a3f9d655..180219aa 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/JiManga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/JiManga.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("JIMANGA", "JiManga", "en") +@MangaSourceParser("JIMANGA", "Ji Manga", "en") internal class JiManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.JIMANGA, "jimanga.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaEffect.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaEffect.kt index 3dd415ae..838bcfb9 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaEffect.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaEffect.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("MANGAEFFECT", "MangaEffect", "en") +@MangaSourceParser("MANGAEFFECT", "Manga Effect", "en") internal class MangaEffect(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGAEFFECT, "mangaeffect.com") { override val datePattern = "dd.MM.yyyy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaOwlBlog.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaOwlBlog.kt index 793c8a3b..5e9cd4cb 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaOwlBlog.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaOwlBlog.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.madara.MadaraParser -@MangaSourceParser("MANGAOWLBLOG", "MangaOwl .Blog", "en", ContentType.HENTAI) +@MangaSourceParser("MANGAOWLBLOG", "Manga Owl .Blog", "en", ContentType.HENTAI) internal class MangaOwlBlog(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGAOWLBLOG, "mangaowl.blog", 20) { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaOwlIo.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaOwlIo.kt index 1481b6a6..e9df6b0f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaOwlIo.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaOwlIo.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("MANGAOWL_IO", "MangaOwl .Io", "en") +@MangaSourceParser("MANGAOWL_IO", "Manga Owl .Io", "en") internal class MangaOwlIo(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGAOWL_IO, "mangaowl.io") { override val listUrl = "mangaowl-all/" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaowlOne.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaowlOne.kt index 744a218f..6b99600a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaowlOne.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaowlOne.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.madara.MadaraParser -@MangaSourceParser("MANGAOWL_ONE", "MangaOwl .One", "en", ContentType.HENTAI) +@MangaSourceParser("MANGAOWL_ONE", "Manga Owl .One", "en", ContentType.HENTAI) internal class MangaowlOne(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGAOWL_ONE, "mangaowl.one") { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaes.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaes.kt index 4920ed08..7e7b3878 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaes.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaes.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("MANHUAES", "Manhuaes", "en") +@MangaSourceParser("MANHUAES", "ManhuaEs", "en") internal class Manhuaes(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHUAES, "manhuaes.com") { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaga.kt index cccf6dd2..daa8091e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaga.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("MANHUAGA", "Manhuaga", "en") +@MangaSourceParser("MANHUAGA", "ManhuaGa", "en") internal class Manhuaga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHUAGA, "manhuaga.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuasy.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuasy.kt index 285e11a5..10691108 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuasy.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuasy.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("MANHUASY", "Manhuasy", "en") +@MangaSourceParser("MANHUASY", "ManhuaSy", "en") internal class Manhuasy(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHUASY, "www.manhuasy.com") { override val listUrl = "manhua/" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaus.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaus.kt index 301d224e..168e5a42 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaus.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaus.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("MANHUAUS", "Manhuaus", "en") +@MangaSourceParser("MANHUAUS", "ManhuaUs", "en") internal class Manhuaus(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHUAUS, "manhuaus.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwa18App.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwa18App.kt index b36f6d65..c37801fe 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwa18App.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwa18App.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.madara.MadaraParser -@MangaSourceParser("MANHWA18APP", "Manhwa18 .App", "en", ContentType.HENTAI) +@MangaSourceParser("MANHWA18APP", "Manhwa 18 .App", "en", ContentType.HENTAI) internal class Manhwa18App(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHWA18APP, "manhwa18.app") { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwa18Org.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwa18Org.kt index f462d263..a71c3f86 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwa18Org.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwa18Org.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.madara.MadaraParser -@MangaSourceParser("MANHWA18ORG", "Manhwa18 .Org", "en", ContentType.HENTAI) +@MangaSourceParser("MANHWA18ORG", "Manhwa 18 .Org", "en", ContentType.HENTAI) internal class Manhwa18Org(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHWA18ORG, "manhwa18.org") { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwa2Read.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwa2Read.kt index f586ae74..d2cd8df5 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwa2Read.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwa2Read.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("MANHWA2READ", "Manhwa2Read", "en") +@MangaSourceParser("MANHWA2READ", "Manhwa 2 Read", "en") internal class Manhwa2Read(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHWA2READ, "manhwa2read.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwaden.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwaden.kt index 68e52a76..e7c23b9d 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwaden.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwaden.kt @@ -9,7 +9,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser import org.koitharu.kotatsu.parsers.util.* -@MangaSourceParser("MANHWADEN", "Manhwaden", "en", ContentType.HENTAI) +@MangaSourceParser("MANHWADEN", "Manhwa Den", "en", ContentType.HENTAI) internal class Manhwaden(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHWADEN, "www.manhwaden.com", 10) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwasco.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwasco.kt index 84af3a40..2288f1e2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwasco.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwasco.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("MANHWASCO", "Manhwasco", "en") +@MangaSourceParser("MANHWASCO", "Manhwa Sco", "en") internal class Manhwasco(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHWASCO, "manhwasco.net") { override val selectGenre = "div.mg_genres a" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Painfulnightz.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Painfulnightz.kt index 3ccfa15b..fb7629ec 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Painfulnightz.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Painfulnightz.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("PAINFULNIGHTZ", "Painfulnightz", "en") +@MangaSourceParser("PAINFULNIGHTZ", "Painful Nightz", "en") internal class Painfulnightz(context: MangaLoaderContext) : MadaraParser(context, MangaSource.PAINFULNIGHTZ, "painfulnightz.com") { override val datePattern = "d MMMM" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/PawManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/PawManga.kt index 3774e6da..b7d39932 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/PawManga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/PawManga.kt @@ -6,6 +6,6 @@ import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("PAWMANGA", "PawManga", "en", ContentType.HENTAI) +@MangaSourceParser("PAWMANGA", "Paw Manga", "en", ContentType.HENTAI) internal class PawManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.PAWMANGA, "pawmanga.com", 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/PetrotechSociety.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/PetrotechSociety.kt index 871a732e..27387633 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/PetrotechSociety.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/PetrotechSociety.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.madara.MadaraParser -@MangaSourceParser("PETROTECHSOCIETY", "PetrotechSociety", "en", ContentType.HENTAI) +@MangaSourceParser("PETROTECHSOCIETY", "Petrotech Society", "en", ContentType.HENTAI) internal class PetrotechSociety(context: MangaLoaderContext) : MadaraParser(context, MangaSource.PETROTECHSOCIETY, "www.petrotechsociety.org", pageSize = 10) { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Rio2MangaNet.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Rio2MangaNet.kt index 63d0ad97..af4a6dcd 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Rio2MangaNet.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Rio2MangaNet.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("RIO2MANGANET", "Rio2Manga .Net", "en") +@MangaSourceParser("RIO2MANGANET", "Rio 2 Manga .Net", "en") internal class Rio2MangaNet(context: MangaLoaderContext) : MadaraParser(context, MangaSource.RIO2MANGANET, "rio2manga.net", 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ShootingStarScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ShootingStarScans.kt index b8604002..1937b275 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ShootingStarScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ShootingStarScans.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("SHOOTINGSTARSCANS", "ShootingStar Scans", "en") +@MangaSourceParser("SHOOTINGSTARSCANS", "Shooting Star Scans", "en") internal class ShootingStarScans(context: MangaLoaderContext) : MadaraParser(context, MangaSource.SHOOTINGSTARSCANS, "shootingstarscans.com") { override val tagPrefix = "manga-tag/" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StkissMangaBlog.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StkissMangaBlog.kt index 3276f616..3d5825e6 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StkissMangaBlog.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StkissMangaBlog.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("STKISSMANGABLOG", "StkissManga .Blog", "en") +@MangaSourceParser("STKISSMANGABLOG", "St kiss Manga .Blog", "en") internal class StkissMangaBlog(context: MangaLoaderContext) : MadaraParser(context, MangaSource.STKISSMANGABLOG, "1stkissmanga.blog", 10) { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StkissMangaCom.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StkissMangaCom.kt index 455df8ba..be5fa737 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StkissMangaCom.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StkissMangaCom.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("STKISSMANGA_COM", "1st Kiss-Manga .Com", "en") +@MangaSourceParser("STKISSMANGA_COM", "1St Kiss-Manga .Com", "en") internal class StkissMangaCom(context: MangaLoaderContext) : MadaraParser(context, MangaSource.STKISSMANGA_COM, "1stkiss-manga.com", 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StkissMangaTv.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StkissMangaTv.kt index 3815ec33..74efcd76 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StkissMangaTv.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StkissMangaTv.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("STKISSMANGA_TV", "1stKissManga .Tv", "en") +@MangaSourceParser("STKISSMANGA_TV", "1St Kiss Manga .Tv", "en") internal class StkissMangaTv(context: MangaLoaderContext) : MadaraParser(context, MangaSource.STKISSMANGA_TV, "1stkissmanga.tv", 20) { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/SumManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/SumManga.kt index 37cae7f2..69a938fc 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/SumManga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/SumManga.kt @@ -6,6 +6,6 @@ import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("SUMMANGA", "SumManga", "en", ContentType.HENTAI) +@MangaSourceParser("SUMMANGA", "Sum Manga", "en", ContentType.HENTAI) internal class SumManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.SUMMANGA, "summanga.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Copypastescan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Copypastescan.kt index 92f2114a..9deab777 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Copypastescan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Copypastescan.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("COPYPASTESCAN", "CopyPaste Scan", "es") +@MangaSourceParser("COPYPASTESCAN", "Copy Paste Scan", "es") internal class Copypastescan(context: MangaLoaderContext) : MadaraParser(context, MangaSource.COPYPASTESCAN, "copypastescan.xyz", 10) { override val datePattern = "d MMMM, yyyy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Lectorunitoon.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Lectorunitoon.kt index dddedc90..9d0fc263 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Lectorunitoon.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Lectorunitoon.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("LECTORUNITOON", "Lectorunitoon", "es") +@MangaSourceParser("LECTORUNITOON", "Lectoruni Toon", "es") internal class Lectorunitoon(context: MangaLoaderContext) : MadaraParser(context, MangaSource.LECTORUNITOON, "lectorunitoon.com", 10) { override val tagPrefix = "generos/" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Mangaxico.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Mangaxico.kt index c65509d9..338a193c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Mangaxico.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Mangaxico.kt @@ -6,6 +6,6 @@ import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("MANGAXICO", "Mangaxico", "es", ContentType.HENTAI) +@MangaSourceParser("MANGAXICO", "Manga Xico", "es", ContentType.HENTAI) internal class Mangaxico(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGAXICO, "mangaxico.com", 24) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/NoblesseTranslations.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/NoblesseTranslations.kt index 8978664e..fe5a4e4d 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/NoblesseTranslations.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/NoblesseTranslations.kt @@ -7,6 +7,6 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("NOBLESSETRANSLATIONS", "Noblesse Translations", "es") internal class NoblesseTranslations(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.NOBLESSETRANSLATIONS, "www.noblessetranslations.com") { + MadaraParser(context, MangaSource.NOBLESSETRANSLATIONS, "noblessetranslations.com") { override val datePattern = "d MMMM, yyyy" } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/RightdarkScan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/RightdarkScan.kt index 2fbd26c4..1e15a2fd 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/RightdarkScan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/RightdarkScan.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("RIGHTDARKSCAN", "Rightdark Scan", "es") +@MangaSourceParser("RIGHTDARKSCAN", "Right Dark Scan", "es") internal class RightdarkScan(context: MangaLoaderContext) : MadaraParser(context, MangaSource.RIGHTDARKSCAN, "rightdark-scan.com", 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/TempleScanEsp.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/TempleScanEsp.kt index ffccc7d2..053ee3c4 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/TempleScanEsp.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/TempleScanEsp.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.madara.MadaraParser -@MangaSourceParser("TEMPLESCANESP", "TempleScanEsp", "es", ContentType.HENTAI) +@MangaSourceParser("TEMPLESCANESP", "Temple Scan Esp", "es", ContentType.HENTAI) internal class TempleScanEsp(context: MangaLoaderContext) : MadaraParser(context, MangaSource.TEMPLESCANESP, "templescanesp.com") { override val listUrl = "series/" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/TopComicPorno.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/TopComicPorno.kt index 24435d70..f43b8fac 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/TopComicPorno.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/TopComicPorno.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.madara.MadaraParser -@MangaSourceParser("TOPCOMICPORNO", "TopComicPorno", "es", ContentType.HENTAI) +@MangaSourceParser("TOPCOMICPORNO", "Top Comic Porno", "es", ContentType.HENTAI) internal class TopComicPorno(context: MangaLoaderContext) : MadaraParser(context, MangaSource.TOPCOMICPORNO, "topcomicporno.com", 18) { override val datePattern = "MMM dd, yy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/HhentaiFr.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/HhentaiFr.kt index 20009508..3d7a3bb9 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/HhentaiFr.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/HhentaiFr.kt @@ -8,7 +8,7 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser import org.koitharu.kotatsu.parsers.util.domain import org.koitharu.kotatsu.parsers.util.insertCookies -@MangaSourceParser("HHENTAIFR", "Hhentai", "fr", ContentType.HENTAI) +@MangaSourceParser("HHENTAIFR", "H Hentai", "fr", ContentType.HENTAI) internal class HhentaiFr(context: MangaLoaderContext) : MadaraParser(context, MangaSource.HHENTAIFR, "hhentai.fr") { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/Readergen.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/Readergen.kt index ce7c32b2..90b3eb97 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/Readergen.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/Readergen.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("READERGEN", "Readergen", "fr") +@MangaSourceParser("READERGEN", "Reader Gen", "fr") internal class Readergen(context: MangaLoaderContext) : MadaraParser(context, MangaSource.READERGEN, "fr.readergen.fr", 18) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/id/Komiksay.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/id/Komiksay.kt index 7f7cab2f..51a58c8d 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/id/Komiksay.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/id/Komiksay.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("KOMIKSA", "Komiksay", "id") +@MangaSourceParser("KOMIKSA", "Komik Say", "id") internal class Komiksay(context: MangaLoaderContext) : MadaraParser(context, MangaSource.KOMIKSA, "komiksay.site") { override val tagPrefix = "komik-genre/" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/it/Beyondtheataraxia.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/it/Beyondtheataraxia.kt index 0e501837..5f55f35d 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/it/Beyondtheataraxia.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/it/Beyondtheataraxia.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("BEYONDTHEATARAXIA", "Beyondtheataraxia", "it") +@MangaSourceParser("BEYONDTHEATARAXIA", "Beyond The Ataraxia", "it") internal class Beyondtheataraxia(context: MangaLoaderContext) : MadaraParser(context, MangaSource.BEYONDTHEATARAXIA, "www.beyondtheataraxia.com", 10) { override val datePattern = "d MMMM yyyy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Fbsquads.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Fbsquads.kt index b3683264..6fec4dd1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Fbsquads.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Fbsquads.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.madara.MadaraParser -@MangaSourceParser("FBSQUADS", "Fbsquads", "pt", ContentType.HENTAI) +@MangaSourceParser("FBSQUADS", "Fb Squads", "pt", ContentType.HENTAI) internal class Fbsquads(context: MangaLoaderContext) : MadaraParser(context, MangaSource.FBSQUADS, "fbsquads.com") { override val datePattern: String = "dd/MM/yyyy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Leitorizakaya.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Leitorizakaya.kt index 572c2c01..04554168 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Leitorizakaya.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Leitorizakaya.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.madara.MadaraParser -@MangaSourceParser("LEITORIZAKAYA", "Leitorizakaya", "pt", ContentType.HENTAI) +@MangaSourceParser("LEITORIZAKAYA", "Leitor Izakaya", "pt", ContentType.HENTAI) internal class Leitorizakaya(context: MangaLoaderContext) : MadaraParser(context, MangaSource.LEITORIZAKAYA, "leitorizakaya.net") { override val datePattern: String = "dd/MM/yyyy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Pirulitorosa.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Pirulitorosa.kt index ab74fcb7..fc76af6a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Pirulitorosa.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Pirulitorosa.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.madara.MadaraParser -@MangaSourceParser("PIRULITOROSA", "Pirulitorosa", "pt", ContentType.HENTAI) +@MangaSourceParser("PIRULITOROSA", "Pirulito Rosa", "pt", ContentType.HENTAI) internal class Pirulitorosa(context: MangaLoaderContext) : MadaraParser(context, MangaSource.PIRULITOROSA, "pirulitorosa.site") { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/WickedWitchScan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/WickedWitchScan.kt index 36c794c6..15419b1e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/WickedWitchScan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/WickedWitchScan.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("WICKEDWITCHSCAN", "WickedWitch Scan", "pt") +@MangaSourceParser("WICKEDWITCHSCAN", "Wicked Witch Scan", "pt") internal class WickedWitchScan(context: MangaLoaderContext) : MadaraParser(context, MangaSource.WICKEDWITCHSCAN, "wickedwitchscan.com", pageSize = 10) { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Ycscan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Ycscan.kt index dce102ab..1c71579f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Ycscan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Ycscan.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.madara.MadaraParser -@MangaSourceParser("YCSCAN", "Ycscan", "pt", ContentType.HENTAI) +@MangaSourceParser("YCSCAN", "Yc Scan", "pt", ContentType.HENTAI) internal class Ycscan(context: MangaLoaderContext) : MadaraParser(context, MangaSource.YCSCAN, "ycscan.com", 20) { override val datePattern: String = "dd/MM/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 56efc299..b3c35def 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 @@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("JIANGZAITOON", "Jiangzaitoon", "tr", ContentType.HENTAI) +@MangaSourceParser("JIANGZAITOON", "Jiangzai Toon", "tr", ContentType.HENTAI) internal class Jiangzaitoon(context: MangaLoaderContext) : MadaraParser(context, MangaSource.JIANGZAITOON, "jiangzaitoon.cc") { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Mangawt.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Mangawt.kt index 5754516e..9cb51fc3 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Mangawt.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Mangawt.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("MANGAWT", "Mangawt", "tr") +@MangaSourceParser("MANGAWT", "MangaWt", "tr") internal class Mangawt(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGAWT, "mangawt.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Timenaight.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Timenaight.kt index 33f05efd..a2f1cb52 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Timenaight.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Timenaight.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("TIMENAIGHT", "Timenaight", "tr") +@MangaSourceParser("TIMENAIGHT", "Time Naight", "tr") internal class Timenaight(context: MangaLoaderContext) : MadaraParser(context, MangaSource.TIMENAIGHT, "timenaight.com") { override val postReq = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Webtoonevreni.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Webtoonevreni.kt index 5c390ab9..4aaab8bf 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Webtoonevreni.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Webtoonevreni.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("WEBTOONEVRENI", "Webtoonevreni", "tr") +@MangaSourceParser("WEBTOONEVRENI", "Webtoon Evreni", "tr") internal class Webtoonevreni(context: MangaLoaderContext) : MadaraParser(context, MangaSource.WEBTOONEVRENI, "webtoonevreni.net", 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Webtoontr.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Webtoontr.kt index 15610dbd..ae14da57 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Webtoontr.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Webtoontr.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("WEBTOONTR", "Webtoontr", "tr") +@MangaSourceParser("WEBTOONTR", "Webtoon tr", "tr") internal class Webtoontr(context: MangaLoaderContext) : MadaraParser(context, MangaSource.WEBTOONTR, "webtoontr.net", 16) { override val tagPrefix = "webtoon-kategori/" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madtheme/MadthemeParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madtheme/MadthemeParser.kt index 39a4ca87..d25942d1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madtheme/MadthemeParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madtheme/MadthemeParser.kt @@ -137,7 +137,7 @@ internal abstract class MadthemeParser( val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.selectFirstOrThrow(selectDesc).html() @@ -175,7 +175,7 @@ internal abstract class MadthemeParser( protected open val selectDate = "div .chapter-update" protected open val selectChapter = "ul#chapter-list li" - protected open suspend fun getChapters(manga: Manga, doc: Document): List { + protected open suspend fun getChapters(doc: Document): List { val dateFormat = SimpleDateFormat(datePattern, sourceLocale) return doc.body().select(selectChapter).mapChapters(reversed = true) { i, li -> val a = li.selectFirstOrThrow("a") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madtheme/en/Mangaxyz.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madtheme/en/Mangaxyz.kt index c097f52c..ce84137b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madtheme/en/Mangaxyz.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madtheme/en/Mangaxyz.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madtheme.MadthemeParser -@MangaSourceParser("MANGAXYZ", "Mangaxyz", "en") +@MangaSourceParser("MANGAXYZ", "MangaXyz", "en") internal class Mangaxyz(context: MangaLoaderContext) : MadthemeParser(context, MangaSource.MANGAXYZ, "mangaxyz.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/manga18/Manga18Parser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/manga18/Manga18Parser.kt index 932c5a48..3b13ab1c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/manga18/Manga18Parser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/manga18/Manga18Parser.kt @@ -132,7 +132,7 @@ internal abstract class Manga18Parser( val doc = webClient.httpGet(fullUrl).parseHtml() val body = doc.body().selectFirstOrThrow("div.detail_listInfo") - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.selectFirstOrThrow(selectDesc).html() @@ -167,7 +167,7 @@ internal abstract class Manga18Parser( protected open val selectDate = "div.item p" protected open val selectChapter = "div.chapter_box li" - protected open suspend fun getChapters(manga: Manga, doc: Document): List { + protected open suspend fun getChapters(doc: Document): List { val dateFormat = SimpleDateFormat(datePattern, sourceLocale) return doc.body().select(selectChapter).mapChapters(reversed = true) { i, li -> val a = li.selectFirstOrThrow("a") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/manga18/zh/Hanman18.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/manga18/zh/Hanman18.kt index b96bec34..ad6f9fd9 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/manga18/zh/Hanman18.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/manga18/zh/Hanman18.kt @@ -7,11 +7,11 @@ import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.site.manga18.Manga18Parser import org.koitharu.kotatsu.parsers.util.* -@MangaSourceParser("HANMAN18", "Hanman18", "zh", ContentType.HENTAI) +@MangaSourceParser("HANMAN18", "Hanman 18", "zh", ContentType.HENTAI) internal class Hanman18(context: MangaLoaderContext) : Manga18Parser(context, MangaSource.HANMAN18, "hanman18.com") { - override suspend fun getChapters(manga: Manga, doc: Document): List { + override suspend fun getChapters(doc: Document): List { return doc.body().select(selectChapter).mapChapters(reversed = true) { i, li -> val a = li.selectFirstOrThrow("a") val href = a.attrAsRelativeUrl("href") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/MangaboxParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/MangaboxParser.kt index 5cfee1d9..0db621e9 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/MangaboxParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/MangaboxParser.kt @@ -130,7 +130,7 @@ internal abstract class MangaboxParser( val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.selectFirstOrThrow(selectDesc).html() @@ -168,7 +168,7 @@ internal abstract class MangaboxParser( protected open val selectDate = "span" protected open val selectChapter = "div.chapter-list div.row, ul.row-content-chapter li" - protected open suspend fun getChapters(manga: Manga, doc: Document): List { + protected open suspend fun getChapters(doc: Document): List { val dateFormat = SimpleDateFormat(datePattern, sourceLocale) return doc.body().select(selectChapter).mapChapters(reversed = true) { i, li -> val a = li.selectFirstOrThrow("a") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangairo.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangairo.kt index 717c0f83..fdeea41f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangairo.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangairo.kt @@ -116,7 +116,7 @@ internal class Mangairo(context: MangaLoaderContext) : val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.selectFirstOrThrow(selectDesc).html() diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangakakalot.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangakakalot.kt index b4af9d45..99324654 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangakakalot.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangakakalot.kt @@ -81,7 +81,7 @@ internal class Mangakakalot(context: MangaLoaderContext) : } } - override suspend fun getChapters(manga: Manga, doc: Document): List { + override suspend fun getChapters(doc: Document): List { return doc.body().select(selectChapter).mapChapters(reversed = true) { i, li -> val a = li.selectFirstOrThrow("a") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/Areascans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/Areascans.kt index b99b9182..1f48852a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/Areascans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/Areascans.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("AREASCANS", "Areascans", "ar") +@MangaSourceParser("AREASCANS", "Area Scans", "ar") internal class Areascans(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.AREASCANS, "www.areascans.net", pageSize = 20, searchPageSize = 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/AresManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/AresManga.kt index 5b43fdf0..03ba48b8 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/AresManga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/AresManga.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("ARESMANGA", "AresManga", "ar") +@MangaSourceParser("ARESMANGA", "Ares Manga", "ar") internal class AresManga(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.ARESMANGA, "aresnov.org", pageSize = 20, searchPageSize = 10) { override val listUrl = "/series" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/Mangaatrend.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/Mangaatrend.kt index 10424b56..e36d349c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/Mangaatrend.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/Mangaatrend.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("MANGAATREND", "Mangaatrend", "ar") +@MangaSourceParser("MANGAATREND", "Manga A Trend", "ar") internal class Mangaatrend(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.MANGAATREND, "mangaatrend.net", pageSize = 40, searchPageSize = 20) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/FreakComic.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/FreakComic.kt index fbbb4cf5..151f3ebd 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/FreakComic.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/FreakComic.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("FREAKCOMIC", "FreakComic", "en") +@MangaSourceParser("FREAKCOMIC", "Freak Comic", "en") internal class FreakComic(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.FREAKCOMIC, "freakcomic.com", pageSize = 20, searchPageSize = 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/ManhwaLover.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/ManhwaLover.kt index 08fcdd9a..4b29504d 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/ManhwaLover.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/ManhwaLover.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("MANHWALOVER", "ManhwaLover", "en", ContentType.HENTAI) +@MangaSourceParser("MANHWALOVER", "Manhwa Lover", "en", ContentType.HENTAI) internal class ManhwaLover(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.MANHWALOVER, "manhwalover.com", pageSize = 20, searchPageSize = 20) { override val datePattern = "MMM d, yyyy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/Manhwax.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/Manhwax.kt index e778b93d..39cc5244 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/Manhwax.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/Manhwax.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("MANHWAX", "Manhwax", "en", ContentType.HENTAI) +@MangaSourceParser("MANHWAX", "ManhwaX", "en", ContentType.HENTAI) internal class Manhwax(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.MANHWAX, "manhwax.org", pageSize = 20, searchPageSize = 20) { override val datePattern = "MMM d, yyyy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/Manjanoon.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/Manjanoon.kt new file mode 100644 index 00000000..99f77ba7 --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/Manjanoon.kt @@ -0,0 +1,10 @@ +package org.koitharu.kotatsu.parsers.site.mangareader.en + +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("MANJANOON_EN", "Manjanoon", "en") +internal class Manjanoon(context: MangaLoaderContext) : + MangaReaderParser(context, MangaSource.MANJANOON_EN, "manjanoon.net", pageSize = 20, searchPageSize = 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/RaiScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/RaiScans.kt new file mode 100644 index 00000000..cc5e5992 --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/RaiScans.kt @@ -0,0 +1,12 @@ +package org.koitharu.kotatsu.parsers.site.mangareader.en + +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("RAISCANS", "Rai Scans", "en") +internal class RaiScans(context: MangaLoaderContext) : + MangaReaderParser(context, MangaSource.RAISCANS, "www.raiscans.com", pageSize = 20, searchPageSize = 10) { + override val listUrl = "/Series" +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/RealmScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/RealmScans.kt index 22513d2a..94d5dcff 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/RealmScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/RealmScans.kt @@ -16,7 +16,7 @@ import org.koitharu.kotatsu.parsers.util.oneOrThrowIfMany import org.koitharu.kotatsu.parsers.util.parseHtml import java.util.EnumSet -@MangaSourceParser("REALMSCANS", "RealmScans", "en") +@MangaSourceParser("REALMSCANS", "Realm Scans", "en") internal class RealmScans(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.REALMSCANS, "realmscans.to", pageSize = 52, searchPageSize = 50) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/AiyuMangaScanlation.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/AiyuMangaScanlation.kt index 0fa14aba..bf588973 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/AiyuMangaScanlation.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/AiyuMangaScanlation.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("AIYUMANGASCANLATION", "Aiyu Manga", "es") +@MangaSourceParser("AIYUMANGASCANLATION", "Aiyu Manhua", "es") internal class AiyuMangaScanlation(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.AIYUMANGASCANLATION, "aiyumanhua.com", 20, 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/Raikiscan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/Raikiscan.kt index 38d3b1e6..c9c3823e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/Raikiscan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/Raikiscan.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("RAIKISCAN", "Raikiscan", "es") +@MangaSourceParser("RAIKISCAN", "Raiki Scan", "es") internal class Raikiscan(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.RAIKISCAN, "raikiscan.com", pageSize = 20, searchPageSize = 20) { override val datePattern = "MMM d, yyyy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/Senpaiediciones.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/Senpaiediciones.kt index 4cc1e8e9..8ddc38c5 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/Senpaiediciones.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/Senpaiediciones.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("SENPAIEDICIONES", "Senpaiediciones", "es") +@MangaSourceParser("SENPAIEDICIONES", "Senpai Ediciones", "es") internal class Senpaiediciones(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.SENPAIEDICIONES, "senpaiediciones.com", pageSize = 20, searchPageSize = 20) { override val datePattern = "MMM d, yyyy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/Shadowmangas.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/Shadowmangas.kt index 239bba88..2ebbad02 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/Shadowmangas.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/Shadowmangas.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("SHADOWMANGAS", "Shadowmangas", "es") +@MangaSourceParser("SHADOWMANGAS", "Shadow Mangas", "es") internal class Shadowmangas(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.SHADOWMANGAS, "shadowmangas.com", pageSize = 10, searchPageSize = 10) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/fr/EpsilonscanParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/fr/EpsilonscanParser.kt index 51124f38..74dd267c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/fr/EpsilonscanParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/fr/EpsilonscanParser.kt @@ -6,6 +6,6 @@ import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("EPSILONSCAN", "Epsilonscan", "fr", ContentType.HENTAI) +@MangaSourceParser("EPSILONSCAN", "Epsilon Scan", "fr", ContentType.HENTAI) internal class EpsilonscanParser(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.EPSILONSCAN, "epsilonscan.fr", pageSize = 20, searchPageSize = 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/Duniakomik.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/Duniakomik.kt index 5049e43d..26cfcffb 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/Duniakomik.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/Duniakomik.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("DUNIAKOMIK", "Duniakomik", "id", ContentType.HENTAI) +@MangaSourceParser("DUNIAKOMIK", "Dunia Komik", "id", ContentType.HENTAI) internal class Duniakomik(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.DUNIAKOMIK, "duniakomik.org", pageSize = 12, searchPageSize = 12) { override val datePattern = "MMM d, yyyy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/KomiklokalCfd.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/KomiklokalCfd.kt index 09c7bb3b..8f8dcbed 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/KomiklokalCfd.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/KomiklokalCfd.kt @@ -7,8 +7,8 @@ import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser import java.util.* -@MangaSourceParser("KOMIKLOKALCFD", "Komiklokal .Cfd", "id", ContentType.HENTAI) +@MangaSourceParser("KOMIKLOKALCFD", "Komik Lokal .Sbs", "id", ContentType.HENTAI) internal class KomiklokalCfd(context: MangaLoaderContext) : - MangaReaderParser(context, MangaSource.KOMIKLOKALCFD, "komiklokal.cfd", pageSize = 30, searchPageSize = 10) { + MangaReaderParser(context, MangaSource.KOMIKLOKALCFD, "komiklokal.sbs", pageSize = 30, searchPageSize = 10) { override val sourceLocale: Locale = Locale.ENGLISH } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/Lianscans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/Lianscans.kt index 8a6bbc1a..b3f6c1c9 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/Lianscans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/id/Lianscans.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("LIANSCANS", "Lianscans", "id", ContentType.HENTAI) +@MangaSourceParser("LIANSCANS", "Lian Scans", "id", ContentType.HENTAI) internal class Lianscans(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.LIANSCANS, "www.lianscans.my.id", pageSize = 10, searchPageSize = 10) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pl/SkanlacjeFeniksy.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pl/SkanlacjeFeniksy.kt index 8203ffe0..3c2dff68 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pl/SkanlacjeFeniksy.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pl/SkanlacjeFeniksy.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("SKANLACJEFENIKSY", "SkanlacjeFeniksy", "pl") +@MangaSourceParser("SKANLACJEFENIKSY", "Skanlacje Feniksy", "pl") internal class SkanlacjeFeniksy(context: MangaLoaderContext) : MangaReaderParser( context, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/Mundomangakun.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/Mundomangakun.kt index 8fcbdcb3..5e03a0e5 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/Mundomangakun.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pt/Mundomangakun.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("MUNDOMANGAKUN", "Mundomangakun", "pt") +@MangaSourceParser("MUNDOMANGAKUN", "Mundo Manga Kun", "pt") internal class Mundomangakun(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.MUNDOMANGAKUN, "mundomangakun.com.br", pageSize = 20, searchPageSize = 20) { override val datePattern = "MMM d, yyyy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Ayatoon.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Ayatoon.kt index 089a2c6d..36ec7592 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Ayatoon.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Ayatoon.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("AYATOON", "Ayatoon", "tr") +@MangaSourceParser("AYATOON", "Aya Toon", "tr") internal class Ayatoon(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.AYATOON, "ayatoon.com", pageSize = 20, searchPageSize = 20) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Golgebahcesi.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Golgebahcesi.kt index fe92337e..e7370c94 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Golgebahcesi.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Golgebahcesi.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("GOLGEBAHCESI", "Golgebahcesi", "tr") +@MangaSourceParser("GOLGEBAHCESI", "Golge Bahcesi", "tr") internal class Golgebahcesi(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.GOLGEBAHCESI, "golgebahcesi.com", pageSize = 14, searchPageSize = 9) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Mangaefendisi.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Mangaefendisi.kt index fedb4452..c9d75261 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Mangaefendisi.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Mangaefendisi.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("MANGAEFENDISI", "Mangaefendisi", "tr") +@MangaSourceParser("MANGAEFENDISI", "Manga Efendisi", "tr") internal class Mangaefendisi(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.MANGAEFENDISI, "mangaefendisi.net", pageSize = 30, searchPageSize = 20) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Mangaokutr.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Mangaokutr.kt index e20c83ba..1e1f496b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Mangaokutr.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Mangaokutr.kt @@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -@MangaSourceParser("MANGAOKUTR", "Mangaokutr", "tr") +@MangaSourceParser("MANGAOKUTR", "Manga Oku Tr", "tr") internal class Mangaokutr(context: MangaLoaderContext) : MangaReaderParser(context, MangaSource.MANGAOKUTR, "mangaokutr.com", pageSize = 25, searchPageSize = 20) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Raindropteamfan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Raindropteamfan.kt index 8b24bcd6..555c9816 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Raindropteamfan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/Raindropteamfan.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("RAINDROPTEAMFAN", "Raindropteamfan", "tr") +@MangaSourceParser("RAINDROPTEAMFAN", "Raindrop Fansub", "tr") internal class Raindropteamfan(context: MangaLoaderContext) : MangaReaderParser( context, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/MmrcmsParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/MmrcmsParser.kt index 2f1a0564..0b934b70 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/MmrcmsParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/MmrcmsParser.kt @@ -161,7 +161,7 @@ internal abstract class MmrcmsParser( val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() val body = doc.body().selectFirstOrThrow("dl.dl-horizontal") - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.selectFirstOrThrow(selectDesc).text() val stateDiv = body.selectFirst(selectState)?.nextElementSibling() val state = stateDiv?.let { @@ -194,7 +194,7 @@ internal abstract class MmrcmsParser( protected open val selectDate = "div.date-chapter-title-rtl" protected open val selectChapter = "ul.chapters > li:not(.btn)" - protected open suspend fun getChapters(manga: Manga, doc: Document): List { + protected open suspend fun getChapters(doc: Document): List { val dateFormat = SimpleDateFormat(datePattern, sourceLocale) return doc.body().select(selectChapter).mapChapters(reversed = true) { i, li -> val a = li.selectFirstOrThrow("a") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/ar/Onma.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/ar/Onma.kt index c54c3805..5101e05a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/ar/Onma.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/ar/Onma.kt @@ -103,7 +103,7 @@ internal class Onma(context: MangaLoaderContext) : val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() val body = doc.body().selectFirstOrThrow("div.panel-body") - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.selectFirst(selectDesc)?.text().orEmpty() val stateDiv = body.selectFirst(selectState) val state = stateDiv?.let { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/fr/JpMangas.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/fr/JpMangas.kt index fda3469d..28be22bc 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/fr/JpMangas.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/fr/JpMangas.kt @@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mmrcms.MmrcmsParser import java.util.* -@MangaSourceParser("JPMANGAS", "JpMangas", "fr") +@MangaSourceParser("JPMANGAS", "Jp Mangas", "fr") internal class JpMangas(context: MangaLoaderContext) : MmrcmsParser(context, MangaSource.JPMANGAS, "jpmangas.xyz") { override val sourceLocale: Locale = Locale.ENGLISH diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/fr/JpScanVf.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/fr/JpScanVf.kt index b5261343..586257ef 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/fr/JpScanVf.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/fr/JpScanVf.kt @@ -7,7 +7,7 @@ import org.koitharu.kotatsu.parsers.site.mmrcms.MmrcmsParser import java.util.* //the search doesn't work on the source. -@MangaSourceParser("JPSCANVF", "JpScanVf", "fr") +@MangaSourceParser("JPSCANVF", "Jp Scan Vf", "fr") internal class JpScanVf(context: MangaLoaderContext) : MmrcmsParser(context, MangaSource.JPSCANVF, "jpscan-vf.net") { override val sourceLocale: Locale = Locale.ENGLISH diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/id/Mangaid.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/id/Mangaid.kt index a72541ca..5ac6b0b2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/id/Mangaid.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/id/Mangaid.kt @@ -8,7 +8,7 @@ import org.koitharu.kotatsu.parsers.site.mmrcms.MmrcmsParser import java.util.Locale -@MangaSourceParser("MANGAID", "Mangaid", "id") +@MangaSourceParser("MANGAID", "Manga Id", "id") internal class Mangaid(context: MangaLoaderContext) : MmrcmsParser(context, MangaSource.MANGAID, "mangaid.click") { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/pt/Animaregia.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/pt/Animaregia.kt index 8132c970..82434a9f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/pt/Animaregia.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/pt/Animaregia.kt @@ -31,7 +31,7 @@ internal class Animaregia(context: MangaLoaderContext) : val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() val body = doc.body().selectFirstOrThrow("ul.list-group") - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.select(selectDesc).text() val stateDiv = body.selectFirst("li.list-group-item:contains(Status)")?.lastElementChild() val state = stateDiv?.let { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/otakusanctuary/OtakuSanctuaryParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/otakusanctuary/OtakuSanctuaryParser.kt index 18734698..f0e4cbcf 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/otakusanctuary/OtakuSanctuaryParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/otakusanctuary/OtakuSanctuaryParser.kt @@ -206,7 +206,6 @@ internal abstract class OtakuSanctuaryParser( val urls = json.replace("\\u0022", "").substringAfter("{\"view\":\"[").substringBefore("]\",\"isSuccess") .split(",") return urls.map { - val urlImage = processUrl(it) MangaPage( id = generateUid(urlImage), diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/BrMangas.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/BrMangas.kt index a894c0f5..592b398c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/BrMangas.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/BrMangas.kt @@ -10,7 +10,7 @@ import org.koitharu.kotatsu.parsers.network.UserAgents import org.koitharu.kotatsu.parsers.util.* import java.util.* -@MangaSourceParser("BRMANGAS", "BrMangas", "pt") +@MangaSourceParser("BRMANGAS", "Br Mangas", "pt") internal class BrMangas(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.BRMANGAS, 25) { override val sortOrders: Set = EnumSet.of(SortOrder.POPULARITY, SortOrder.UPDATED) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/GoldenManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/GoldenManga.kt deleted file mode 100644 index 7badc5bb..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/GoldenManga.kt +++ /dev/null @@ -1,139 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.pt - -import okhttp3.Headers -import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser -import org.koitharu.kotatsu.parsers.config.ConfigKey -import org.koitharu.kotatsu.parsers.model.* -import org.koitharu.kotatsu.parsers.network.UserAgents -import org.koitharu.kotatsu.parsers.util.* -import java.text.SimpleDateFormat -import java.util.* - -@MangaSourceParser("GOLDENMANGA", "Golden Manga", "pt") -internal class GoldenManga(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.GOLDENMANGA, 36) { - - override val sortOrders: Set = EnumSet.of(SortOrder.ALPHABETICAL) - override val configKeyDomain = ConfigKey.Domain("goldenmanga.top") - override val headers: Headers = Headers.Builder() - .add("User-Agent", UserAgents.CHROME_MOBILE) - .build() - - override suspend fun getListPage( - page: Int, - query: String?, - tags: Set?, - sortOrder: SortOrder, - ): List { - val url = buildString { - append("https://") - append(domain) - if (!query.isNullOrEmpty()) { - append("/mangabr?pagina=") - append(page.toString()) - append("&busca=") - append(query.urlEncoded()) - } else { - append("/mangas") - append("?pagina=") - append(page.toString()) - } - if (!tags.isNullOrEmpty()) { - append("&genero=") - for (tag in tags) { - append(tag.key) - append(",") - } - } - } - val doc = webClient.httpGet(url).parseHtml() - return doc.select("section.row div.mangas") - .map { div -> - val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href") - Manga( - id = generateUid(href), - title = div.selectFirstOrThrow("a h3").text(), - altTitle = null, - url = href, - publicUrl = href.toAbsoluteUrl(domain), - rating = RATING_UNKNOWN, - isNsfw = div.selectFirst("div.MangaAdulto") != null, - coverUrl = div.selectFirstOrThrow("img").attrAsAbsoluteUrl("src"), - tags = setOf(), - state = null, - author = null, - source = source, - ) - } - } - - override suspend fun getTags(): Set { - val doc = webClient.httpGet("https://$domain/mangas").parseHtml() - return doc.select("div.container a.btn.btn-warning ").mapNotNullToSet { a -> - MangaTag( - key = a.attr("href").substringAfterLast("="), - title = a.text(), - source = source, - ) - } - } - - override suspend fun getDetails(manga: Manga): Manga { - val root = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml() - val dateFormat = SimpleDateFormat("(dd/MM/yyyy)", Locale.ENGLISH) - return manga.copy( - altTitle = null, - state = when (root.select("h5.cg_color")[3].select("a").text()) { - "ativo", "Ativo" -> MangaState.ONGOING - "Completo" -> MangaState.FINISHED - else -> null - }, - tags = root.select("h5.cg_color")[0].select("a").mapNotNullToSet { a -> - - if (a.text().isNullOrEmpty()) { - return@mapNotNullToSet null - } else { - MangaTag( - key = a.attr("href").substringAfterLast("="), - title = a.text().toTitleCase(), - source = source, - ) - } - }, - author = root.select("h5.cg_color a")[1].text(), - description = root.getElementById("manga_capitulo_descricao")?.html(), - chapters = root.requireElementById("capitulos").select("li") - .mapChapters(reversed = true) { i, div -> - val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href") - val dateText = div.selectFirstOrThrow("div.col-sm-5 span").text() - val name = div.selectFirstOrThrow("div.col-sm-5").text().substringBeforeLast("(") - MangaChapter( - id = generateUid(href), - name = name, - number = i, - url = href, - scanlator = null, - uploadDate = dateFormat.tryParse(dateText), - branch = null, - source = source, - ) - }, - ) - } - - override suspend fun getPages(chapter: MangaChapter): List { - val fullUrl = chapter.url.toAbsoluteUrl(domain) - val doc = webClient.httpGet(fullUrl).parseHtml() - val root = doc.body().requireElementById("capitulos_images") - return root.select("img").map { img -> - val url = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found") - MangaPage( - id = generateUid(url), - url = url, - preview = null, - source = source, - ) - } - } -} 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 deleted file mode 100644 index d9c50646..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/UnionMangasParser.kt +++ /dev/null @@ -1,174 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.pt - -import org.jsoup.nodes.Element -import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser -import org.koitharu.kotatsu.parsers.config.ConfigKey -import org.koitharu.kotatsu.parsers.model.* -import org.koitharu.kotatsu.parsers.util.* -import org.koitharu.kotatsu.parsers.util.json.getStringOrNull -import org.koitharu.kotatsu.parsers.util.json.mapJSON -import java.text.SimpleDateFormat -import java.util.* - -@MangaSourceParser("UNION_MANGAS", "Union Mangás", "pt") -class UnionMangasParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.UNION_MANGAS, 40) { - - override val sortOrders: Set = EnumSet.of( - SortOrder.ALPHABETICAL, - SortOrder.POPULARITY, - ) - - override val configKeyDomain = ConfigKey.Domain("unionmangasbr.top", "guimah.com") - - override suspend fun getListPage( - page: Int, - query: String?, - tags: Set?, - sortOrder: SortOrder, - ): List { - if (!query.isNullOrEmpty()) { - return if (page == searchPaginator.firstPage) { - search(query) - } else { - emptyList() - } - } - val tag = tags.oneOrThrowIfMany() - val url = urlBuilder() - .addPathSegment("lista-mangas") - .addPathSegment( - when { - tag != null -> tag.key - sortOrder == SortOrder.ALPHABETICAL -> "a-z" - else -> "visualizacoes" - }, - ).addPathSegment(page.toString()) - val doc = webClient.httpGet(url.build()).parseHtml() - val root = doc.selectFirstOrThrow("div.tamanho-bloco-perfil") - return root.select(".lista-itens").map { div -> - val a = div.selectFirstOrThrow("a") - val img = div.selectFirstOrThrow("img") - val href = a.attrAsRelativeUrl("href") - Manga( - id = generateUid(href), - url = href, - publicUrl = a.attrAsAbsoluteUrl("href"), - title = div.selectLastOrThrow("a").text(), - coverUrl = img.attrAsAbsoluteUrl("src"), - altTitle = null, - rating = RATING_UNKNOWN, - tags = emptySet(), - description = div.selectLast("div")?.ownText(), - state = null, - author = null, - isNsfw = false, - source = source, - ) - } - } - - override suspend fun getDetails(manga: Manga): Manga { - val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml() - val dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.ROOT) - return manga.copy( - rating = doc.select("h2") - .find { it.ownText().startsWith('#') } - ?.ownText()?.drop(1)?.toFloatOrNull()?.div(10f) ?: manga.rating, - largeCoverUrl = doc.selectFirst("img.img-thumbnail")?.attrAsAbsoluteUrlOrNull("src"), - description = doc.selectFirst(".panel-default")?.selectFirst(".panel-body")?.html(), - author = doc.tableValue("Autor")?.ownText(), - altTitle = doc.tableValue("Título(s) Alternativo(s)")?.ownText(), - state = when (doc.tableValue("Status")?.selectLast(".label")?.text()) { - "Completo" -> MangaState.FINISHED - "Ativo" -> MangaState.ONGOING - else -> null - }, - tags = doc.tableValue("Gênero(s)")?.select("a")?.mapToSet { - it.toMangaTag() - } ?: manga.tags, - isNsfw = doc.selectFirst(".alert-danger")?.html()?.contains("18 anos") == true, - chapters = doc.select("div.row.capitulos").mapChapters(reversed = true) { i, div -> - val a = div.selectFirstOrThrow("a") - val href = a.attrAsRelativeUrl("href") - val title = a.text() - MangaChapter( - id = generateUid(href), - name = title, - number = i + 1, - url = href, - scanlator = div.selectLast("a")?.text()?.takeUnless { it == title }, - uploadDate = dateFormat.tryParse( - a.nextElementSibling()?.text()?.removeSurrounding("(", ")"), - ), - branch = null, - source = source, - ) - }, - ) - } - - override suspend fun getPages(chapter: MangaChapter): List { - val fullUrl = chapter.url.toAbsoluteUrl(domain) - val doc = webClient.httpGet(fullUrl).parseHtml() - return doc.body().selectOrThrow("img[pag]").mapNotNull { img -> - val href = img.attrAsRelativeUrl("src") - if (href.startsWith("/images/banner")) { - return@mapNotNull null - } - MangaPage( - id = generateUid(href), - url = href, - preview = null, - source = source, - ) - } - } - - override suspend fun getTags(): Set { - val doc = webClient.httpGet(urlBuilder().addPathSegment("lista-mangas").build()).parseHtml() - val ul = doc.body().selectFirstOrThrow(".nav-tabs").selectFirstOrThrow("ul.dropdown-menu") - return ul.select("li").mapToSet { li -> - li.selectFirstOrThrow("a").toMangaTag() - } - } - - private suspend fun search(query: String): List { - val domain = domain - val json = webClient.httpGet( - urlBuilder() - .addPathSegments("assets/busca.php") - .addQueryParameter("nomeManga", query) - .build(), - ).parseJson() - return json.getJSONArray("items").mapJSON { jo -> - val href = "/perfil/" + jo.getString("url") - Manga( - id = generateUid(href), - url = href, - publicUrl = href.toAbsoluteUrl(domain), - title = jo.getString("titulo"), - rating = RATING_UNKNOWN, - tags = emptySet(), - author = jo.getStringOrNull("autor"), - coverUrl = jo.getString("imagem"), - state = null, - isNsfw = false, - altTitle = null, - source = source, - ) - } - } - - private fun Element.tableValue(title: String): Element? { - return select("h4.media-heading") - .find { it.selectFirst("label.subtit-manga")?.text()?.contains(title, ignoreCase = true) == true } - } - - private fun Element.toMangaTag() = MangaTag( - title = text().toTitleCase(sourceLocale), - key = attr("href").removeSuffix('/').substringAfterLast('/'), - source = source, - ) -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/DesuMeParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/DesuMeParser.kt index 2b1e1efe..d66ee955 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/DesuMeParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/DesuMeParser.kt @@ -15,7 +15,7 @@ import org.koitharu.kotatsu.parsers.util.json.mapJSONIndexed import org.koitharu.kotatsu.parsers.util.json.mapJSONToSet import java.util.* -@MangaSourceParser("DESUME", "Desu.me", "ru") +@MangaSourceParser("DESUME", "Desu .Me", "ru") internal class DesuMeParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.DESUME, 20) { override val configKeyDomain = ConfigKey.Domain("desu.me", "desu.win") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/NudeMoonParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/NudeMoonParser.kt index 1ced83d8..56c16df1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/NudeMoonParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/NudeMoonParser.kt @@ -11,8 +11,6 @@ import org.koitharu.kotatsu.parsers.util.* import java.text.SimpleDateFormat import java.util.* -private const val MAX_THUMB_INDEX = 19 - @MangaSourceParser("NUDEMOON", "Nude-Moon", "ru", type = ContentType.HENTAI) internal class NudeMoonParser( context: MangaLoaderContext, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/RemangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/RemangaParser.kt index dee37f30..eafb7862 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/RemangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/RemangaParser.kt @@ -24,7 +24,7 @@ private const val PAGE_SIZE = 30 private const val STATUS_ONGOING = 1 private const val STATUS_FINISHED = 0 -@MangaSourceParser("REMANGA", "Remanga", "ru") +@MangaSourceParser("REMANGA", "Re Manga", "ru") internal class RemangaParser( context: MangaLoaderContext, ) : PagedMangaParser(context, MangaSource.REMANGA, PAGE_SIZE), MangaParserAuthProvider { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/ReadmangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/ReadmangaParser.kt index 473f8b2a..1e895a59 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/ReadmangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/ReadmangaParser.kt @@ -5,7 +5,7 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.MangaSource -@MangaSourceParser("READMANGA_RU", "ReadManga", "ru") +@MangaSourceParser("READMANGA_RU", "Read Manga", "ru") internal class ReadmangaParser( context: MangaLoaderContext, ) : GroupleParser(context, MangaSource.READMANGA_RU, 1) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/SelfMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/SelfMangaParser.kt index a37884bd..d1ea7bb2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/SelfMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/SelfMangaParser.kt @@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaSource -@MangaSourceParser("SELFMANGA", "SelfManga", "ru", type = ContentType.OTHER) +@MangaSourceParser("SELFMANGA", "Self Manga", "ru", type = ContentType.OTHER) internal class SelfMangaParser( context: MangaLoaderContext, ) : GroupleParser(context, MangaSource.SELFMANGA, 3) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/rulib/YaoiLibParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/rulib/YaoiLibParser.kt index 68c13efc..2cace15c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/rulib/YaoiLibParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/rulib/YaoiLibParser.kt @@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.MangaSource -@MangaSourceParser("YAOILIB", "YaoiLib", "ru") +@MangaSourceParser("YAOILIB", "Yaoi Lib", "ru") internal class YaoiLibParser(context: MangaLoaderContext) : MangaLibParser(context, MangaSource.YAOILIB) { override val configKeyDomain = ConfigKey.Domain("yaoilib.me") override fun isNsfw(doc: Document) = true diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/sinmh/SinmhParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/sinmh/SinmhParser.kt index 6f3499f1..09329295 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/sinmh/SinmhParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/sinmh/SinmhParser.kt @@ -122,7 +122,7 @@ internal abstract class SinmhParser( val doc = webClient.httpGet(fullUrl).parseHtml() val body = doc.body() - val chapters = getChapters(manga, doc) + val chapters = getChapters(doc) val desc = body.selectFirst(selectDesc)?.html() @@ -150,7 +150,7 @@ internal abstract class SinmhParser( protected open val selectChapter = "ul#chapter-list-1 li" - protected open suspend fun getChapters(manga: Manga, doc: Document): List { + protected open suspend fun getChapters(doc: Document): List { return doc.body().select(selectChapter).mapChapters { i, li -> val href = li.selectFirstOrThrow("a").attrAsRelativeUrl("href") val name = li.selectFirstOrThrow("a").text() diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/HentaiUkrParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/HentaiUkrParser.kt index 133d2e00..126718fa 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/HentaiUkrParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/HentaiUkrParser.kt @@ -79,14 +79,14 @@ class HentaiUkrParser(context: MangaLoaderContext) : MangaParser(context, MangaS val ids = tags.mapToSet { it.key } json.retainAll { item -> item.getJSONArray("tags") - .mapJSON { it.getAsString("id") } + .mapJSON { it.getAsString() } .any { x -> x in ids } } } // Return to app return json.drop(offset).take(PAGE_SIZE).map { jo -> - val id = jo.getAsLong("id") + val id = jo.getAsLong() Manga( id = generateUid(id), title = jo.getString("name"), @@ -124,7 +124,7 @@ class HentaiUkrParser(context: MangaLoaderContext) : MangaParser(context, MangaS x.getJSONArray("tags").mapJSON { t -> MangaTag( title = t.getString("name"), - key = t.getAsString("id"), + key = t.getAsString(), source = source, ) } @@ -138,7 +138,7 @@ class HentaiUkrParser(context: MangaLoaderContext) : MangaParser(context, MangaS tagsSet.add( MangaTag( title = item.getString("name"), - key = item.getAsString("id"), + key = item.getAsString(), source = source, ), ) @@ -157,8 +157,8 @@ class HentaiUkrParser(context: MangaLoaderContext) : MangaParser(context, MangaS return chain.proceed(newRequest) } - private fun JSONObject.getAsLong(name: String): Long { - val rawValue = opt(name) + private fun JSONObject.getAsLong(): Long { + val rawValue = opt("id") return when (rawValue) { null, JSONObject.NULL -> null is Long -> rawValue @@ -168,7 +168,7 @@ class HentaiUkrParser(context: MangaLoaderContext) : MangaParser(context, MangaS } ?: error("Cannot read value $rawValue as Long") } - private fun JSONObject.getAsString(name: String): String { - return get(name).toString() + private fun JSONObject.getAsString(): String { + return get("id").toString() } } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/MangaInUaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/MangaInUaParser.kt index 2e575665..60468af6 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/MangaInUaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/MangaInUaParser.kt @@ -34,7 +34,7 @@ class MangaInUaParser(context: MangaLoaderContext) : PagedMangaParser( sortOrder: SortOrder, ): List { val url = when { - !query.isNullOrEmpty() -> ("/index.php?do=search" + "&subaction=search" + "&search_start=$page" + "&full_search=1" + "&story=$query" + "&titleonly=3").toAbsoluteUrl( + !query.isNullOrEmpty() -> ("/index.php?do=search&subaction=search&search_start=$page&full_search=1&story=$query&titleonly=3").toAbsoluteUrl( domain, ) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt index a5059ab5..9f04e577 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt @@ -56,7 +56,7 @@ class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSo val infoEl = infoElDeferred.await() val stateDoc = stateDocDeferred.await() manga.copy( - altTitle = infoEl.infoText("Tên Khác:"), + altTitle = infoEl.selectFirst("span.info:contains(Tên Khác:)")?.parent()?.select("span:not(.info) > a")?.joinToString { it.text() }, author = infoEl.select("p:contains(Tác giả:) a").text(), description = infoEl.select("p:contains(Nội dung:) + p").html(), tags = tagCache.tryGet().getOrNull()?.let { tagMap -> @@ -173,8 +173,8 @@ class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSo return docs.selectFirstOrThrow("div.main").selectFirstOrThrow("div.block-item").select("ul > li.item") .map { el -> - val relativeUrl = el.selectFirstOrThrow("div.box-cover-2 > a").attrAsRelativeUrl("href") - val descriptionsEl = el.selectFirstOrThrow("div.box-description-2") + val relativeUrl = el.selectFirstOrThrow("div.box-cover > a").attrAsRelativeUrl("href") + val descriptionsEl = el.selectFirstOrThrow("div.box-description") Manga( id = generateUid(relativeUrl), title = descriptionsEl.selectFirst("a")?.text().orEmpty(), @@ -183,7 +183,7 @@ class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSo publicUrl = relativeUrl.toAbsoluteUrl(domain), rating = RATING_UNKNOWN, isNsfw = true, - coverUrl = el.selectFirst("div.box-cover-2 img")?.src().orEmpty(), + coverUrl = el.selectFirst("div.box-cover img")?.src().orEmpty(), tags = emptySet(), state = null, author = null, @@ -239,8 +239,5 @@ class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSo ) } } - - private fun Element.infoText(title: String) = - selectFirst("span.info:contains($title)")?.parent()?.select("span:not(.info) > a")?.joinToString { it.text() } } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/YurinekoParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/YurinekoParser.kt index a7d390ad..2b62d2c2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/YurinekoParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/YurinekoParser.kt @@ -33,7 +33,7 @@ import java.text.SimpleDateFormat import java.util.EnumSet import java.util.Locale -@MangaSourceParser("YURINEKO", "Yurineko", "vi", ContentType.HENTAI) +@MangaSourceParser("YURINEKO", "Yuri Neko", "vi", ContentType.HENTAI) class YurinekoParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.YURINEKO, 20) { override val configKeyDomain: ConfigKey.Domain get() = ConfigKey.Domain("yurineko.net") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/wpcomics/WpComicsParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/wpcomics/WpComicsParser.kt index cbf902aa..6906942d 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/wpcomics/WpComicsParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/wpcomics/WpComicsParser.kt @@ -126,7 +126,7 @@ internal abstract class WpComicsParser( val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.selectFirstOrThrow(selectDesc).html() @@ -162,7 +162,7 @@ internal abstract class WpComicsParser( protected open val selectDate = "div.col-xs-4" protected open val selectChapter = "div#nt_listchapter li:not(.heading)" - protected open suspend fun getChapters(manga: Manga, doc: Document): List { + protected open suspend fun getChapters(doc: Document): List { return doc.body().select(selectChapter).mapChapters(reversed = true) { i, li -> val a = li.selectFirstOrThrow("a") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/ZMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/ZMangaParser.kt index bbe8e178..ec1aa9c2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/ZMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/ZMangaParser.kt @@ -140,7 +140,7 @@ internal abstract class ZMangaParser( val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() - val chaptersDeferred = async { getChapters(manga, doc) } + val chaptersDeferred = async { getChapters(doc) } val desc = doc.selectFirstOrThrow(selectDesc).html() @@ -179,7 +179,7 @@ internal abstract class ZMangaParser( protected open val selectDate = "span.date" protected open val selectChapter = "ul.series-chapterlist li" - protected open suspend fun getChapters(manga: Manga, doc: Document): List { + protected open suspend fun getChapters(doc: Document): List { val dateFormat = SimpleDateFormat(datePattern, sourceLocale) return doc.body().select(selectChapter).mapChapters(reversed = true) { i, li -> val a = li.selectFirstOrThrow("a") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/id/KomikIndoInfo.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/id/KomikIndoInfo.kt index 1268a15d..f6797531 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/id/KomikIndoInfo.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/id/KomikIndoInfo.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.zmanga.ZMangaParser -@MangaSourceParser("KOMIKINDO_INFO", "KomikIndo .Info", "id", ContentType.HENTAI) +@MangaSourceParser("KOMIKINDO_INFO", "Komik Indo .Info", "id", ContentType.HENTAI) internal class KomikIndoInfo(context: MangaLoaderContext) : ZMangaParser(context, MangaSource.KOMIKINDO_INFO, "komikindo.info") { override val datePattern = "dd MMM yyyy" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/id/MaidId.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/id/MaidId.kt index d3348fde..4a7e01b7 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/id/MaidId.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/id/MaidId.kt @@ -3,7 +3,6 @@ package org.koitharu.kotatsu.parsers.site.zmanga.id import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.zmanga.ZMangaParser @@ -18,7 +17,7 @@ import java.text.SimpleDateFormat internal class MaidId(context: MangaLoaderContext) : ZMangaParser(context, MangaSource.MAID_ID, "www.maid.my.id") { - override suspend fun getChapters(manga: Manga, doc: Document): List { + override suspend fun getChapters(doc: Document): List { val dateFormat = SimpleDateFormat(datePattern, sourceLocale) return doc.body().select(selectChapter).mapChapters(reversed = true) { i, li -> val a = li.selectFirstOrThrow("a") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/id/ShiroDoujin.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/id/ShiroDoujin.kt index d12c64da..56f0a3f2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/id/ShiroDoujin.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/id/ShiroDoujin.kt @@ -4,7 +4,6 @@ import org.jsoup.nodes.Document 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.Manga import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.zmanga.ZMangaParser @@ -18,7 +17,7 @@ import java.text.SimpleDateFormat internal class ShiroDoujin(context: MangaLoaderContext) : ZMangaParser(context, MangaSource.SHIRO_DOUJIN, "shirodoujin.com") { - override suspend fun getChapters(manga: Manga, doc: Document): List { + override suspend fun getChapters(doc: Document): List { val dateFormat = SimpleDateFormat(datePattern, sourceLocale) return doc.body().select(selectChapter).mapChapters(reversed = true) { i, li -> val a = li.selectFirstOrThrow("a")