diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineMangaParser.kt index 89622b8b..eaa2adbb 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineMangaParser.kt @@ -162,7 +162,7 @@ internal abstract class NineMangaParser( return getOrCreateTagMap().values.toSet() } - protected suspend fun getOrCreateTagMap(): Map = mutex.withLock { + private suspend fun getOrCreateTagMap(): Map = mutex.withLock { tagCache?.let { return@withLock it } val tagMap = ArrayMap() val tagElements = webClient.httpGet("https://${domain}/search/?type=high").parseHtml().select("li.cate_list") 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 a533f25e..02783a9c 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 @@ -135,7 +135,7 @@ internal abstract class FmreaderParser( val fullUrl = manga.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() val chaptersDeferred = async { getChapters(doc) } - val desc = doc.selectFirstOrThrow(selectDesc).html() + val desc = doc.selectFirst(selectDesc)?.html() val stateDiv = doc.selectFirst(selectState) val state = stateDiv?.let { when (it.text()) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/LikeManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/LikeMangaParser.kt similarity index 95% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/LikeManga.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/LikeMangaParser.kt index 8c349aef..a6884cfb 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/LikeManga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/LikeMangaParser.kt @@ -1,11 +1,10 @@ -package org.koitharu.kotatsu.parsers.site.en +package org.koitharu.kotatsu.parsers.site.likemanga import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll import kotlinx.coroutines.coroutineScope 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.* @@ -14,11 +13,15 @@ import java.text.DateFormat import java.text.SimpleDateFormat import java.util.* -@MangaSourceParser("LIKEMANGA", "LikeManga", "en") -internal class LikeManga(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.LIKEMANGA, 36) { +internal abstract class LikeMangaParser( + context: MangaLoaderContext, + source: MangaSource, + domain: String, + pageSize: Int = 36, +) : PagedMangaParser(context, source, pageSize) { override val sortOrders: Set = EnumSet.of(SortOrder.UPDATED, SortOrder.POPULARITY, SortOrder.NEWEST) - override val configKeyDomain = ConfigKey.Domain("likemanga.io") + override val configKeyDomain = ConfigKey.Domain(domain) override suspend fun getListPage( page: Int, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/en/LikeManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/en/LikeManga.kt new file mode 100644 index 00000000..e47ebce9 --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/en/LikeManga.kt @@ -0,0 +1,10 @@ +package org.koitharu.kotatsu.parsers.site.likemanga.en + +import org.koitharu.kotatsu.parsers.MangaLoaderContext +import org.koitharu.kotatsu.parsers.MangaSourceParser +import org.koitharu.kotatsu.parsers.model.* +import org.koitharu.kotatsu.parsers.site.likemanga.LikeMangaParser + +@MangaSourceParser("LIKEMANGA", "LikeManga", "en") +internal class LikeManga(context: MangaLoaderContext) : + LikeMangaParser(context, MangaSource.LIKEMANGA, "likemanga.io") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/en/ZinManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/en/ZinManga.kt new file mode 100644 index 00000000..8b91274d --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/en/ZinManga.kt @@ -0,0 +1,10 @@ +package org.koitharu.kotatsu.parsers.site.likemanga.en + +import org.koitharu.kotatsu.parsers.MangaLoaderContext +import org.koitharu.kotatsu.parsers.MangaSourceParser +import org.koitharu.kotatsu.parsers.model.* +import org.koitharu.kotatsu.parsers.site.likemanga.LikeMangaParser + +@MangaSourceParser("ZINMANGA_IO", "ZinManga.io", "en") +internal class ZinManga(context: MangaLoaderContext) : + LikeMangaParser(context, MangaSource.ZINMANGA_IO, "zinmanga.io") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/AquaManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/AquaManga.kt index 23eb0030..ec2fc243 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/AquaManga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/AquaManga.kt @@ -6,7 +6,5 @@ import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("AQUAMANGA", "AquaManga", "en") -internal class AquaManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.AQUAMANGA, "aquamanga.com") { - override val datePattern = "MMMM dd, yyyy" - override val withoutAjax = true -} +internal class AquaManga(context: MangaLoaderContext) : + MadaraParser(context, MangaSource.AQUAMANGA, "aquamanga.org", 20) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Astrallibrary.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Astrallibrary.kt deleted file mode 100644 index db2386a2..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Astrallibrary.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("ASTRALLIBRARY", "AstralLibrary", "en") -internal class Astrallibrary(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.ASTRALLIBRARY, "astrallibrary.net", 18) { - override val datePattern = "dd MMM" - override val postReq = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/BlogManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/BlogManga.kt deleted file mode 100644 index 81ac8854..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/BlogManga.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("BLOG_MANGA", "BlogManga", "en") -internal class BlogManga(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.BLOG_MANGA, "blogmanga.net") { - override val postReq = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/CoffeeMangaTop.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/CoffeeMangaTop.kt deleted file mode 100644 index 14a1a4ce..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/CoffeeMangaTop.kt +++ /dev/null @@ -1,143 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.en - -import org.jsoup.nodes.Document -import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.model.* -import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -import org.koitharu.kotatsu.parsers.util.* -import java.text.SimpleDateFormat -import java.util.* - -@MangaSourceParser("COFFEE_MANGA_TOP", "CoffeeManga.top", "en") -internal class CoffeeMangaTop(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.COFFEE_MANGA_TOP, "coffeemanga.top") { - override val tagPrefix = "mangas/" - override val listUrl = "latest-manga/" - override val datePattern = "MMMM d, HH:mm" - - override val sortOrders: Set = EnumSet.of( - SortOrder.POPULARITY, - SortOrder.UPDATED, - ) - - override suspend fun getListPage( - page: Int, - query: String?, - tags: Set?, - sortOrder: SortOrder, - ): List { - val tag = tags.oneOrThrowIfMany() - val url = buildString { - append("https://") - append(domain) - val pages = page + 1 - - when { - !query.isNullOrEmpty() -> { - - append("/?search=") - append(query.urlEncoded()) - append("&page=") - append(pages.toString()) - append("&post_type=wp-manga") - } - - !tags.isNullOrEmpty() -> { - append("/mangas/") - append(tag?.key.orEmpty()) - append("?orderby=2&page=") - append(pages.toString()) - - } - - else -> { - - if (sortOrder == SortOrder.POPULARITY) { - append("/popular-manga") - } - if (sortOrder == SortOrder.UPDATED) { - append("/latest-manga") - } - append("?page=") - append(pages.toString()) - } - } - } - val doc = webClient.httpGet(url).parseHtml() - return doc.select("div.row.c-tabs-item__content").ifEmpty { - doc.select("div.page-item-detail.manga") - }.map { div -> - val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href") - val summary = div.selectFirst(".tab-summary") ?: div.selectFirst(".item-summary") - Manga( - id = generateUid(href), - url = href, - publicUrl = href.toAbsoluteUrl(div.host ?: domain), - coverUrl = div.selectFirst("img")?.src().orEmpty(), - title = (summary?.selectFirst("h3") ?: summary?.selectFirst("h4"))?.text().orEmpty(), - altTitle = null, - rating = div.selectFirst("span.total_votes")?.ownText()?.toFloatOrNull()?.div(5f) ?: -1f, - tags = summary?.selectFirst(".mg_genres")?.select("a")?.mapNotNullToSet { a -> - MangaTag( - key = a.attr("href").removeSuffix('/').substringAfterLast('/'), - title = a.text().ifEmpty { return@mapNotNullToSet null }.toTitleCase(), - source = source, - ) - }.orEmpty(), - author = summary?.selectFirst(".mg_author")?.selectFirst("a")?.ownText(), - state = when (summary?.selectFirst(".mg_status")?.selectFirst(".summary-content")?.ownText()?.trim() - ?.lowercase()) { - "Ongoing" -> MangaState.ONGOING - "Completed " -> MangaState.FINISHED - else -> null - }, - source = source, - isNsfw = isNsfwSource, - ) - } - } - - override suspend fun loadChapters(mangaUrl: String, document: Document): List { - - - val mangaId = document.select("div[id^=manga-chapters-holder]").attr("data-id") - - val doc = webClient.httpGet("https://$domain/ajax-list-chapter?mangaID=$mangaId").parseHtml() - - val dateFormat = SimpleDateFormat(datePattern, sourceLocale) - - return doc.select(selectChapter).mapChapters(reversed = true) { i, li -> - val a = li.selectFirst("a") - val href = a?.attrAsRelativeUrlOrNull("href") ?: li.parseFailed("Link is missing") - val link = href + stylePage - MangaChapter( - id = generateUid(href), - url = link, - name = a.ownText(), - number = i + 1, - branch = null, - uploadDate = parseChapterDate( - dateFormat, - li.selectFirst(selectDate)?.text(), - ), - scanlator = null, - source = source, - ) - } - } - - override suspend fun getPages(chapter: MangaChapter): List { - val fullUrl = chapter.url.toAbsoluteUrl(domain) - val doc = webClient.httpGet(fullUrl).parseHtml() - val urlarray = doc.select("p#arraydata").text().split(',').toTypedArray() - return urlarray.map { url -> - MangaPage( - id = generateUid(url), - url = url, - preview = null, - source = source, - ) - } - } -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ComicScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ComicScans.kt deleted file mode 100644 index 79daea5d..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ComicScans.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("COMICSCANS", "ComicScans", "en") -internal class ComicScans(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.COMICSCANS, "www.comicscans.org") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/GlManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/GlManga.kt deleted file mode 100644 index c0270c6b..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/GlManga.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("GLMANGA", "GlManga", "en") -internal class GlManga(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.GLMANGA, "glmanga.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/GourmetScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/GourmetScans.kt index dc4cd34c..8d5a2ef1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/GourmetScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/GourmetScans.kt @@ -7,7 +7,7 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("GOURMETSCANS", "GourmetScans", "en") internal class GourmetScans(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.GOURMETSCANS, "gourmetscans.net") { + MadaraParser(context, MangaSource.GOURMETSCANS, "gourmetsupremacy.com") { override val listUrl = "project/" override val tagPrefix = "genre/" override val stylePage = "" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/LadyManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/LadyManga.kt deleted file mode 100644 index 26145daa..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/LadyManga.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("LADYMANGA", "LadyManga", "en") -internal class LadyManga(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.LADYMANGA, "ladymanga.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manga247.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manga247.kt deleted file mode 100644 index 0e0a280f..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manga247.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGA_247", "247MANGA", "en") -internal class Manga247(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGA_247, "247manga.com") { - override val tagPrefix = "manhwa-genre/" - override val datePattern = "MMMM dd, yyyy" - override val withoutAjax = true - override val listUrl = "manhwa/" -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaClashTv.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaClashTv.kt deleted file mode 100644 index 878ddf24..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaClashTv.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGACLASH_TV", "MangaClash.tv", "en") -internal class MangaClashTv(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGACLASH_TV, "mangaclash.tv", pageSize = 10) { - override val datePattern = "MM/dd/yyyy" - override val postReq = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaDinoTop.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaDinoTop.kt deleted file mode 100644 index 5185bf59..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaDinoTop.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGADINOTOP", "MangaDino", "en") -internal class MangaDinoTop(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGADINOTOP, "mangadino.top", 10) { - override val postReq = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaFast.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaFast.kt deleted file mode 100644 index 540ac901..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaFast.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGAFAST", "MangaFast", "en") -internal class MangaFast(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGAFAST, "manga-fast.com") { - override val datePattern = "d MMMM، yyyy" -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaGreat.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaGreat.kt deleted file mode 100644 index 6917c62b..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaGreat.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGAGREAT", "MangaGreat", "en") -internal class MangaGreat(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGAGREAT, "mangagreat.org") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaKik.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaKik.kt deleted file mode 100644 index 9ebba7d1..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaKik.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGAKIK", "MangaKik", "en") -internal class MangaKik(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGAKIK, "mangakik.biz", 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaKing.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaKing.kt deleted file mode 100644 index 8035243b..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaKing.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGAKING", "MangaKing", "en") -internal class MangaKing(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGAKING, "mangaking.net") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaKitsu.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaKitsu.kt deleted file mode 100644 index a7b51b30..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaKitsu.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGAKITSU", "MangaKitsu", "en") -internal class MangaKitsu(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGAKITSU, "mangakitsu.com", 20) 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 a38aebb4..97efac87 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 @@ -2,12 +2,9 @@ package org.koitharu.kotatsu.parsers.site.madara.en import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("MANGAOWLBLOG", "MangaOwl.blog", "en", ContentType.HENTAI) +@MangaSourceParser("MANGAOWLBLOG", "MangaOwlnet.com", "en") internal class MangaOwlBlog(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGAOWLBLOG, "mangaowl.blog", 20) { - override val postReq = true -} + MadaraParser(context, MangaSource.MANGAOWLBLOG, "mangaowlnet.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaRawInfo.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaRawInfo.kt deleted file mode 100644 index 6243202f..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaRawInfo.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGARAWINFO", "Manga-Raw.info", "en") -internal class MangaRawInfo(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGARAWINFO, "manga-raw.info", 20) { - override val postReq = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaRockTeam.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaRockTeam.kt index ff51107b..249195c9 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaRockTeam.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaRockTeam.kt @@ -7,4 +7,4 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("MANGAROCKTEAM", "MangaRock.team", "en") internal class MangaRockTeam(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGAROCKTEAM, "mangarock.team", 18) + MadaraParser(context, MangaSource.MANGAROCKTEAM, "mangarockteam.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaRocky.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaRocky.kt deleted file mode 100644 index 9380bd47..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaRocky.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGAROCKY", "MangaRocky", "en") -internal class MangaRocky(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGAROCKY, "mangarocky.com") { - override val postReq = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaUpdatesTop.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaUpdatesTop.kt deleted file mode 100644 index f491f242..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaUpdatesTop.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGAUPDATESTOP", "MangaUpdates.top", "en") -internal class MangaUpdatesTop(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGAUPDATESTOP, "mangaupdates.top", 10) { - override val postReq = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaVisa.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaVisa.kt deleted file mode 100644 index d9eae8d2..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaVisa.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGAVISA", "MangaVisa", "en") -internal class MangaVisa(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGAVISA, "mangavisa.com") { - override val withoutAjax = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Mangax1.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Mangax1.kt deleted file mode 100644 index 0a1e6826..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Mangax1.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANGAX1", "MangaX1", "en") -internal class Mangax1(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGAX1, "mangax1.com") { - override val postReq = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhuaManhwaOnline.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhuaManhwaOnline.kt deleted file mode 100644 index 532081d9..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhuaManhwaOnline.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANHUAMANHWAONLINE", "ManhuaManhwa.online", "en") -internal class ManhuaManhwaOnline(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANHUAMANHWAONLINE, "manhuamanhwa.online", 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhuaScanInfo.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhuaScanInfo.kt deleted file mode 100644 index 64b7e43d..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhuaScanInfo.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANHUASCANINFO", "ManhuaScan.info", "en") -internal class ManhuaScanInfo(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANHUASCANINFO, "manhuascan.info", 10) { - override val postReq = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhwaKool.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhwaKool.kt deleted file mode 100644 index 9dd6d33a..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhwaKool.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANHWAKOOL", "ManhwaKool", "en") -internal class ManhwaKool(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANHWAKOOL, "manhwakool.com", pageSize = 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhwaWorld.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhwaWorld.kt deleted file mode 100644 index 868f78ec..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhwaWorld.kt +++ /dev/null @@ -1,11 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANHWAWORLD", "ManhwaWorld", "en") -internal class ManhwaWorld(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANHWAWORLD, "manhwaworld.com") - diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwas.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwas.kt deleted file mode 100644 index 7e6e8292..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhwas.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("MANHWAS", "FreeManhwa", "en") -internal class Manhwas(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANHWAS, "manhwas.com") 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 deleted file mode 100644 index fb7629ec..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Painfulnightz.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@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/Sawamics.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Sawamics.kt deleted file mode 100644 index 730f1f46..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Sawamics.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("SAWAMICS", "Sawamics", "en") -internal class Sawamics(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.SAWAMICS, "sawamics.com", 10) 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 a39521d9..310ed409 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,8 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -@MangaSourceParser("STKISSMANGABLOG", "1stKissManga.blog", "en") +@MangaSourceParser("STKISSMANGABLOG", "1StKissManga.net", "en") internal class StkissMangaBlog(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.STKISSMANGABLOG, "1stkissmanga.blog", 10) { - override val postReq = true -} + MadaraParser(context, MangaSource.STKISSMANGABLOG, "1st-kissmanga.net", 20) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Wakamics.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Wakamics.kt deleted file mode 100644 index e4944590..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Wakamics.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("WAKAMICS", "Wakamics", "en") -internal class Wakamics(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.WAKAMICS, "wakamics.net", 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/WebComic.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/WebComic.kt deleted file mode 100644 index 778c4512..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/WebComic.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("WEBCOMIC", "WebComic", "en") -internal class WebComic(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.WEBCOMIC, "webcomic.me") { - override val postReq = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/WebtoonCity.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/WebtoonCity.kt deleted file mode 100644 index b4b80097..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/WebtoonCity.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("WEBTOONCITY", "WebtoonCity", "en") -internal class WebtoonCity(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.WEBTOONCITY, "webtooncity.com", 20) { - override val listUrl = "webtoon/" - override val tagPrefix = "webtoon-genre/" -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Webtoons.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Webtoons.kt deleted file mode 100644 index 97186c61..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Webtoons.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.en - -import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.model.ContentType -import org.koitharu.kotatsu.parsers.model.MangaSource -import org.koitharu.kotatsu.parsers.site.madara.MadaraParser - -@MangaSourceParser("WEBTOONS", "Webtoons", "en", ContentType.HENTAI) -internal class Webtoons(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.WEBTOONS, "webtoons.top", 20) { - override val listUrl = "read/" - override val postReq = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ZinMangaTop.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ZinMangaTop.kt deleted file mode 100644 index 843cad51..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ZinMangaTop.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("ZINMANGA_TOP", "ZinManga.top", "en") -internal class ZinMangaTop(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.ZINMANGA_TOP, "zinmanga.top", 20) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Zinmanga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Zinmanga.kt index c46460f3..352a7353 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Zinmanga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Zinmanga.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("ZINMANGA", "ZinManga", "en") +@MangaSourceParser("ZINMANGA", "ZinManga.com", "en") internal class Zinmanga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.ZINMANGA, "zinmanga.com") { override val datePattern = "MM/dd/yyyy" } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Zinmanhwa.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Zinmanhwa.kt deleted file mode 100644 index 2ff34b6a..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Zinmanhwa.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("ZINMANHWA", "ZinManhwa", "en") -internal class Zinmanhwa(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.ZINMANHWA, "zinmanhwa.com") { - override val datePattern = "dd/MM/yyyy" -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ZuttoManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ZuttoManga.kt deleted file mode 100644 index 3b06454a..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ZuttoManga.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.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.madara.MadaraParser - -@MangaSourceParser("ZUTTOMANGA", "ZuttoManga", "en") -internal class ZuttoManga(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.ZUTTOMANGA, "zuttomanga.com") { - override val postReq = true -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Eromiau.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Eromiau.kt deleted file mode 100644 index e76014b3..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/Eromiau.kt +++ /dev/null @@ -1,11 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.es - -import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.model.ContentType -import org.koitharu.kotatsu.parsers.model.MangaSource -import org.koitharu.kotatsu.parsers.site.madara.MadaraParser - -@MangaSourceParser("EROMIAU", "Eromiau", "es", ContentType.HENTAI) -internal class Eromiau(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.EROMIAU, "www.eromiau.com", 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/GanzoScan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/GanzoScan.kt deleted file mode 100644 index 139ed356..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/GanzoScan.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.es - -import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.model.MangaSource -import org.koitharu.kotatsu.parsers.site.madara.MadaraParser - -@MangaSourceParser("GANZOSCAN", "GanzoScan", "es") -internal class GanzoScan(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.GANZOSCAN, "ganzoscan.com") { - override val datePattern: String = "dd 'de' MMMMM 'de' yyyy" -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/HerenScan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/HerenScan.kt index 9135ae1a..539f96b1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/HerenScan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/HerenScan.kt @@ -8,5 +8,5 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("HERENSCAN", "HerenScan", "es") internal class HerenScan(context: MangaLoaderContext) : MadaraParser(context, MangaSource.HERENSCAN, "herenscan.com") { - override val datePattern = "d 'de' MMMMM 'de' yyyy" + override val datePattern = "dd/MM/yyyy" } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/MangaReaderpro.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/MangaReaderpro.kt deleted file mode 100644 index 0b8ec25f..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/MangaReaderpro.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.es - -import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.model.MangaSource -import org.koitharu.kotatsu.parsers.site.madara.MadaraParser - -@MangaSourceParser("MANGAREADERPRO", "MangaReaderPro", "es") -internal class MangaReaderpro(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.MANGAREADERPRO, "mangareaderpro.com", 10) { - override val datePattern = "MM/dd/yyyy" -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/ManhwaEs.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/ManhwaEs.kt index 112d2910..9ecbdfaa 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/ManhwaEs.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/ManhwaEs.kt @@ -13,7 +13,7 @@ internal class ManhwaEs(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHWA_ES, "manhwa-es.com", 10) { override val withoutAjax = true - override val datePattern = "d 'de' MMMM" + override val datePattern = "MM/dd" override suspend fun getChapters(manga: Manga, doc: Document): List { val dateFormat = SimpleDateFormat(datePattern, sourceLocale) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/SamuraiScan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/SamuraiScan.kt index 3d9343b3..5e9a8be1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/SamuraiScan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/SamuraiScan.kt @@ -8,5 +8,5 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("SAMURAISCAN", "SamuraiScan", "es") internal class SamuraiScan(context: MangaLoaderContext) : MadaraParser(context, MangaSource.SAMURAISCAN, "samuraiscan.com", 10) { - override val datePattern = "dd/MM/yyyy" + override val listUrl = "leer/" } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/FrScan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/FrScan.kt index 09a09a3c..cd305497 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/FrScan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/fr/FrScan.kt @@ -7,4 +7,6 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("FRSCAN", "Fr-Scan", "fr") internal class FrScan(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.FRSCAN, "fr-scan.com") + MadaraParser(context, MangaSource.FRSCAN, "fr-scan.com") { + override val withoutAjax = true +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/id/GourmetScansId.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/id/GourmetScansId.kt deleted file mode 100644 index 1c62d02c..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/id/GourmetScansId.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.id - -import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.model.MangaSource -import org.koitharu.kotatsu.parsers.site.madara.MadaraParser - -@MangaSourceParser("GOURMETSCANS_ID", "IdGourmetScans", "id") -internal class GourmetScansId(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.GOURMETSCANS_ID, "id.gourmetscans.net") { - override val listUrl = "project/" - override val tagPrefix = "genre/" - override val stylePage = "" -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ja/HachiManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ja/HachiManga.kt deleted file mode 100644 index 658d681e..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ja/HachiManga.kt +++ /dev/null @@ -1,191 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.ja - -import kotlinx.coroutines.async -import kotlinx.coroutines.coroutineScope -import org.jsoup.nodes.Document -import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.exception.ParseException -import org.koitharu.kotatsu.parsers.model.* -import org.koitharu.kotatsu.parsers.site.madara.MadaraParser -import org.koitharu.kotatsu.parsers.util.* -import java.text.SimpleDateFormat -import java.util.* - -@MangaSourceParser("HACHIMANGA", "HachiManga", "ja") -internal class HachiManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.HACHIMANGA, "hachiraw.com") { - - override val datePattern = "MMMM dd, yyyy" - override val selectChapter = "li.a-h" - override val selectDate = "span.chapter-tim" - override val selectDesc = "div.dsct" - override val tagPrefix = "genre/" - - override val sortOrders: Set = EnumSet.of( - SortOrder.UPDATED, - SortOrder.POPULARITY, - SortOrder.NEWEST, - SortOrder.RATING, - ) - - override suspend fun getListPage( - page: Int, - query: String?, - tags: Set?, - sortOrder: SortOrder, - ): List { - val tag = tags.oneOrThrowIfMany() - val url = buildString { - append("https://") - append(domain) - val pages = page + 1 - - when { - !query.isNullOrEmpty() -> { - - append("/search/") - append(pages.toString()) - append("/?keyword=") - append(query.urlEncoded()) - } - - !tags.isNullOrEmpty() -> { - append("/$tagPrefix") - append(tag?.key.orEmpty()) - append("/") - append(pages.toString()) - append("/") - } - - else -> { - - if (sortOrder == SortOrder.POPULARITY) { - append("/top-bookmarked") - } - if (sortOrder == SortOrder.NEWEST) { - append("/new-manga") - } - if (sortOrder == SortOrder.RATING) { - append("/top-rating") - } - - if (sortOrder == SortOrder.UPDATED) { - append("/latest-updates") - } - append("/") - append(pages.toString()) - append("/") - } - } - } - val doc = webClient.httpGet(url).parseHtml() - return doc.select("div.manga-item").map { div -> - val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href") - val summary = div.selectFirst(".tab-summary") ?: div.selectFirst("div.data.wleft") - Manga( - id = generateUid(href), - url = href, - publicUrl = href.toAbsoluteUrl(div.host ?: domain), - coverUrl = div.selectFirst("img")?.src().orEmpty(), - title = (summary?.selectFirst("h3") ?: summary?.selectFirst("h4"))?.text().orEmpty(), - altTitle = null, - rating = div.selectFirst("span.total_votes")?.ownText()?.toFloatOrNull()?.div(5f) ?: -1f, - tags = summary?.selectFirst(".mg_genres")?.select("a")?.mapNotNullToSet { a -> - MangaTag( - key = a.attr("href").removeSuffix('/').substringAfterLast('/'), - title = a.text().ifEmpty { return@mapNotNullToSet null }.toTitleCase(), - source = source, - ) - }.orEmpty(), - author = summary?.selectFirst(".mg_author")?.selectFirst("a")?.ownText(), - state = when (summary?.selectFirst(".mg_status")?.selectFirst(".summary-content")?.ownText()?.trim() - ?.lowercase()) { - "Ongoing" -> MangaState.ONGOING - "Completed " -> MangaState.FINISHED - else -> null - }, - source = source, - isNsfw = isNsfwSource, - ) - } - } - - override suspend fun getDetails(manga: Manga): Manga = coroutineScope { - val fullUrl = manga.url.toAbsoluteUrl(domain) - val doc = webClient.httpGet(fullUrl).parseHtml() - val body = doc.body() - - val chaptersDeferred = async { getChapters(manga, doc) } - - val desc = body.select(selectDesc).html() - - val stateDiv = (body.selectFirst("div.post-content_item:contains(状態)"))?.selectLast("div.summary-content") - - val state = stateDiv?.let { - when (it.text()) { - in ongoing -> MangaState.ONGOING - in finished -> MangaState.FINISHED - else -> null - } - } - - val alt = doc.body().select(".post-content_item:contains(代替名) .summary-content").firstOrNull()?.tableValue() - ?.text()?.trim() - - manga.copy( - tags = doc.body().select(selectGenre).mapNotNullToSet { a -> - MangaTag( - key = a.attr("href").removeSuffix("/").substringAfterLast('/'), - title = a.text().toTitleCase(), - source = source, - ) - }, - description = desc, - altTitle = alt, - state = state, - chapters = chaptersDeferred.await(), - ) - } - - override suspend fun getChapters(manga: Manga, doc: Document): List { - val root2 = doc.body().selectFirstOrThrow("div.manga-content") - val dateFormat = SimpleDateFormat(datePattern, sourceLocale) - return root2.select(selectChapter).mapChapters(reversed = true) { i, li -> - val a = li.selectFirst("a") - 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() - MangaChapter( - id = generateUid(href), - name = name, - number = i + 1, - url = link, - uploadDate = parseChapterDate( - dateFormat, - dateText, - ), - source = source, - scanlator = null, - branch = null, - ) - } - } - - override suspend fun getPages(chapter: MangaChapter): List { - val fullUrl = chapter.url.toAbsoluteUrl(domain) - val doc = webClient.httpGet(fullUrl).parseHtml() - val root = doc.body().selectFirst("div.chapter-pages") - ?: throw ParseException("Root not found", fullUrl) - return root.select("div.chapter-page").map { div -> - val img = div.selectFirst("img") ?: div.parseFailed("Page image not found") - val url = img.src()?.toRelativeUrl(domain) ?: div.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/madara/pt/AkiManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/AkiManga.kt deleted file mode 100644 index 721b5147..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/AkiManga.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.pt - -import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.model.MangaSource -import org.koitharu.kotatsu.parsers.site.madara.MadaraParser - -@MangaSourceParser("AKIMANGA", "AkiManga", "pt") -internal class AkiManga(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.AKIMANGA, "akimanga.com") { - override val datePattern = "dd/MM/yyyy" -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/DemonSect.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/DemonSect.kt index 165e248f..130471c0 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/DemonSect.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/DemonSect.kt @@ -7,6 +7,4 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("DEMONSECT", "DemonSect", "pt") internal class DemonSect(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.DEMONSECT, "demonsect.com.br", 10) { - override val datePattern = "MMM dd, yyyy" -} + MadaraParser(context, MangaSource.DEMONSECT, "demonsect.com.br", 10) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Taberu.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Taberu.kt deleted file mode 100644 index 121c8cbe..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/pt/Taberu.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.koitharu.kotatsu.parsers.site.madara.pt - -import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.model.MangaSource -import org.koitharu.kotatsu.parsers.site.madara.MadaraParser - -@MangaSourceParser("TABERU", "Taberu", "pt") -internal class Taberu(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.TABERU, "taberu.org", 10) { - override val datePattern: String = "dd/MM/yyyy" -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/th/Cat300.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/th/Cat300.kt index d48f7a89..72331a51 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/th/Cat300.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/th/Cat300.kt @@ -1,6 +1,5 @@ package org.koitharu.kotatsu.parsers.site.madara.th - import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.ContentType @@ -9,6 +8,6 @@ import org.koitharu.kotatsu.parsers.site.madara.MadaraParser @MangaSourceParser("CAT_300", "Cat300", "th", ContentType.HENTAI) internal class Cat300(context: MangaLoaderContext) : MadaraParser(context, MangaSource.CAT_300, "cat300.com") { - override val datePattern = "MMMM dd, yyyy" + override val withoutAjax = true } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Cizgiromanarsivi.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Cizgiromanarsivi.kt index bd3cff7d..fc91634e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Cizgiromanarsivi.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/Cizgiromanarsivi.kt @@ -11,5 +11,5 @@ internal class Cizgiromanarsivi(context: MangaLoaderContext) : override val stylePage = "" override val tagPrefix = "kategori/" override val listUrl = "seri/" - override val datePattern = "dd.MM.yyyy" + override val datePattern = "dd/MM/yyyy" } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/vi/Quaanhdaocuteo.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/vi/Quaanhdaocuteo.kt new file mode 100644 index 00000000..eff20ff1 --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/vi/Quaanhdaocuteo.kt @@ -0,0 +1,32 @@ +package org.koitharu.kotatsu.parsers.site.madara.vi + +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.MangaChapter +import org.koitharu.kotatsu.parsers.model.MangaPage +import org.koitharu.kotatsu.parsers.model.MangaSource +import org.koitharu.kotatsu.parsers.site.madara.MadaraParser +import org.koitharu.kotatsu.parsers.util.* + +@MangaSourceParser("QUAANHDAOCUTEO", "Quaanhdaocuteo", "vi", ContentType.HENTAI) +internal class Quaanhdaocuteo(context: MangaLoaderContext) : + MadaraParser(context, MangaSource.QUAANHDAOCUTEO, "quaanhdaocuteo.com") { + override val datePattern = "dd/MM/yyyy" + override val selectPage = "p img" + + override suspend fun getPages(chapter: MangaChapter): List { + val fullUrl = chapter.url.toAbsoluteUrl(domain) + val doc = webClient.httpGet(fullUrl).parseHtml() + val root = doc.body().selectFirstOrThrow(selectBodyPage) + return root.select(selectPage).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/mangareader/en/LynxScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/LynxScans.kt deleted file mode 100644 index 1cee5f75..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/en/LynxScans.kt +++ /dev/null @@ -1,12 +0,0 @@ -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("LYNXSCANS", "LynxScans", "en") -internal class LynxScans(context: MangaLoaderContext) : - MangaReaderParser(context, MangaSource.LYNXSCANS, "lynxscans.com", pageSize = 25, searchPageSize = 10) { - override val listUrl = "/comics" -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/MangaReaderpro.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/MangaReaderpro.kt new file mode 100644 index 00000000..38c28038 --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/MangaReaderpro.kt @@ -0,0 +1,13 @@ +package org.koitharu.kotatsu.parsers.site.mangareader.es + +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 +import java.util.Locale + +@MangaSourceParser("MANGAREADERPRO", "MangaReaderPro", "es") +internal class MangaReaderpro(context: MangaLoaderContext) : + MangaReaderParser(context, MangaSource.MANGAREADERPRO, "mangareaderpro.com", pageSize = 20, searchPageSize = 10) { + override val sourceLocale: Locale = Locale.ENGLISH +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/ReaperScansTr.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/ReaperScansTr.kt similarity index 54% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/ReaperScansTr.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/ReaperScansTr.kt index a5fa6eb9..298db15b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/tr/ReaperScansTr.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/tr/ReaperScansTr.kt @@ -1,12 +1,10 @@ -package org.koitharu.kotatsu.parsers.site.madara.tr +package org.koitharu.kotatsu.parsers.site.mangareader.tr import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource -import org.koitharu.kotatsu.parsers.site.madara.MadaraParser +import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser @MangaSourceParser("REAPERSCANSTR", "ReaperScansTr", "tr") internal class ReaperScansTr(context: MangaLoaderContext) : - MadaraParser(context, MangaSource.REAPERSCANSTR, "reaperscanstr.com", 5) { - override val listUrl = "seri/" -} + MangaReaderParser(context, MangaSource.REAPERSCANSTR, "reaperscans.com.tr", pageSize = 20, searchPageSize = 10)