KotatsuApp/kotatsu-parsers
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into experimental/abstract_sources

Browse Source
This commit is contained in:
Koitharu
2024-07-15 14:25:29 +03:00
parent f923acc5a7 426c7ad708
commit b06288e7eb
236 changed files with 1815 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/kotlin/org/koitharu/kotatsu/parsers/config/ConfigKey.kt
View File

@@ -29,4 +29,9 @@ sealed class ConfigKey<T>(
class SplitByTranslations(
override val defaultValue: Boolean,
) : ConfigKey<Boolean>("split_translations")
class PreferredImageServer(
val presetValues: Map<String?, String?>,
override val defaultValue: String?,
) : ConfigKey<String?>("img_server")
}

10
src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/BatoToParser.kt
View File

@@ -104,7 +104,12 @@ internal class BatoToParser(context: MangaLoaderContext) : PagedMangaParser(
filter.locale?.let {
append("&langs=")
append(it.language)
if (it.language == "in") {
append("id")
} else {
append(it.language)
}
}
append("&genres=")
@@ -318,7 +323,8 @@ internal class BatoToParser(context: MangaLoaderContext) : PagedMangaParser(
return MangaChapter(
id = generateUid(href),
name = a.text(),
number = index + 1,
number = index + 1f,
volume = 0,
url = href,
scanlator = extra?.getElementsByAttributeValueContaining("href", "/group/")?.text(),
uploadDate = runCatching {

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ExHentaiParser.kt
View File

@@ -212,7 +212,8 @@ internal class ExHentaiParser(
chapters += MangaChapter(
id = generateUid(url),
name = "${manga.title} #$i",
number = i,
number = i.toFloat(),
volume = 0,
url = url,
uploadDate = 0L,
source = source,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/HitomiLaParser.kt
View File

@@ -540,7 +540,8 @@ class HitomiLaParser(context: MangaLoaderContext) : MangaParser(context, MangaPa
url = manga.url,
name = json.getString("title"),
scanlator = json.getString("type").toTitleCase(),
number = 1,
number = 1f,
volume = 0,
branch = json.getString("language_localname"),
source = source,
uploadDate = dateFormat.tryParse(json.getString("date").substringBeforeLast("-")),

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ImHentai.kt
View File

@@ -130,7 +130,8 @@ internal class ImHentai(context: MangaLoaderContext) :
MangaChapter(
id = manga.id,
name = manga.title,
number = 1,
number = 1f,
volume = 0,
url = manga.url,
scanlator = null,
uploadDate = 0,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/LineWebtoonsParser.kt
View File

@@ -94,7 +94,8 @@ internal abstract class LineWebtoonsParser(
MangaChapter(
id = generateUid("$titleNo-$i"),
name = jo.getString("episodeTitle"),
number = jo.getInt("episodeSeq"),
number = jo.getInt("episodeSeq").toFloat(),
volume = 0,
url = "$titleNo-${jo.get("episodeNo")}",
uploadDate = jo.getLong("modifyYmdt"),
branch = null,

1
src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaDexParser.kt
View File

@@ -52,6 +52,7 @@ internal class MangaDexParser(context: MangaLoaderContext) : MangaParser(context
is MangaListFilter.Search -> {
append("&title=")
append(filter.query)
append("&contentRating[]=safe&contentRating[]=suggestive&contentRating[]=erotica&contentRating[]=pornographic")
}
is MangaListFilter.Advanced -> {

5
src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaPark.kt
View File

@@ -193,7 +193,8 @@ internal class MangaPark(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = a.text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = parseChapterDate(
dateFormat,
@@ -256,7 +257,7 @@ internal class MangaPark(context: MangaLoaderContext) :
.findAll(script)
.mapNotNullTo(ArrayList()) {
val url = it.groupValues.getOrNull(1) ?: return@mapNotNullTo null
if (url.contains("/comic/") || url.contains("/manga/")) {
if (url.contains("/comic/") || url.contains("/manga/") || url.contains("/image/mpup/")) {
MangaPage(
id = generateUid(url),
url = url,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineMangaParser.kt
View File

@@ -145,7 +145,8 @@ internal abstract class NineMangaParser(
MangaChapter(
id = generateUid(href),
name = a.text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = parseChapterDateByLang(li.selectFirst("span")?.text().orEmpty()),
source = source,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/WebtoonsParser.kt
View File

@@ -86,7 +86,8 @@ internal abstract class WebtoonsParser(
MangaChapter(
id = generateUid("$titleNo-$i"),
name = jo.getString("episodeTitle"),
number = jo.getInt("episodeSeq"),
number = jo.getInt("episodeSeq").toFloat(),
volume = 0,
url = "$titleNo-${jo.get("episodeNo")}",
uploadDate = jo.getLong("registerYmdt"),
branch = null,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/AnimeBootstrapParser.kt
View File

@@ -146,7 +146,8 @@ internal abstract class AnimeBootstrapParser(
MangaChapter(
id = generateUid(href),
name = a.text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = 0,
source = source,

5
src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/fr/PapScan.kt
View File

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.parsers.site.animebootstrap.fr
import kotlinx.coroutines.async
import kotlinx.coroutines.coroutineScope
import org.jsoup.nodes.Document
import org.koitharu.kotatsu.parsers.Broken
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.*
@@ -11,6 +12,7 @@ import org.koitharu.kotatsu.parsers.util.*
import java.text.SimpleDateFormat
import java.util.*
@Broken
@MangaSourceParser("PAPSCAN", "PapScan", "fr")
internal class PapScan(context: MangaLoaderContext) :
AnimeBootstrapParser(context, MangaParserSource.PAPSCAN, "papscan.com") {
@@ -125,7 +127,8 @@ internal class PapScan(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = li.selectFirstOrThrow("span em").text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = dateFormat.tryParse(dateText),
source = source,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/FlixScans.kt
View File

@@ -180,7 +180,8 @@ internal class FlixScans(context: MangaLoaderContext) : PagedMangaParser(context
id = generateUid(url),
url = url,
name = j.getString("slug").replace('-', ' '),
number = i + 1,
number = i + 1f,
volume = 0,
branch = null,
uploadDate = dateFormat.tryParse(date),
scanlator = null,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/MangaStorm.kt
View File

@@ -101,7 +101,8 @@ internal class MangaStorm(context: MangaLoaderContext) : PagedMangaParser(contex
MangaChapter(
id = generateUid(url),
name = a.text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = url,
scanlator = null,
uploadDate = 0,

7
src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/TeamXNovel.kt
View File

@@ -31,7 +31,7 @@ internal class TeamXNovel(context: MangaLoaderContext) : PagedMangaParser(contex
when (filter) {
is MangaListFilter.Search -> {
append("/series?search=")
append("/?search=")
append(filter.query.urlEncoded())
if (page > 1) {
append("&page=")
@@ -95,7 +95,7 @@ internal class TeamXNovel(context: MangaLoaderContext) : PagedMangaParser(contex
publicUrl = href.toAbsoluteUrl(domain),
rating = RATING_UNKNOWN,
isNsfw = false,
coverUrl = div.selectFirstOrThrow("img").src().orEmpty(),
coverUrl = div.selectFirstOrThrow("img").src()?.replace("thumbnail_", "").orEmpty(),
tags = emptySet(),
state = when (div.selectFirst(".status")?.text()) {
"مستمرة" -> MangaState.ONGOING
@@ -183,7 +183,8 @@ internal class TeamXNovel(context: MangaLoaderContext) : PagedMangaParser(contex
MangaChapter(
id = generateUid(url),
name = li.selectFirstOrThrow(".epl-title").text(),
number = url.substringAfterLast('/').toIntOrNull() ?: 0,
number = url.substringAfterLast('/').toFloatOrNull() ?: 0f,
volume = 0,
url = url,
scanlator = null,
uploadDate = dateFormat.tryParse(li.selectFirstOrThrow(".epl-date").text()),

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/be/AnibelParser.kt
View File

@@ -144,7 +144,8 @@ internal class AnibelParser(context: MangaLoaderContext) : MangaParser(context,
MangaChapter(
id = generateUid(jo.getString("id")),
name = "Глава $number",
number = number,
number = number.toFloat(),
volume = 0,
url = "${manga.url}/read/$number",
scanlator = null,
uploadDate = jo.getLong("released"),

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/BeeToon.kt
View File

@@ -109,7 +109,8 @@ internal class BeeToon(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(url),
name = a.selectFirstOrThrow(".chap").text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = url,
scanlator = null,
uploadDate = SimpleDateFormat("MM/dd/yyyy HH:mm:ss", Locale.ENGLISH)

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/CloneMangaParser.kt
View File

@@ -76,7 +76,8 @@ internal class CloneMangaParser(context: MangaLoaderContext) : MangaParser(conte
val chapter = MangaChapter(
id = generateUid("$series&page=$i"),
name = "Chapter ${i + 1}",
number = i + 1,
number = i + 1f,
volume = 0,
url = "$series&page=$i",
scanlator = null,
branch = null,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ComicExtra.kt
View File

@@ -149,7 +149,8 @@ internal class ComicExtra(context: MangaLoaderContext) : PagedMangaParser(contex
MangaChapter(
id = generateUid(url),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = url,
scanlator = null,
uploadDate = dateFormat.tryParse(dateText),

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/DynastyScans.kt
View File

@@ -182,7 +182,8 @@ internal class DynastyScans(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = a.text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = dateFormat.tryParse(dateText),
source = source,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/FlixScansOrg.kt
View File

@@ -166,7 +166,8 @@ internal class FlixScansOrg(context: MangaLoaderContext) :
id = generateUid(url),
url = url,
name = j.getString("slug").replace('-', ' '),
number = i + 1,
number = i + 1f,
volume = 0,
branch = null,
uploadDate = dateFormat.tryParse(date),
scanlator = null,

14
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaGeko.kt
View File

@@ -2,13 +2,11 @@ package org.koitharu.kotatsu.parsers.site.en
import kotlinx.coroutines.async
import kotlinx.coroutines.coroutineScope
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.*
@@ -23,9 +21,12 @@ internal class MangaGeko(context: MangaLoaderContext) : PagedMangaParser(context
override val isMultipleTagsSupported = false
override val headers: Headers = Headers.Builder()
.add("User-Agent", UserAgents.CHROME_DESKTOP)
.build()
private val userAgentKey = ConfigKey.UserAgent(context.getDefaultUserAgent())
override fun onCreateConfig(keys: MutableCollection<ConfigKey<*>>) {
super.onCreateConfig(keys)
keys.add(userAgentKey)
}
override suspend fun getListPage(page: Int, filter: MangaListFilter?): List<Manga> {
@@ -137,7 +138,8 @@ internal class MangaGeko(context: MangaLoaderContext) : PagedMangaParser(context
MangaChapter(
id = generateUid(url),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = url,
scanlator = null,
uploadDate = dateFormat.tryParse(dateText),

12
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaTownParser.kt
View File

@@ -160,7 +160,8 @@ internal class MangaTownParser(context: MangaLoaderContext) :
id = generateUid(href),
url = href,
source = MangaParserSource.MANGATOWN,
number = i + 1,
number = i + 1f,
volume = 0,
uploadDate = parseChapterDate(
dateFormat,
li.selectFirst("span.time")?.text(),
@@ -176,10 +177,10 @@ internal class MangaTownParser(context: MangaLoaderContext) :
override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
val fullUrl = chapter.url.toAbsoluteUrl(domain)
val doc = webClient.httpGet(fullUrl).parseHtml()
val root = doc.body().selectFirstOrThrow("div.page_select")
val isManga = root.select("select")
val root = doc.body().selectFirst("div.page_select")
val isManga = root?.select("select")
if (isManga.isEmpty()) {//Webtoon
if (isManga.isNullOrEmpty()) {//Webtoon
val imgElements = doc.select("div#viewer.read_img img.image")
return imgElements.map {
val href = it.attr("src")
@@ -256,7 +257,8 @@ internal class MangaTownParser(context: MangaLoaderContext) :
id = generateUid(href),
url = href,
source = MangaParserSource.MANGATOWN,
number = i + 1,
number = i + 1f,
volume = 0,
uploadDate = parseChapterDate(
dateFormat,
li.selectFirst("span.time")?.text(),

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Mangaowl.kt
View File

@@ -155,7 +155,8 @@ internal class Mangaowl(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(url),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = url,
uploadDate = dateFormat.tryParse(date),
source = source,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Parser.kt
View File

@@ -161,7 +161,8 @@ class Manhwa18Parser(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(chapterUrl),
name = element.selectFirst(".chapter-name")?.text().orEmpty(),
number = index + 1,
number = index + 1f,
volume = 0,
url = chapterUrl,
scanlator = null,
uploadDate = uploadDate,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ManhwasMen.kt
View File

@@ -113,7 +113,8 @@ class ManhwasMen(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(url),
name = li.selectFirstOrThrow(".flex-grow-1 span").text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = url,
scanlator = null,
uploadDate = parseChapterDate(

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Po2Scans.kt
View File

@@ -76,7 +76,8 @@ internal class Po2Scans(context: MangaLoaderContext) : MangaParser(context, Mang
MangaChapter(
id = generateUid(url),
name = a.text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = url,
scanlator = null,
uploadDate = dateFormat.tryParse(div.select(".detail span").last()?.text()),

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Pururin.kt
View File

@@ -126,7 +126,8 @@ internal class Pururin(context: MangaLoaderContext) :
MangaChapter(
id = manga.id,
name = manga.title,
number = 1,
number = 1f,
volume = 0,
url = manga.url,
scanlator = null,
uploadDate = 0,

8
src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ReaperComics.kt
View File

@@ -35,9 +35,7 @@ internal class ReaperComics(context: MangaLoaderContext) :
override val configKeyDomain = ConfigKey.Domain("reaperscans.com")
private val userAgentKey = ConfigKey.UserAgent(
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
)
private val userAgentKey = ConfigKey.UserAgent(context.getDefaultUserAgent())
private val baseHeaders: Headers
get() = Headers.Builder().add("User-Agent", config[userAgentKey]).build()
@@ -171,7 +169,7 @@ internal class ReaperComics(context: MangaLoaderContext) :
val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
val simpleDateFormat = SimpleDateFormat("dd/MM/yyyy", sourceLocale)
var totalChapters = (doc.selectFirst(selectTotalChapter)?.text()?.toIntOrNull() ?: 0) - 1
var totalChapters = (doc.selectFirst(selectTotalChapter)?.text()?.toFloatOrNull() ?: 0f) - 1f
val chapters = mutableSetOf<MangaChapter>()
var hasNextPage = doc.selectFirst(chapterListNextPageSelector()) != null
chapters.addAll(
@@ -182,6 +180,7 @@ internal class ReaperComics(context: MangaLoaderContext) :
id = generateUid(chapterUrl),
name = li.selectFirst("div.truncate p.truncate")?.text().orEmpty(),
number = totalChapters--,
volume = 0,
url = chapterUrl,
scanlator = null,
uploadDate = parseChapterDate(
@@ -256,6 +255,7 @@ internal class ReaperComics(context: MangaLoaderContext) :
id = generateUid(chapterUrl),
name = li.selectFirst("div.truncate p.truncate")?.text().orEmpty(),
number = totalChapters--,
volume = 0,
url = chapterUrl,
scanlator = null,
uploadDate = parseChapterDate(

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TempleScanEsp.kt
View File

@@ -96,7 +96,8 @@ internal class TempleScanEsp(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = div.requireElementById("name").text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = date,
source = source,

50
src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TuMangaOnlineParser.kt
View File

@@ -147,7 +147,8 @@ class TuMangaOnlineParser(context: MangaLoaderContext) : PagedMangaParser(
return MangaChapter(
id = generateUid(href),
name = "One Shot",
number = 1,
number = 1f,
volume = 0,
url = href,
scanlator = element.select("div.col-md-6.text-truncate").text(),
branch = null,
@@ -163,7 +164,8 @@ class TuMangaOnlineParser(context: MangaLoaderContext) : PagedMangaParser(
return MangaChapter(
id = generateUid(href),
name = chName,
number = number + 1,
number = number + 1f,
volume = 0,
url = href,
scanlator = element.select("div.col-md-6.text-truncate").text(),
branch = null,
@@ -205,6 +207,9 @@ class TuMangaOnlineParser(context: MangaLoaderContext) : PagedMangaParser(
private suspend fun redirectToReadingPage(document: Document): Document {
val script1 = document.selectFirst("script:containsData(uniqid)")
val script2 = document.selectFirst("script:containsData(window.location.replace)")
val script3 = document.selectFirst("script:containsData(redirectUrl)")
val script4 = document.selectFirst("input#redir")
val script5 = document.selectFirst("script:containsData(window.opener):containsData(location.replace)")
val redirectHeaders = Headers.Builder().set("Referer", document.baseUri()).build()
@@ -226,15 +231,52 @@ class TuMangaOnlineParser(context: MangaLoaderContext) : PagedMangaParser(
if (script2 != null) {
val data = script2.data()
val regexRedirect = """window\.location\.replace\('(.+)'\)""".toRegex()
val url = regexRedirect.find(data)!!.groupValues[1]
val regexRedirect = """window\.location\.replace\(['"](.+)['"]\)""".toRegex()
val url = regexRedirect.find(data)?.groupValues?.get(1)?.unescapeUrl()
if (url != null) {
return redirectToReadingPage(webClient.httpGet(url, redirectHeaders).parseHtml())
}
}
if (script3 != null) {
val data = script3.data()
val regexRedirect = """redirectUrl\s*=\s*'(.+)'""".toRegex()
val url = regexRedirect.find(data)?.groupValues?.get(1)?.unescapeUrl()
if (url != null) {
return redirectToReadingPage(webClient.httpGet(url, redirectHeaders).parseHtml())
}
}
if (script4 != null) {
val url = script4.attr("value").unescapeUrl()
return redirectToReadingPage(webClient.httpGet(url, redirectHeaders).parseHtml())
}
if (script5 != null) {
val data = script5.data()
val regexRedirect = """;[^.]location\.replace\(['"](.+)['"]\)""".toRegex()
val url = regexRedirect.find(data)?.groupValues?.get(1)?.unescapeUrl()
if (url != null) {
return redirectToReadingPage(webClient.httpGet(url, redirectHeaders).parseHtml())
}
}
return document
}
private fun String.unescapeUrl(): String {
return if (this.startsWith("http:\\/\\/") || this.startsWith("https:\\/\\/")) {
this.replace("\\/", "/")
} else {
this
}
}
override suspend fun getAvailableTags(): Set<MangaTag> {
val doc = webClient.httpGet("https://$domain/library", headers).parseHtml()
val elements = doc.body().select("div#books-genders > div > div")

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/FmreaderParser.kt
View File

@@ -203,7 +203,8 @@ internal abstract class FmreaderParser(
MangaChapter(
id = generateUid(href),
name = a.selectFirstOrThrow("div.chapter-name").text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = parseChapterDate(
dateFormat,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/en/Manhwa18Com.kt
View File

@@ -125,7 +125,8 @@ internal class Manhwa18Com(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = a.selectFirstOrThrow("div.chapter-name").text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = parseChapterDate(
dateFormat,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/ja/Klz9.kt
View File

@@ -66,7 +66,8 @@ internal class Klz9(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = a.selectFirstOrThrow("a").text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = parseChapterDate(
dateFormat,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/ja/WeLoveManga.kt
View File

@@ -25,7 +25,8 @@ internal class WeLoveManga(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = a.selectFirstOrThrow("a").text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = parseChapterDate(
dateFormat,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/FoolSlideParser.kt
View File

@@ -155,7 +155,8 @@ internal abstract class FoolSlideParser(
MangaChapter(
id = generateUid(href),
name = a.text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = if (div.selectFirstOrThrow(selectDate).text().contains(", ")) {
dateFormat.tryParse(dateText)

4
src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/fr/HniScantrad.kt
View File

@@ -5,9 +5,11 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.site.foolslide.FoolSlideParser
// The source has changed template so for the moment it is dead.
@MangaSourceParser("HNISCANTRAD", "HniScantrad", "fr")
internal class HniScantrad(context: MangaLoaderContext) :
FoolSlideParser(context, MangaParserSource.HNISCANTRAD, "hni-scantrad.com") {
FoolSlideParser(context, MangaParserSource.HNISCANTRAD, "hni-scantrad.net") {
override val pagination = false
override val searchUrl = "lel/search/"
override val listUrl = "lel/directory/"

2
src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/it/PowerManga.kt
View File

@@ -1,10 +1,12 @@
package org.koitharu.kotatsu.parsers.site.foolslide.it
import org.koitharu.kotatsu.parsers.Broken
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.site.foolslide.FoolSlideParser
@Broken
@MangaSourceParser("POWERMANGA", "PowerManga", "it")
internal class PowerManga(context: MangaLoaderContext) :
FoolSlideParser(context, MangaParserSource.POWERMANGA, "reader.powermanga.org") {

5
src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/BentomangaParser.kt
View File

@@ -5,6 +5,7 @@ import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope
import okhttp3.Headers
import org.jsoup.nodes.Element
import org.koitharu.kotatsu.parsers.Broken
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.PagedMangaParser
@@ -15,6 +16,7 @@ import org.koitharu.kotatsu.parsers.util.*
import org.koitharu.kotatsu.parsers.util.json.getIntOrDefault
import java.util.*
@Broken
@MangaSourceParser("BENTOMANGA", "BentoManga", "fr")
internal class BentomangaParser(context: MangaLoaderContext) :
PagedMangaParser(context, MangaParserSource.BENTOMANGA, 10) {
@@ -227,7 +229,8 @@ internal class BentomangaParser(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = if (name != null && name != title) "$title: $name" else title,
number = href.substringAfterLast('/').toIntOrNull() ?: 0,
number = href.substringAfterLast('/').toFloatOrNull() ?: 0f,
volume = 0,
url = href,
scanlator = div.selectFirst(".team_link-name")?.textOrNull(),
uploadDate = div.selectFirst(".component-chapter-date")

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/FuryoSociety.kt
View File

@@ -109,7 +109,8 @@ internal class FuryoSociety(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = div.selectFirstOrThrow("div.title").text() + " : " + div.selectFirstOrThrow("div.name").text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = parseChapterDate(
dateFormat,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LegacyScansParser.kt
View File

@@ -144,7 +144,8 @@ internal class LegacyScansParser(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
scanlator = null,
uploadDate = dateFormat.tryParse(dateText),

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LireScan.kt
View File

@@ -113,7 +113,8 @@ internal class LireScan(context: MangaLoaderContext) : PagedMangaParser(context,
MangaChapter(
id = generateUid(href),
name = name,
number = i,
number = i.toFloat(),
volume = 0,
url = href,
scanlator = null,
uploadDate = dateFormat.tryParse(dateText),

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LugnicaScans.kt
View File

@@ -183,7 +183,8 @@ internal class LugnicaScans(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(url),
name = "Chapitre : $id",
number = i,
number = i.toFloat(),
volume = 0,
url = url,
scanlator = null,
uploadDate = dateFormat.tryParse(date),

17
src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScansMangasMe.kt
View File

@@ -107,11 +107,6 @@ internal class ScansMangasMe(context: MangaLoaderContext) :
val doc = webClient.httpGet(fullUrl).parseHtml()
val chaptersDeferred = getChapters(doc)
val desc = doc.selectFirstOrThrow("div.desc").html()
val state = if (doc.select("div.spe span:contains(En cours)").isNullOrEmpty()) {
MangaState.FINISHED
} else {
MangaState.ONGOING
}
val alt = doc.body().select("div.infox span.alter").text()
val aut = doc.select("div.spe span")[2].text().replace("Auteur:", "")
manga.copy(
@@ -125,20 +120,26 @@ internal class ScansMangasMe(context: MangaLoaderContext) :
description = desc,
altTitle = alt,
author = aut,
state = state,
state = when (doc.selectFirstOrThrow("div.spe span:contains(Statut:)").textOrNull()
?.substringAfterLast(':')) {
" En cours" -> MangaState.ONGOING
" Terminé" -> MangaState.FINISHED
else -> null
},
chapters = chaptersDeferred,
isNsfw = manga.isNsfw,
)
}
private fun getChapters(doc: Document): List<MangaChapter> {
return doc.body().requireElementById("chapter_list").select("li").mapChapters(reversed = true) { i, li ->
return doc.body().requireElementById("chapter_list").select("li").mapChapters(reversed = true) { _, li ->
val a = li.selectFirstOrThrow("a")
val href = a.attrAsRelativeUrl("href")
MangaChapter(
id = generateUid(href),
name = li.selectFirstOrThrow("span.mobile chapter").text(),
number = i + 1,
number = li.selectFirstOrThrow("span.mobile chapter").text().substringAfterLast(" ").toFloat(),
volume = 0,
url = href,
uploadDate = 0,
source = source,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScantradUnion.kt
View File

@@ -152,7 +152,8 @@ internal class ScantradUnion(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = name,
number = i,
number = i.toFloat(),
volume = 0,
url = href,
scanlator = null,
uploadDate = dateFormat.tryParse(date),

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/galleryadults/GalleryAdultsParser.kt
View File

@@ -158,7 +158,8 @@ internal abstract class GalleryAdultsParser(
MangaChapter(
id = manga.id,
name = manga.title,
number = 1,
number = 1f,
volume = 0,
url = urlChapters,
scanlator = null,
uploadDate = 0,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/galleryadults/all/HentaiEra.kt
View File

@@ -131,7 +131,8 @@ internal class HentaiEra(context: MangaLoaderContext) :
MangaChapter(
id = manga.id,
name = manga.title,
number = 1,
number = 1f,
volume = 0,
url = urlChapters,
scanlator = null,
uploadDate = 0,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/gattsu/GattsuParser.kt
View File

@@ -115,7 +115,8 @@ internal abstract class GattsuParser(
MangaChapter(
id = manga.id,
name = manga.title,
number = 1,
number = 1f,
volume = 0,
url = urlChapter,
scanlator = null,
uploadDate = 0,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/guya/GuyaParser.kt
View File

@@ -91,7 +91,8 @@ internal abstract class GuyaParser(
MangaChapter(
id = generateUid(url),
name = chapter.getString("title"),
number = i,
number = i.toFloat(),
volume = 0,
url = url,
scanlator = null,
uploadDate = 0,

17
src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/HeanCms.kt
View File

@@ -1,11 +1,9 @@
package org.koitharu.kotatsu.parsers.site.heancms
import okhttp3.Headers
import org.koitharu.kotatsu.parsers.MangaLoaderContext
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 org.koitharu.kotatsu.parsers.util.json.mapJSON
import java.text.SimpleDateFormat
@@ -20,8 +18,16 @@ internal abstract class HeanCms(
override val configKeyDomain = ConfigKey.Domain(domain)
private val userAgentKey = ConfigKey.UserAgent(context.getDefaultUserAgent())
override fun onCreateConfig(keys: MutableCollection<ConfigKey<*>>) {
super.onCreateConfig(keys)
keys.add(userAgentKey)
}
override val availableSortOrders: Set<SortOrder> = EnumSet.of(
SortOrder.ALPHABETICAL,
SortOrder.ALPHABETICAL_DESC,
SortOrder.UPDATED,
SortOrder.NEWEST,
SortOrder.POPULARITY,
@@ -30,15 +36,11 @@ internal abstract class HeanCms(
override val availableStates: Set<MangaState> =
EnumSet.of(MangaState.ONGOING, MangaState.FINISHED, MangaState.PAUSED, MangaState.ABANDONED)
override val headers: Headers = Headers.Builder()
.add("User-Agent", UserAgents.CHROME_DESKTOP)
.build()
protected open val pathManga = "series"
protected open val apiPath
get() = getDomain("api")
//For some sources, you need to send a json. For the moment, this part only works in Get. ( ex source need json gloriousscan.com , omegascans.org )
override suspend fun getListPage(page: Int, filter: MangaListFilter?): List<Manga> {
val url = buildString {
append("https://")
@@ -147,7 +149,8 @@ internal abstract class HeanCms(
MangaChapter(
id = generateUid(url),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = url,
scanlator = null,
uploadDate = dateFormat.tryParse(date),

7
src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/en/OmegaScans.kt
View File

@@ -46,8 +46,8 @@ internal class OmegaScans(context: MangaLoaderContext) :
SortOrder.POPULARITY -> append("total_views&order=desc")
SortOrder.UPDATED -> append("latest&order=desc")
SortOrder.NEWEST -> append("created_at&order=desc")
SortOrder.ALPHABETICAL -> append("title&order=desc")
SortOrder.ALPHABETICAL_DESC -> append("title&order=asc")
SortOrder.ALPHABETICAL -> append("title&order=asc")
SortOrder.ALPHABETICAL_DESC -> append("title&order=desc")
else -> append("latest&order=desc")
}
append("&series_type=All&perPage=$pageSize")
@@ -107,7 +107,7 @@ internal class OmegaScans(context: MangaLoaderContext) :
val dateFormat = SimpleDateFormat(datePattern, Locale.ENGLISH)
val chaptersJsonArray = json.getJSONArray("data")
var totalChapters = json.getJSONObject("meta").getInt("total")
var totalChapters = json.getJSONObject("meta").getInt("total").toFloat()
val chapters = chaptersJsonArray.mapJSON { j ->
val slug = j.getJSONObject("series").getString("series_slug")
val chapterUrl = "https://$domain/$pathManga/$slug/${j.getString("chapter_slug")}"
@@ -117,6 +117,7 @@ internal class OmegaScans(context: MangaLoaderContext) :
url = chapterUrl,
name = j.getString("chapter_name"),
number = totalChapters--,
volume = 0,
branch = null,
uploadDate = dateFormat.tryParse(date),
scanlator = null,

6
src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/es/YugenMangasEs.kt
View File

@@ -1,5 +1,6 @@
package org.koitharu.kotatsu.parsers.site.heancms.es
import org.koitharu.kotatsu.parsers.Broken
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.*
@@ -7,6 +8,7 @@ import org.koitharu.kotatsu.parsers.site.heancms.HeanCms
import org.koitharu.kotatsu.parsers.util.*
import org.koitharu.kotatsu.parsers.util.json.mapJSON
@Broken // Not dead but changed template and url visualikigai.com
@MangaSourceParser("YUGEN_MANGAS_ES", "YugenMangas.lat", "es", ContentType.HENTAI)
internal class YugenMangasEs(context: MangaLoaderContext) :
HeanCms(context, MangaParserSource.YUGEN_MANGAS_ES, "yugenmangas.lat") {
@@ -43,8 +45,8 @@ internal class YugenMangasEs(context: MangaLoaderContext) :
SortOrder.POPULARITY -> append("total_views&order=desc")
SortOrder.UPDATED -> append("latest&order=desc")
SortOrder.NEWEST -> append("created_at&order=desc")
SortOrder.ALPHABETICAL -> append("title&order=desc")
SortOrder.ALPHABETICAL_DESC -> append("title&order=asc")
SortOrder.ALPHABETICAL -> append("title&order=asc")
SortOrder.ALPHABETICAL_DESC -> append("title&order=desc")
else -> append("latest&order=desc")
}
append("&series_type=Comic&perPage=12")

142
src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/fr/PerfScan.kt
View File

@@ -1,10 +1,148 @@
package org.koitharu.kotatsu.parsers.site.heancms.fr
import org.json.JSONArray
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.model.*
import org.koitharu.kotatsu.parsers.site.heancms.HeanCms
import org.koitharu.kotatsu.parsers.util.*
import org.koitharu.kotatsu.parsers.util.json.*
import java.text.SimpleDateFormat
import java.util.*
@MangaSourceParser("PERF_SCAN", "PerfScan", "fr")
internal class PerfScan(context: MangaLoaderContext) :
HeanCms(context, MangaParserSource.PERF_SCAN, "perf-scan.fr")
HeanCms(context, MangaParserSource.PERF_SCAN, "perf-scan.fr") {
override suspend fun getListPage(page: Int, filter: MangaListFilter?): List<Manga> {
val url = buildString {
append("https://api.")
append(domain)
append("/query?adult=true&query_string=")
when (filter) {
is MangaListFilter.Search -> {
append(filter.query.urlEncoded())
}
is MangaListFilter.Advanced -> {
filter.states.oneOrThrowIfMany()?.let {
append("&status=")
append(
when (it) {
MangaState.ONGOING -> "Ongoing"
MangaState.FINISHED -> "Completed"
MangaState.ABANDONED -> "Dropped"
MangaState.PAUSED -> "Hiatus"
else -> ""
},
)
}
append("&orderBy=")
when (filter.sortOrder) {
SortOrder.POPULARITY -> append("total_views&order=desc")
SortOrder.UPDATED -> append("latest&order=desc")
SortOrder.NEWEST -> append("created_at&order=desc")
SortOrder.ALPHABETICAL -> append("title&order=asc")
SortOrder.ALPHABETICAL_DESC -> append("title&order=desc")
else -> append("latest&order=desc")
}
append("&series_type=All&perPage=")
append(pageSize)
append("&tags_ids=")
append("[".urlEncoded())
filter.tags.joinTo(this, ",") { it.key }
append("]".urlEncoded())
}
null -> {}
}
append("&page=")
append(page)
}
val json = webClient.httpGet(url).parseJson()
return json.getJSONArray("data").mapJSON { j ->
val slug = j.getString("series_slug")
val urlManga = "https://$domain/$pathManga/$slug"
val cover = if (j.getString("thumbnail").contains('/')) {
j.getString("thumbnail")
} else {
"https://api.$domain/${j.getString("thumbnail")}"
}
Manga(
id = j.getLong("id"),
title = j.getString("title"),
altTitle = null,
url = urlManga.toRelativeUrl(domain),
publicUrl = urlManga,
rating = j.getFloatOrDefault("rating", RATING_UNKNOWN) / 5f,
isNsfw = isNsfwSource,
coverUrl = cover,
tags = setOf(),
state = when (j.getStringOrNull("status")) {
"Ongoing" -> MangaState.ONGOING
"Completed" -> MangaState.FINISHED
"Dropped" -> MangaState.ABANDONED
"Hiatus" -> MangaState.PAUSED
else -> null
},
author = j.getStringOrNull("author"),
source = source,
description = j.getString("description"),
)
}
}
override suspend fun getDetails(manga: Manga): Manga {
val url = buildString {
append("https://api.")
append(domain)
append("/chapter/query?perPage=9999&series_id=")
append(manga.id)
}
val json = webClient.httpGet(url).parseJson()
val dateFormat = SimpleDateFormat(datePattern, Locale.ENGLISH)
val chaptersJsonArray = json.getJSONArray("data")
var totalChapters = json.getJSONObject("meta").getInt("total").toFloat()
val chapters = chaptersJsonArray.mapJSON { j ->
val slug = j.getJSONObject("series").getString("series_slug")
val chapterUrl = "https://$domain/$pathManga/$slug/${j.getString("chapter_slug")}"
val date = j.getString("created_at").substringBeforeLast("T")
MangaChapter(
id = j.getLong("id"),
url = chapterUrl,
name = j.getString("chapter_name"),
number = totalChapters--,
volume = 0,
branch = null,
uploadDate = dateFormat.tryParse(date),
scanlator = null,
source = source,
)
}
return manga.copy(
chapters = chapters.reversed(),
)
}
override suspend fun getAvailableTags(): Set<MangaTag> {
val doc = webClient.httpGet("https://$domain/comics").parseHtml()
val regex = Regex("\"tags\\\\.*?(\\[.+?])")
val tags = doc.select("script").firstNotNullOf { script ->
regex.find(script.html())?.groupValues?.getOrNull(1)
}.unescapeJson()
return JSONArray(tags).mapJSONToSet {
MangaTag(
key = it.getInt("id").toString(),
title = it.getString("name").toTitleCase(sourceLocale),
source = source,
)
}
}
}

7
src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/pt/ModeScanlator.kt
View File

@@ -45,8 +45,8 @@ internal class ModeScanlator(
SortOrder.POPULARITY -> append("total_views&order=desc")
SortOrder.UPDATED -> append("latest&order=desc")
SortOrder.NEWEST -> append("created_at&order=desc")
SortOrder.ALPHABETICAL -> append("title&order=desc")
SortOrder.ALPHABETICAL_DESC -> append("title&order=asc")
SortOrder.ALPHABETICAL -> append("title&order=asc")
SortOrder.ALPHABETICAL_DESC -> append("title&order=desc")
else -> append("latest&order=desc")
}
append("&series_type=All&perPage=")
@@ -108,7 +108,7 @@ internal class ModeScanlator(
val dateFormat = SimpleDateFormat(datePattern, Locale.ENGLISH)
val chaptersJsonArray = json.getJSONArray("data")
var totalChapters = json.getJSONObject("meta").getInt("total")
var totalChapters = json.getJSONObject("meta").getInt("total").toFloat()
val chapters = chaptersJsonArray.mapJSON { j ->
val slug = j.getJSONObject("series").getString("series_slug")
val chapterUrl = "https://$domain/$pathManga/$slug/${j.getString("chapter_slug")}"
@@ -118,6 +118,7 @@ internal class ModeScanlator(
url = chapterUrl,
name = j.getString("chapter_name"),
number = totalChapters--,
volume = 0,
branch = null,
uploadDate = dateFormat.tryParse(date),
scanlator = null,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancmsalt/HeanCmsAlt.kt
View File

@@ -99,7 +99,8 @@ internal abstract class HeanCmsAlt(
MangaChapter(
id = generateUid(url),
name = a.selectFirstOrThrow(selectChapterTitle).text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = url,
scanlator = null,
uploadDate = parseChapterDate(

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancmsalt/es/Brakeout.kt
View File

@@ -35,7 +35,8 @@ internal class Brakeout(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(url),
name = div.selectFirstOrThrow(selectChapterTitle).text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = url,
scanlator = null,
uploadDate = parseChapterDate(

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/DoujinDesuParser.kt
View File

@@ -127,7 +127,8 @@ class DoujinDesuParser(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(url),
name = titleTag.text(),
number = index + 1,
number = index + 1f,
volume = 0,
url = url,
scanlator = null,
uploadDate = chapterDateFormat.tryParse(element.select(".epsleft > .date").text()),

10
src/main/kotlin/org/koitharu/kotatsu/parsers/site/it/mangaworld/MangaWorld.kt Normal file
View File

@@ -0,0 +1,10 @@
package org.koitharu.kotatsu.parsers.site.it.mangaworld
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
@MangaSourceParser("MANGAWORLD", "MangaWorld", "it")
internal class MangaWorld(
context: MangaLoaderContext,
) : MangaWorldParser(context, MangaParserSource.MANGAWORLD, "mangaworld.ac")

10
src/main/kotlin/org/koitharu/kotatsu/parsers/site/it/mangaworld/MangaWorldAdult.kt Normal file
View File

@@ -0,0 +1,10 @@
package org.koitharu.kotatsu.parsers.site.it.mangaworld
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
@MangaSourceParser("MANGAWORLDADULT", "MangaWorldAdult", "it")
internal class MangaWorldAdult(
context: MangaLoaderContext,
) : MangaWorldParser(context, MangaParserSource.MANGAWORLDADULT, "mangaworldadult.net")

59
src/main/kotlin/org/koitharu/kotatsu/parsers/site/it/MangaWorld.kt → src/main/kotlin/org/koitharu/kotatsu/parsers/site/it/mangaworld/MangaWorldParser.kt
View File

@@ -1,7 +1,7 @@
package org.koitharu.kotatsu.parsers.site.it
package org.koitharu.kotatsu.parsers.site.it.mangaworld
import org.jsoup.nodes.Document
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.*
@@ -9,14 +9,28 @@ import org.koitharu.kotatsu.parsers.util.*
import java.text.SimpleDateFormat
import java.util.*
@MangaSourceParser("MANGAWORLD", "mangaworld.ac", "it")
internal class MangaWorld(
abstract class MangaWorldParser(
context: MangaLoaderContext,
) : PagedMangaParser(context, MangaParserSource.MANGAWORLD, pageSize = 16) {
source: MangaParserSource,
domain: String,
pageSize: Int = 16,
) : PagedMangaParser(context, source, pageSize) {
override val availableSortOrders: Set<SortOrder> =
EnumSet.of(SortOrder.POPULARITY, SortOrder.ALPHABETICAL, SortOrder.NEWEST, SortOrder.ALPHABETICAL_DESC)
EnumSet.of(
SortOrder.POPULARITY,
SortOrder.ALPHABETICAL,
SortOrder.NEWEST,
SortOrder.ALPHABETICAL_DESC,
SortOrder.UPDATED,
)
override val configKeyDomain = ConfigKey.Domain("mangaworld.ac")
override val defaultSortOrder: SortOrder
get() = SortOrder.ALPHABETICAL
override val configKeyDomain = ConfigKey.Domain(domain)
override val availableStates: Set<MangaState> =
EnumSet.of(MangaState.ONGOING, MangaState.FINISHED, MangaState.ABANDONED, MangaState.PAUSED)
override val isMultipleTagsSupported = true
@@ -36,6 +50,10 @@ internal class MangaWorld(
}
is MangaListFilter.Advanced -> {
if (filter.tags.isEmpty() && filter.states.isEmpty() && filter.sortOrder == SortOrder.UPDATED) return parseMangaList(
webClient.httpGet("https://$domain/?page=$page").parseHtml(),
)
if (filter.tags.isNotEmpty()) {
filter.tags.joinTo(this, "&") { it.key.substringAfter("archive?") }
}
@@ -61,6 +79,10 @@ internal class MangaWorld(
append("&page=$page")
}
val doc = webClient.httpGet(url).parseHtml()
return parseMangaList(doc)
}
private fun parseMangaList(doc: Document): List<Manga> {
return doc.select(".comics-grid .entry").map { div ->
val href = div.selectFirstOrThrow("a.thumb").attrAsRelativeUrl("href")
val tags = div.select(".genres a[href*=/archive?genre=]")
@@ -89,15 +111,26 @@ internal class MangaWorld(
}
}
override suspend fun getAvailableTags(): Set<MangaTag> {
val doc = webClient.httpGet("https://$domain/").parseHtml()
return doc.select("div[aria-labelledby=genresDropdown] a").mapNotNullToSet {
val genres = doc.select("div[aria-labelledby=genresDropdown] a").mapNotNullToSet {
MangaTag(
key = it.attr("href"),
title = it.text().toTitleCase(sourceLocale),
source = source,
)
}
val types = doc.select("div[aria-labelledby=typesDropdown] a").mapNotNullToSet {
MangaTag(
key = it.attr("href"),
title = it.text().toTitleCase(sourceLocale),
source = source,
)
}
return genres + types
}
override suspend fun getDetails(manga: Manga): Manga {
@@ -116,8 +149,9 @@ internal class MangaWorld(
MangaChapter(
id = generateUid(url),
name = a.selectFirstOrThrow("span.d-inline-block").text(),
number = i + 1,
url = url,
number = i + 1f,
volume = 0,
url = "$url?style=list",
scanlator = null,
uploadDate =
SimpleDateFormat("dd MMMM yyyy", Locale.ITALIAN).tryParse(
@@ -132,7 +166,10 @@ internal class MangaWorld(
override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml()
return doc.select("img.page-image").map { img ->
val selectWebtoonPages = "img.page-image"
val selectMangaPages = "img.img-fluid"
val imgSelector = if (doc.select(selectWebtoonPages).isNotEmpty()) selectWebtoonPages else selectMangaPages
return doc.select(imgSelector).map { img ->
val urlPage = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found")
MangaPage(
id = generateUid(urlPage),

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/ja/NicovideoSeigaParser.kt
View File

@@ -126,7 +126,8 @@ class NicovideoSeigaParser(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = li.select("div > div.description > div.title > a").text(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
scanlator = null,
branch = null,

307
src/main/kotlin/org/koitharu/kotatsu/parsers/site/keyoapp/KeyoappParser.kt Normal file
View File

@@ -0,0 +1,307 @@
package org.koitharu.kotatsu.parsers.site.keyoapp
import androidx.collection.scatterSetOf
import kotlinx.coroutines.coroutineScope
import org.jsoup.nodes.Document
import org.jsoup.nodes.Element
import org.koitharu.kotatsu.parsers.MangaLoaderContext
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 java.text.DateFormat
import java.text.SimpleDateFormat
import java.util.*
internal abstract class KeyoappParser(
context: MangaLoaderContext,
source: MangaParserSource,
domain: String,
pageSize: Int = 24,
) : PagedMangaParser(context, source, pageSize) {
override val configKeyDomain = ConfigKey.Domain(domain)
private val userAgentKey = ConfigKey.UserAgent(context.getDefaultUserAgent())
override fun onCreateConfig(keys: MutableCollection<ConfigKey<*>>) {
super.onCreateConfig(keys)
keys.add(userAgentKey)
}
override val isMultipleTagsSupported = false
override val availableSortOrders: Set<SortOrder> = EnumSet.of(
SortOrder.UPDATED,
SortOrder.NEWEST,
)
protected open val listUrl = "series/"
protected open val datePattern = "MMM d, yyyy"
@JvmField
protected val ongoing = scatterSetOf(
"ongoing",
)
@JvmField
protected val finished = scatterSetOf(
"completed",
)
@JvmField
protected val paused = scatterSetOf(
"paused",
)
@JvmField
protected val upcoming = scatterSetOf(
"dropped",
)
init {
paginator.firstPage = 1
searchPaginator.firstPage = 1
}
override suspend fun getListPage(page: Int, filter: MangaListFilter?): List<Manga> {
var query = ""
var tag = ""
if (page > 1) {
return emptyList()
}
val url = urlBuilder().apply {
when (filter) {
is MangaListFilter.Search -> {
addPathSegment("series")
query = filter.query
}
is MangaListFilter.Advanced -> {
if (filter.tags.isNotEmpty()) {
filter.tags.oneOrThrowIfMany()?.let {
tag = it.title
}
}
when (filter.sortOrder) {
SortOrder.UPDATED -> addPathSegment("latest")
SortOrder.NEWEST -> addPathSegment("series")
else -> addPathSegment("latest")
}
}
null -> addPathSegment("latest")
}
}.build()
return parseMangaList(webClient.httpGet(url).parseHtml(), tag, query)
}
protected open fun parseMangaList(doc: Document, tag: String, query: String): List<Manga> {
val manga = ArrayList<Manga>()
doc.select("#searched_series_page button").ifEmpty {
doc.select("div.grid > div.group")
}.map { div ->
val title = div.selectFirstOrThrow("h3").text().orEmpty()
if (query.isNotEmpty() && title.contains(query, ignoreCase = true)) {
manga.add(addManga(div))
}
// Not all tags are present in UPDATED
val tags = div.attr("tags") ?: div.select("div.gap-1 a").joinToString()
if (tag.isNotEmpty() && tags.contains(tag, ignoreCase = true)) {
manga.add(addManga(div))
}
if (query.isEmpty() && tag.isEmpty()) {
manga.add(addManga(div))
}
}
return manga
}
private fun addManga(div: Element): Manga {
val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
val cover = div.selectFirst("div.h-full") ?: div.selectFirst("a")
return Manga(
id = generateUid(href),
url = href,
publicUrl = href.toAbsoluteUrl(div.host ?: domain),
coverUrl = cover?.styleValueOrNull("background-image")?.cssUrl().orEmpty(),
title = div.selectFirstOrThrow("h3").text().orEmpty(),
altTitle = null,
rating = RATING_UNKNOWN,
tags = div.select("div.gap-1 a").mapNotNullToSet { a ->
MangaTag(
key = a.attr("href").substringAfterLast('='),
title = a.text().toTitleCase(),
source = source,
)
},
author = null,
state = null,
source = source,
isNsfw = isNsfwSource,
)
}
private fun String.cssUrl(): String? {
val fromIndex = indexOf("url(")
if (fromIndex == -1) {
return null
}
val toIndex = indexOf(')', startIndex = fromIndex)
return if (toIndex == -1) {
null
} else {
substring(fromIndex + 4, toIndex).trim()
}
}
override suspend fun getAvailableTags(): Set<MangaTag> {
val doc = webClient.httpGet("https://$domain/$listUrl").parseHtml()
return doc.requireElementById("series_tags_page").select("button").mapNotNullToSet { button ->
val key = button.attr("tag") ?: return@mapNotNullToSet null
val name = button.text().toTitleCase(sourceLocale)
MangaTag(
key = key,
title = name,
source = source,
)
}
}
protected open val selectDesc = "div.grid > div.overflow-hidden > p"
protected open val selectState = "div[alt=Status]"
protected open val selectTag = "div.grid:has(>h1) > div > a"
protected open val selectAuthor = "div[alt=Author]"
protected open val selectChapter = "#chapters > a:not(:has(.text-sm span:matches(Upcoming)))"
override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
val fullUrl = manga.url.toAbsoluteUrl(domain)
val doc = webClient.httpGet(fullUrl).parseHtml()
val dateFormat = SimpleDateFormat(datePattern, sourceLocale)
manga.copy(
tags = doc.body().select(selectTag).mapNotNullToSet { a ->
MangaTag(
key = a.attr("href").substringAfterLast('='),
title = a.text().toTitleCase(),
source = source,
)
},
description = doc.selectFirstOrThrow(selectDesc).html(),
state = when (
doc.selectFirstOrThrow(selectState).text().lowercase()
) {
in ongoing -> MangaState.ONGOING
in finished -> MangaState.FINISHED
in paused -> MangaState.PAUSED
in upcoming -> MangaState.UPCOMING
else -> null
},
chapters = doc.select(selectChapter)
.mapChapters(reversed = true) { i, a ->
val href = a.attrAsRelativeUrl("href")
val name = a.selectFirstOrThrow("span.truncate").text()
val dateText = a.selectLast("div.text-xs.w-fit")?.text() ?: "0"
MangaChapter(
id = generateUid(href),
name = name,
number = i + 1f,
volume = 0,
url = href,
scanlator = null,
uploadDate = parseChapterDate(
dateFormat,
dateText,
),
branch = null,
source = source,
)
},
)
}
protected open val selectPage = "#pages > img"
override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
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,
preview = null,
source = source,
)
}
}
protected fun parseChapterDate(dateFormat: DateFormat, date: String?): Long {
val d = date?.lowercase() ?: return 0
return when {
d.endsWith(" ago") -> parseRelativeDate(date)
d.startsWith("year") -> Calendar.getInstance().apply {
add(Calendar.DAY_OF_MONTH, -1)
set(Calendar.HOUR_OF_DAY, 0)
set(Calendar.MINUTE, 0)
set(Calendar.SECOND, 0)
set(Calendar.MILLISECOND, 0)
}.timeInMillis
d.startsWith("today") -> Calendar.getInstance().apply {
set(Calendar.HOUR_OF_DAY, 0)
set(Calendar.MINUTE, 0)
set(Calendar.SECOND, 0)
set(Calendar.MILLISECOND, 0)
}.timeInMillis
date.contains(Regex("""\d(st|nd|rd|th)""")) -> date.split(" ").map {
if (it.contains(Regex("""\d\D\D"""))) {
it.replace(Regex("""\D"""), "")
} else {
it
}
}.let { dateFormat.tryParse(it.joinToString(" ")) }
else -> dateFormat.tryParse(date)
}
}
private fun parseRelativeDate(date: String): Long {
val number = Regex("""(\d+)""").find(date)?.value?.toIntOrNull() ?: return 0
val cal = Calendar.getInstance()
return when {
WordSet("second").anyWordIn(date) -> cal.apply { add(Calendar.SECOND, -number) }.timeInMillis
WordSet("minute", "minutes").anyWordIn(date) -> cal.apply { add(Calendar.MINUTE, -number) }.timeInMillis
WordSet("hour", "hours").anyWordIn(date) -> cal.apply { add(Calendar.HOUR, -number) }.timeInMillis
WordSet("day", "days").anyWordIn(date) -> cal.apply { add(Calendar.DAY_OF_MONTH, -number) }.timeInMillis
WordSet("month", "months").anyWordIn(date) -> cal.apply { add(Calendar.MONTH, -number) }.timeInMillis
WordSet("year").anyWordIn(date) -> cal.apply { add(Calendar.YEAR, -number) }.timeInMillis
else -> 0
}
}
}

11
src/main/kotlin/org/koitharu/kotatsu/parsers/site/keyoapp/en/EzManga.kt Normal file
View File

@@ -0,0 +1,11 @@
package org.koitharu.kotatsu.parsers.site.keyoapp.en
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.site.keyoapp.KeyoappParser
@MangaSourceParser("EZMANGA", "EzManga", "en")
internal class EzManga(context: MangaLoaderContext) :
KeyoappParser(context, MangaParserSource.EZMANGA, "ezmanga.org")

11
src/main/kotlin/org/koitharu/kotatsu/parsers/site/keyoapp/en/KewnScans.kt Normal file
View File

@@ -0,0 +1,11 @@
package org.koitharu.kotatsu.parsers.site.keyoapp.en
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.site.keyoapp.KeyoappParser
@MangaSourceParser("KEWNSCANS", "KewnScans", "en")
internal class KewnScans(context: MangaLoaderContext) :
KeyoappParser(context, MangaParserSource.KEWNSCANS, "kewnscans.org")

11
src/main/kotlin/org/koitharu/kotatsu/parsers/site/keyoapp/en/LaidBackScans.kt Normal file
View File

@@ -0,0 +1,11 @@
package org.koitharu.kotatsu.parsers.site.keyoapp.en
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.site.keyoapp.KeyoappParser
@MangaSourceParser("LAIDBACKSCANS", "LaidBackScans", "en")
internal class LaidBackScans(context: MangaLoaderContext) :
KeyoappParser(context, MangaParserSource.LAIDBACKSCANS, "laidbackscans.org")

11
src/main/kotlin/org/koitharu/kotatsu/parsers/site/keyoapp/fr/AnteikuScan.kt Normal file
View File

@@ -0,0 +1,11 @@
package org.koitharu.kotatsu.parsers.site.keyoapp.fr
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.site.keyoapp.KeyoappParser
@MangaSourceParser("ANTEIKUSCAN", "AnteikuScan", "fr")
internal class AnteikuScan(context: MangaLoaderContext) :
KeyoappParser(context, MangaParserSource.ANTEIKUSCAN, "anteikuscan.fr")

11
src/main/kotlin/org/koitharu/kotatsu/parsers/site/keyoapp/fr/Astrames.kt Normal file
View File

@@ -0,0 +1,11 @@
package org.koitharu.kotatsu.parsers.site.keyoapp.fr
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.site.keyoapp.KeyoappParser
@MangaSourceParser("ASTRAMES", "Astrames", "fr")
internal class Astrames(context: MangaLoaderContext) :
KeyoappParser(context, MangaParserSource.ASTRAMES, "astrames.fr")

11
src/main/kotlin/org/koitharu/kotatsu/parsers/site/keyoapp/fr/EdScanlation.kt Normal file
View File

@@ -0,0 +1,11 @@
package org.koitharu.kotatsu.parsers.site.keyoapp.fr
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.site.keyoapp.KeyoappParser
@MangaSourceParser("EDSCANLATION", "EdScanlation", "fr")
internal class EdScanlation(context: MangaLoaderContext) :
KeyoappParser(context, MangaParserSource.EDSCANLATION, "edscanlation.fr")

10
src/main/kotlin/org/koitharu/kotatsu/parsers/site/keyoapp/fr/StarboundScans.kt Normal file
View File

@@ -0,0 +1,10 @@
package org.koitharu.kotatsu.parsers.site.keyoapp.fr
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.site.keyoapp.KeyoappParser
@MangaSourceParser("STARBOUNDSCANS", "StarboundScans", "fr")
internal class StarboundScans(context: MangaLoaderContext) :
KeyoappParser(context, MangaParserSource.STARBOUNDSCANS, "starboundscans.org")

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/LikeMangaParser.kt
View File

@@ -219,7 +219,8 @@ internal abstract class LikeMangaParser(
MangaChapter(
id = generateUid(url),
name = li.selectFirstOrThrow("a").text(),
number = chapNum.toInt(),
number = chapNum.toFloat(),
volume = 0,
url = url,
scanlator = null,
uploadDate = parseChapterDate(

10
src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/en/ZinManga.kt
View File

@@ -1,10 +0,0 @@
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.MangaParserSource
import org.koitharu.kotatsu.parsers.site.likemanga.LikeMangaParser
@MangaSourceParser("ZINMANGA_COM", "ZinManga.com", "en")
internal class ZinManga(context: MangaLoaderContext) :
LikeMangaParser(context, MangaParserSource.ZINMANGA_COM, "zinmanga.com")

49
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/MadaraParser.kt
View File

@@ -7,8 +7,11 @@ import org.json.JSONObject
import org.jsoup.nodes.Document
import org.jsoup.nodes.Element
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
import org.koitharu.kotatsu.parsers.PagedMangaParser
import org.koitharu.kotatsu.parsers.config.ConfigKey
import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
import org.koitharu.kotatsu.parsers.exception.ParseException
import org.koitharu.kotatsu.parsers.model.*
import org.koitharu.kotatsu.parsers.util.*
import java.text.DateFormat
@@ -20,11 +23,39 @@ internal abstract class MadaraParser(
source: MangaParserSource,
domain: String,
pageSize: Int = 12,
) : PagedMangaParser(context, source, pageSize) {
) : PagedMangaParser(context, source, pageSize), MangaParserAuthProvider {
override val configKeyDomain = ConfigKey.Domain(domain)
private val userAgentKey = ConfigKey.UserAgent(context.getDefaultUserAgent())
override fun onCreateConfig(keys: MutableCollection<ConfigKey<*>>) {
super.onCreateConfig(keys)
keys.add(userAgentKey)
}
override val authUrl: String
get() = "https://${domain}"
override val isAuthorized: Boolean
get() {
return context.cookieJar.getCookies(domain).any {
it.name.contains("wordpress_logged_in")
}
}
override suspend fun getUsername(): String {
val body = webClient.httpGet("https://${domain}/").parseHtml().body()
return body.selectFirst(".c-user_name")?.text()
?: run {
throw if (body.selectFirst("#loginform") != null) {
AuthRequiredException(source)
} else {
body.parseFailed("Cannot find username")
}
}
}
override val isMultipleTagsSupported = false
override val availableSortOrders: Set<SortOrder> = EnumSet.of(
@@ -333,7 +364,7 @@ internal abstract class MadaraParser(
publicUrl = href.toAbsoluteUrl(div.host ?: domain),
coverUrl = div.selectFirst("img")?.src().orEmpty(),
title = (summary?.selectFirst("h3") ?: summary?.selectFirst("h4")
?: div.selectFirst(".manga-name"))?.text().orEmpty(),
?: div.selectFirst(".manga-name") ?: div.selectFirst(".post-title"))?.text().orEmpty(),
altTitle = null,
rating = div.selectFirst("span.total_votes")?.ownText()?.toFloatOrNull()?.div(5f) ?: -1f,
tags = summary?.selectFirst(".mg_genres")?.select("a")?.mapNotNullToSet { a ->
@@ -472,7 +503,8 @@ internal abstract class MadaraParser(
MangaChapter(
id = generateUid(href),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = link,
uploadDate = parseChapterDate(
dateFormat,
@@ -506,7 +538,8 @@ internal abstract class MadaraParser(
id = generateUid(href),
url = link,
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
branch = null,
uploadDate = parseChapterDate(
dateFormat,
@@ -549,7 +582,8 @@ internal abstract class MadaraParser(
val doc = webClient.httpGet(fullUrl).parseHtml()
val chapterProtector = doc.getElementById("chapter-protector-data")
if (chapterProtector == null) {
val root = doc.body().selectFirstOrThrow(selectBodyPage)
val root = doc.body().selectFirst(selectBodyPage)
?: throw ParseException("No image found, try to log in", fullUrl)
return root.select(selectPage).map { div ->
val img = div.selectFirstOrThrow("img")
val url = img.src()?.toRelativeUrl(domain) ?: div.parseFailed("Image src not found")
@@ -649,11 +683,6 @@ internal abstract class MadaraParser(
}
}
override fun onCreateConfig(keys: MutableCollection<ConfigKey<*>>) {
super.onCreateConfig(keys)
keys.add(userAgentKey)
}
// Parses dates in this form:
// 21 hours ago
private fun parseRelativeDate(date: String): Long {

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/Ero18x.kt
View File

@@ -33,7 +33,8 @@ internal class Ero18x(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = link,
uploadDate = if (dateText == "Newly Published!") {
parseChapterDate(

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/all/ManhwaRaw.kt
View File

@@ -31,7 +31,8 @@ internal class ManhwaRaw(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = link,
uploadDate = if (dateText == "Newly Published!") {
parseChapterDate(

2
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/LekManga.kt
View File

@@ -6,5 +6,5 @@ import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
@MangaSourceParser("MANGALEK", "LekManga", "ar")
internal class MangaLek(context: MangaLoaderContext) :
internal class LekManga(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.MANGALEK, "lekmanga.net", pageSize = 10)

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/LekMangaCom.kt
View File

@@ -31,7 +31,8 @@ internal class LekMangaCom(context: MangaLoaderContext) :
id = generateUid(href),
url = link,
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
branch = null,
uploadDate = parseChapterDate(
dateFormat,

2
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/LikeMangaNet.kt
View File

@@ -6,5 +6,5 @@ import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
@MangaSourceParser("LIKEMANGANET", "Like-Manga.net", "ar")
internal class MangaLikeNet(context: MangaLoaderContext) :
internal class LikeMangaNet(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.LIKEMANGANET, "like-manga.net", pageSize = 10)

6
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/RocksManga.kt → src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/MangaPeak.kt
View File

@@ -5,6 +5,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
@MangaSourceParser("ROCKSMANGA", "RocksManga", "ar")
internal class RocksManga(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.ROCKSMANGA, "rocks-manga.com")
@MangaSourceParser("MANGAPEAK", "MangaPeak", "ar")
internal class MangaPeak(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.MANGAPEAK, "mangapeak.org")

50
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ar/RocksManga.kt Normal file
View File

@@ -0,0 +1,50 @@
package org.koitharu.kotatsu.parsers.site.madara.ar
import org.jsoup.nodes.Document
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaChapter
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
import org.koitharu.kotatsu.parsers.util.attrAsRelativeUrlOrNull
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
@MangaSourceParser("ROCKSMANGA", "RocksManga", "ar")
internal class RocksManga(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.ROCKSMANGA, "rocks-manga.com") {
override val selectChapter = "ul#chapter-list li.chapter-item"
override val datePattern = "d MMMM yyyy"
override val selectDate = ".ch-post-time"
override val selectBodyPage = "div.reading-content"
override val selectPage = "img"
override val selectDesc = ".story"
override suspend fun loadChapters(mangaUrl: String, document: Document): List<MangaChapter> {
val dateFormat = SimpleDateFormat(datePattern, sourceLocale)
return document.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(".ch-title")?.text() ?: a.ownText()
MangaChapter(
id = generateUid(href),
url = link,
name = name,
number = i + 1f,
volume = 0,
branch = null,
uploadDate = parseChapterDate(
dateFormat,
dateText,
),
scanlator = null,
source = source,
)
}
}
}

2
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/AnshScans.kt
View File

@@ -1,10 +1,12 @@
package org.koitharu.kotatsu.parsers.site.madara.en
import org.koitharu.kotatsu.parsers.Broken
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
@Broken
@MangaSourceParser("ANSHSCANS", "AnshScans", "en")
internal class AnshScans(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.ANSHSCANS, "anshscans.org", 10) {

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Hentaixdickgirl.kt
View File

@@ -28,7 +28,8 @@ internal class Hentaixdickgirl(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = link,
uploadDate = parseChapterDate(
dateFormat,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/InstaManhwa.kt
View File

@@ -121,7 +121,8 @@ internal class InstaManhwa(context: MangaLoaderContext) :
id = generateUid(href),
url = link,
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
branch = null,
uploadDate = parseChapterDate(
dateFormat,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/IsekaiScan.kt
View File

@@ -125,7 +125,8 @@ internal class IsekaiScan(context: MangaLoaderContext) :
id = generateUid(href),
url = link,
name = a.ownText(),
number = i + 1,
number = i + 1f,
volume = 0,
branch = null,
uploadDate = parseChapterDate(
dateFormat,

2
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/IsekaiScanEuParser.kt
View File

@@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.model.*
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
import org.koitharu.kotatsu.parsers.util.*
@MangaSourceParser("ISEKAISCAN_EU", "IsekaiScan.to", "en")
@MangaSourceParser("ISEKAISCAN_EU", "ParagonScans", "en")
internal class IsekaiScanEuParser(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.ISEKAISCAN_EU, "paragonscans.com") {

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaDass.kt
View File

@@ -161,7 +161,8 @@ internal class MangaDass(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = link,
uploadDate = parseChapterDate(
dateFormat,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaDistrict.kt
View File

@@ -33,7 +33,8 @@ internal class MangaDistrict(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = a.ownText(),
number = i + 1,
number = i + 1f,
volume = 0,
url = href,
uploadDate = parseChapterDate(
dateFormat,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaDna.kt
View File

@@ -151,7 +151,8 @@ internal class MangaDna(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = link,
uploadDate = parseChapterDate(
dateFormat,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaPure.kt
View File

@@ -127,7 +127,8 @@ internal class MangaPure(context: MangaLoaderContext) :
id = generateUid(href),
url = link,
name = a.ownText(),
number = i + 1,
number = i + 1f,
volume = 0,
branch = null,
uploadDate = parseChapterDate(
dateFormat,

8
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Paragonscans.kt → src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaTxTo.kt
View File

@@ -5,8 +5,8 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
@MangaSourceParser("PARAGONSCANS", "ParagonScans", "en")
internal class Paragonscans(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.PARAGONSCANS, "paragonscans.com", pageSize = 50) {
override val datePattern = "MM/dd/yyyy"
@MangaSourceParser("MANGATX_TO", "MangaTx.to", "en")
internal class MangaTxTo(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.MANGATX_TO, "mangatx.to", 10) {
override val tagPrefix = "manhua-genre/"
}

2
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Manhuaplus.kt
View File

@@ -11,7 +11,7 @@ import org.koitharu.kotatsu.parsers.util.*
@MangaSourceParser("MANHUAPLUS", "ManhuaPlus", "en")
internal class Manhuaplus(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.MANHUAPLUS, "manhuaplus.org") {
MadaraParser(context, MangaParserSource.MANHUAPLUS, "manhuaplus.com") {
override val withoutAjax = true

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ManhwaTop.kt
View File

@@ -39,7 +39,8 @@ internal class ManhwaTop(context: MangaLoaderContext) :
id = generateUid(href),
url = link,
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
branch = null,
uploadDate = parseChapterDate(
dateFormat,

2
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ResetScans.kt
View File

@@ -27,7 +27,7 @@ internal class ResetScans(context: MangaLoaderContext) :
webClient.httpPost(url, emptyMap()).parseHtml()
}
val dateFormat = SimpleDateFormat(datePattern, sourceLocale)
return doc.select(selectChapter).mapChapters(reversed = true) { i, li ->
return doc.select(selectChapter).mapChapters(reversed = true) { _, li ->
val a = li.getElementsByTag("a").findWithText()
val href = a?.attrAsRelativeUrlOrNull("href") ?: li.parseFailed("Link is missing")
val link = href + stylePage

14
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/StoneScape.kt Normal file
View File

@@ -0,0 +1,14 @@
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.MangaParserSource
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
@MangaSourceParser("STONESCAPE", "StoneScape", "en")
internal class StoneScape(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.STONESCAPE, "stonescape.xyz", 10) {
override val listUrl = "series/"
override val tagPrefix = "series-genre/"
}

13
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/TcbScansManga.kt Normal file
View File

@@ -0,0 +1,13 @@
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.MangaParserSource
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
@MangaSourceParser("TCBSCANSMANGA", "TcbScansManga", "en")
internal class TcbScansManga(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.TCBSCANSMANGA, "tcbscans-manga.com", 10) {
override val selectPage = "img"
}

5
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/TopManhua.kt
View File

@@ -5,9 +5,10 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
@MangaSourceParser("TOPMANHUA", "TopManhua", "en")
@MangaSourceParser("TOPMANHUA", "ManhuaTop", "en")
internal class TopManhua(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.TOPMANHUA, "topmanhua.com") {
MadaraParser(context, MangaParserSource.TOPMANHUA, "manhuatop.org") {
override val tagPrefix = "manhua-genre/"
override val listUrl = "manhua/"
override val datePattern = "MM/dd/yyyy"
}

12
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ZinChanManga.kt Normal file
View File

@@ -0,0 +1,12 @@
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.MangaParserSource
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
@MangaSourceParser("ZINCHANMANGA", "ZinChanManga", "en", ContentType.HENTAI)
internal class ZinChanManga(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.ZINCHANMANGA, "zinchanmanga.com", 10)

5
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/Zinmanga.kt
View File

@@ -5,8 +5,9 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
@MangaSourceParser("ZINMANGA", "ZinManga.com", "en")
@MangaSourceParser("ZINMANGA", "ZinManga", "en")
internal class Zinmanga(context: MangaLoaderContext) :
MadaraParser(context, MangaParserSource.ZINMANGA, "zinmanga.com") {
MadaraParser(context, MangaParserSource.ZINMANGA, "zinmanga.net") {
override val datePattern = "MM/dd/yyyy"
override val withoutAjax = true
}

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/ManhwaEs.kt
View File

@@ -32,7 +32,8 @@ internal class ManhwaEs(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = link,
uploadDate = if (dateText == "¡Recién publicado!") {
parseChapterDate(

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/ManhwaLatino.kt
View File

@@ -35,7 +35,8 @@ internal class ManhwaLatino(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = link,
uploadDate = parseChapterDate(
dateFormat,

3
src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/TmoManga.kt
View File

@@ -99,7 +99,8 @@ internal class TmoManga(context: MangaLoaderContext) :
MangaChapter(
id = generateUid(href),
name = name,
number = i + 1,
number = i + 1f,
volume = 0,
url = link,
uploadDate = 0,
source = source,

Some files were not shown because too many files have changed in this diff Show More