Merge branch 'master' into source/neox

.github/ISSUE_TEMPLATE/report_issue.yml

@@ -1,65 +1,65 @@
 name: 🐞 Issue report
-description: Report a source issue with a source
-labels: [ bug ]
+description: Report a source issue in Kotatsu
+labels: [bug]
 body:
 
-    -   type: input
-        id: source
-        attributes:
-            label: Source information
-            description: |
-                You can find the source name in navigation drawer.
-            placeholder: |
-                Example: "MangaDex"
-        validations:
-            required: true
+  - type: input
+    id: source
+    attributes:
+      label: Source information
+      description: |
+        You can find the source name in navigation drawer.
+      placeholder: |
+        Example: "MangaDex"
+    validations:
+      required: true
 
-    -   type: textarea
-        id: reproduce-steps
-        attributes:
-            label: Steps to reproduce
-            description: Provide an example of the issue.
-            placeholder: |
-                Example:
-                  1. First step
-                  2. Second step
-                  3. Issue here
-        validations:
-            required: false
+  - type: textarea
+    id: reproduce-steps
+    attributes:
+      label: Steps to reproduce
+      description: Provide an example of the issue.
+      placeholder: |
+        Example:
+          1. First step
+          2. Second step
+          3. Issue here
+    validations:
+      required: false
 
-    -   type: input
-        id: kotatsu-version
-        attributes:
-            label: Kotatsu version
-            description: |
-                You can find your Kotatsu version in **Settings → About**.
-            placeholder: |
-                Example: "3.3"
-        validations:
-            required: true
+  - type: input
+    id: kotatsu-version
+    attributes:
+      label: Kotatsu version
+      description: |
+        You can find your Kotatsu version in **Settings → About**.
+      placeholder: |
+        Example: "3.3"
+    validations:
+      required: true
 
-    -   type: input
-        id: android-version
-        attributes:
-            label: Android version
-            description: |
-                You can find this somewhere in your Android settings.
-            placeholder: |
-                Example: "Android 12"
-        validations:
-            required: false
+  - type: input
+    id: android-version
+    attributes:
+      label: Android version
+      description: |
+        You can find this somewhere in your Android settings.
+      placeholder: |
+        Example: "Android 12"
+    validations:
+      required: false
 
-    -   type: textarea
-        id: other-details
-        attributes:
-            label: Other details
-            placeholder: |
-                Additional details and attachments.
+  - type: textarea
+    id: other-details
+    attributes:
+      label: Other details
+      placeholder: |
+        Additional details and attachments.
 
-    -   type: checkboxes
-        id: acknowledgements
-        attributes:
-            label: Acknowledgements
-            options:
-                -   label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
-                    required: true
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      options:
+        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+          required: true

.github/ISSUE_TEMPLATE/request_source.yml

@@ -1,53 +1,50 @@
 name: 🌐 Source request
 description: Suggest a new source for Kotatsu
-labels: [ source request ]
+labels: [source request]
 body:
 
-    -   type: markdown
-        attributes:
-            value: Please specify source **name** and **language** in the issue title
-    -   type: input
-        id: name
-        attributes:
-            label: Source name
-            placeholder: |
-                Example: "Example Scans"
-        validations:
-            required: true
+  - type: input
+    id: name
+    attributes:
+      label: Source name
+      placeholder: |
+        Example: "Example Scans"
+    validations:
+      required: true
 
-    -   type: input
-        id: link
-        attributes:
-            label: Source link
-            placeholder: |
-                Example: "https://example.org"
-        validations:
-            required: true
+  - type: input
+    id: link
+    attributes:
+      label: Source link
+      placeholder: |
+        Example: "https://example.org"
+    validations:
+      required: true
 
-    -   type: input
-        id: language
-        attributes:
-            label: Language
-            placeholder: |
-                Example: "English"
-        validations:
-            required: true
+  - type: input
+    id: language
+    attributes:
+      label: Language
+      placeholder: |
+        Example: "English"
+    validations:
+      required: true
 
-    -   type: textarea
-        id: other-details
-        attributes:
-            label: Other details
-            placeholder: |
-                Additional details and attachments.
+  - type: textarea
+    id: other-details
+    attributes:
+      label: Other details
+      placeholder: |
+        Additional details and attachments.
 
-    -   type: checkboxes
-        id: acknowledgements
-        attributes:
-            label: Acknowledgements
-            options:
-                -   label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
-                    required: true
-                -   label: I have checked that the source does not already exist on the app.
-                    required: true
-                -   label: I have checked that the source does not already exist by searching the [GitHub repository](https://github.com/KotatsuApp/kotatsu-parsers) and verified it does not appear in the code base.
-                    required: true
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      options:
+        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+          required: true
+        - label: I have checked that the source does not already exist on the app.
+          required: true
+        - label: I have checked that the source does not already exist by searching the [GitHub repository](https://github.com/KotatsuApp/kotatsu-parsers) and verified it does not appear in the code base.
+          required: true

.github/workflows/test-parsers.yml

@@ -1,27 +1,27 @@
 name: Parsers test
 
 on:
-    workflow_dispatch:
-    pull_request:
-        paths:
-            - 'src/main/kotlin/org/koitharu/kotatsu/parsers/site/**'
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - 'src/main/kotlin/org/koitharu/kotatsu/parsers/site/**'
 
 permissions:
-    contents: read
+  contents: read
 
 jobs:
-    build-and-test:
-        runs-on: ubuntu-latest
-        steps:
-            -   uses: actions/checkout@v3
-            -   uses: actions/setup-java@v3
-                with:
-                    java-version: '11'
-                    distribution: 'temurin'
-                    cache: 'gradle'
-            -   run: ./gradlew :test --tests "org.koitharu.kotatsu.parsers.MangaParserTest" || true
-            -   run: ./gradlew generateTestsReport
-            -   uses: actions/upload-artifact@v3
-                with:
-                    name: Report
-                    path: build/test-results-html/TEST-org.koitharu.kotatsu.parsers.MangaParserTest.htm
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: 'gradle'
+      - run: ./gradlew :test --tests "org.koitharu.kotatsu.parsers.MangaParserTest" || true
+      - run: ./gradlew generateTestsReport
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Report
+          path: build/test-results-html/TEST-org.koitharu.kotatsu.parsers.MangaParserTest.htm

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.0" />
+    <option name="version" value="1.6.21" />
   </component>
 </project>

CONTRIBUTING.md

@@ -35,11 +35,11 @@ If it does not contain any documentation about
 API, [explore network requests](https://firefox-source-docs.mozilla.org/devtools-user/):
 some websites use ajax.
 
-- [Example](https://github.com/KotatsuApp/kotatsu-parsers/blob/master/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/DesuMeParser.kt)
+- [Example](https://github.com/KotatsuApp/kotatsu-parsers/blob/master/src/main/kotlin/org/koitharu/kotatsu/parsers/site/DesuMeParser.kt)
   of Json API usage.
-- [Example](https://github.com/KotatsuApp/kotatsu-parsers/blob/master/src/main/kotlin/org/koitharu/kotatsu/parsers/site/be/AnibelParser.kt)
+- [Example](https://github.com/KotatsuApp/kotatsu-parsers/blob/master/src/main/kotlin/org/koitharu/kotatsu/parsers/site/AnibelParser.kt)
   of GraphQL API usage
-- [Example](https://github.com/KotatsuApp/kotatsu-parsers/blob/master/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaTownParser.kt)
+- [Example](https://github.com/KotatsuApp/kotatsu-parsers/blob/master/src/main/kotlin/org/koitharu/kotatsu/parsers/site/MangaTownParser.kt)
   of pure HTML parsing.
 
 If website is based on some engine it is rationally to use common base class for this one (for example, Madara wordress

README.md

@@ -40,7 +40,7 @@ This library provides manga sources.
 3. Usage in code
 
    ```kotlin
-   val parser = mangaLoaderContext.newParserInstance(MangaSource.MANGADEX)
+   val parser = MangaSource.MANGADEX.newParser(mangaLoaderContext)
    ```
 
    `mangaLoaderContext` is an implementation of the `MangaLoaderContext` class.

build.gradle

@@ -2,8 +2,8 @@ import tasks.ReportGenerateTask
 
 plugins {
 	id 'java-library'
-	id 'org.jetbrains.kotlin.jvm' version '1.9.20'
-	id 'com.google.devtools.ksp' version '1.9.20-1.0.14'
+	id 'org.jetbrains.kotlin.jvm'
+	id 'com.google.devtools.ksp'
 	id 'maven-publish'
 }
 
@@ -16,27 +16,28 @@ test {
 
 compileKotlin {
 	kotlinOptions {
+		jvmTarget = '1.8'
 		freeCompilerArgs += [
-			'-opt-in=kotlin.RequiresOptIn',
-			'-opt-in=kotlin.contracts.ExperimentalContracts',
-			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
-			'-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi',
+				'-opt-in=kotlin.RequiresOptIn',
+				'-opt-in=kotlin.contracts.ExperimentalContracts',
+				'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+				'-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi',
 		]
 	}
 }
 
 compileTestKotlin {
 	kotlinOptions {
+		jvmTarget = '1.8'
 		freeCompilerArgs += [
-			'-opt-in=kotlin.RequiresOptIn',
-			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
-			'-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi',
+				'-opt-in=kotlin.RequiresOptIn',
+				'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+				'-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi',
 		]
 	}
 }
 
 kotlin {
-	jvmToolchain(11)
 	sourceSets {
 		main.kotlin.srcDirs += 'build/generated/ksp/main/kotlin'
 	}
@@ -53,20 +54,21 @@ afterEvaluate {
 }
 
 dependencies {
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
-	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
-	implementation 'com.squareup.okio:okio:3.6.0'
-	api 'org.jsoup:jsoup:1.16.2'
-	implementation 'org.json:json:20231013'
-	implementation 'androidx.collection:collection-ktx:1.3.0'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+	implementation 'com.squareup.okio:okio:3.2.0'
+	api 'org.jsoup:jsoup:1.15.3'
+	implementation 'org.json:json:20220320'
+	implementation 'androidx.collection:collection-ktx:1.2.0'
 
 	ksp project(':kotatsu-parsers-ksp')
 
-	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
-	testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
-	testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
+	testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
+	testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.0'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 	testImplementation 'io.webfolder:quickjs:1.1.0'
 }
 
-tasks.register('generateTestsReport', ReportGenerateTask)
+//noinspection ConfigurationAvoidance
+task generateTestsReport(type: ReportGenerateTask)

buildSrc/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'org.jetbrains.kotlin.jvm' version '1.8.22'
+	id('org.jetbrains.kotlin.jvm') version '1.6.21'
 }
 repositories {
 	mavenCentral()
@@ -8,6 +8,6 @@ repositories {
 dependencies {
 	implementation gradleApi()
 	implementation 'org.simpleframework:simple-xml:2.7.1'
-	implementation 'com.soywiz.korlibs.korte:korte-jvm:4.0.9'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
-}
+	implementation 'com.soywiz.korlibs.korte:korte-jvm:3.0.0-Beta5'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3'
+}

buildSrc/src/main/kotlin/tasks/ReportGenerateTask.kt

@@ -1,6 +1,6 @@
 package tasks
 
-import korlibs.template.Template
+import com.soywiz.korte.Template
 import kotlinx.coroutines.runBlocking
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.TaskAction
@@ -42,13 +42,10 @@ open class ReportGenerateTask : DefaultTask() {
 		val results = LinkedHashMap<String, LinkedHashMap<String, TestCase>>()
 		val tests = LinkedHashSet<String>()
 		for (case in testSuite.testCases) {
-			if (!case.isValid()) {
-				continue
-			}
 			tests.add(case.testName)
 			val map = results.getOrPut(case.source) { LinkedHashMap() }
 			val oldValue = map.put(case.testName, case)
-			check(oldValue == null) { "Check failed: $oldValue" }
+			check(oldValue == null)
 		}
 
 		val failPercent = (testSuite.failures.toDouble() / testSuite.tests * 100.0).roundToInt()

buildSrc/src/main/kotlin/tasks/model/TestCase.kt

@@ -19,16 +19,14 @@ class TestCase {
 	var failure: Failure? = null
 
 	val index by lazy {
-		name.split('|').getOrNull(0)?.toIntOrNull() ?: 0
+		name.split('|')[0].toInt()
 	}
 
 	val testName by lazy {
-		name.split('|').getOrNull(1).orEmpty()
+		name.split('|')[1]
 	}
 
 	val source by lazy {
-		name.split('|').getOrNull(2).orEmpty()
+		name.split('|')[2]
 	}
-
-	fun isValid() = name.count { it == '|' } == 2
-}
+}

buildSrc/src/main/resources/report.html

@@ -57,7 +57,7 @@
 				data-bs-toggle="modal" style="cursor: pointer;">
 				<i data-feather="power"></i>
 			</td>
-			{% elseif case.failure.type == 'org.koitharu.kotatsu.parsers.CloudFlareProtectedException' %}
+			{% elseif case.failure.type == 'org.koitharu.kotatsu.parsers.exception.CloudFlareProtectedException' %}
 			<td class="table-secondary text-center" data-bs-target="#failure_{{ case.hashCode }}"
 				data-bs-toggle="modal" style="cursor: pointer;">
 				<i data-feather="shield"></i>
@@ -101,6 +101,29 @@
 	feather.replace()
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </script>
 </body>
-</html>
+</html>

gradle.properties

@@ -1,2 +1 @@
 kotlin.code.style=official
-org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=4096m

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kotatsu-parsers-ksp/build.gradle

@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-	implementation 'com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14'
-}
+	implementation 'com.google.devtools.ksp:symbol-processing-api:1.6.21-1.0.5'
+}

kotatsu-parsers-ksp/src/main/kotlin/org/koitharu/kotatsu/parsers/ksp/ParserProcessor.kt

@@ -70,13 +70,10 @@ class ParserProcessor(
 				import org.koitharu.kotatsu.parsers.model.MangaSource
 				
 				@Suppress("DEPRECATION")
-				@InternalParsersApi
-				@Deprecated("", replaceWith = ReplaceWith("context.newParserInstance(this)"))
 				fun MangaSource.newParser(context: MangaLoaderContext): MangaParser = when (this) {
 				
 			""".trimIndent(),
 		)
-		//language=kotlin
 		sourcesWriter?.write(
 			"""
 				package org.koitharu.kotatsu.parsers.model
@@ -84,9 +81,8 @@ class ParserProcessor(
 				enum class MangaSource(
 					val title: String,
 					val locale: String?,
-					val contentType: ContentType,
 				) {
-					LOCAL("Local", null, ContentType.OTHER),
+					LOCAL("Local", null),
 				
 			""".trimIndent(),
 		)
@@ -109,7 +105,7 @@ class ParserProcessor(
 		)
 		sourcesWriter?.write(
 			"""
-				DUMMY("Dummy", null, ContentType.OTHER),
+				DUMMY("Dummy", null),
 				;
 			}
 			""".trimIndent(),
@@ -121,8 +117,6 @@ class ParserProcessor(
 		private val factoryWriter: Writer?,
 	) : KSVisitorVoid() {
 
-		private val titles = HashMap<String, String>()
-
 		override fun visitClassDeclaration(classDeclaration: KSClassDeclaration, data: Unit) {
 			if (classDeclaration.classKind != ClassKind.CLASS || classDeclaration.isAbstract()) {
 				logger.error("Only non-abstract can be annotated with @MangaSourceParser", classDeclaration)
@@ -132,7 +126,6 @@ class ParserProcessor(
 			val name = annotation.arguments.single { it.name?.asString() == "name" }.value as String
 			val title = annotation.arguments.single { it.name?.asString() == "title" }.value as String
 			val locale = annotation.arguments.single { it.name?.asString() == "locale" }.value as String
-			val type = annotation.arguments.single { it.name?.asString() == "type" }.value
 			val localeString = if (locale.isEmpty()) "null" else "\"$locale\""
 			val localeObj = if (locale.isEmpty()) null else Locale(locale)
 			val localeTitle = localeObj?.getDisplayLanguage(localeObj)
@@ -151,13 +144,7 @@ class ParserProcessor(
 					classDeclaration,
 				)
 			}
-			val className = checkNotNull(classDeclaration.qualifiedName?.asString()) { "Class name is null" }
-
-			val prevTitleClass = titles.put(title, className)
-			if (prevTitleClass != null) {
-				logger.warn("Source title duplication: \"$title\" is assigned to both $prevTitleClass and $className")
-			}
-
+			val className = classDeclaration.qualifiedName?.asString()
 			factoryWriter?.write("\tMangaSource.$name -> $className(context)\n")
 			val deprecationString = if (deprecation != null) {
 				val reason = deprecation.arguments
@@ -165,7 +152,7 @@ class ParserProcessor(
 				"@Deprecated(\"$reason\") "
 			} else ""
 			val localeComment = localeTitle?.toTitleCase(localeObj)?.let { " /* $it */" }.orEmpty()
-			sourcesWriter?.write("\t$deprecationString$name(\"$title\", $localeString$localeComment, ContentType.$type),\n")
+			sourcesWriter?.write("\t$deprecationString$name(\"$title\", $localeString$localeComment),\n")
 		}
 	}
-}
+}

settings.gradle

@@ -1,16 +1,19 @@
 pluginManagement {
+	plugins {
+		id 'com.google.devtools.ksp' version '1.6.21-1.0.5'
+		id 'org.jetbrains.kotlin.jvm' version '1.6.21'
+	}
 	repositories {
-		google()
-		mavenCentral()
 		gradlePluginPortal()
+		google()
 	}
 }
 
 dependencyResolutionManagement {
+	repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
 	repositories {
 		google()
 		mavenCentral()
-		gradlePluginPortal()
 	}
 }
 

src/main/kotlin/org/koitharu/kotatsu/parsers/InternalParsersApi.kt

@@ -11,4 +11,4 @@ package org.koitharu.kotatsu.parsers
 @SinceKotlin("1.3")
 @RequiresOptIn
 @MustBeDocumented
-annotation class InternalParsersApi
+annotation class InternalParsersApi()

src/main/kotlin/org/koitharu/kotatsu/parsers/MangaLoaderContext.kt

@@ -8,25 +8,22 @@ import java.util.*
 
 abstract class MangaLoaderContext {
 
-	abstract val httpClient: OkHttpClient
+    abstract val httpClient: OkHttpClient
 
-	abstract val cookieJar: CookieJar
+    abstract val cookieJar: CookieJar
 
-	@Suppress("DEPRECATION")
-	fun newParserInstance(source: MangaSource): MangaParser = source.newParser(this)
+    open fun encodeBase64(data: ByteArray): String = Base64.getEncoder().encodeToString(data)
 
-	open fun encodeBase64(data: ByteArray): String = Base64.getEncoder().encodeToString(data)
+    open fun decodeBase64(data: String): ByteArray = Base64.getDecoder().decode(data)
 
-	open fun decodeBase64(data: String): ByteArray = Base64.getDecoder().decode(data)
+    open fun getPreferredLocales(): List<Locale> = listOf(Locale.getDefault())
 
-	open fun getPreferredLocales(): List<Locale> = listOf(Locale.getDefault())
+    /**
+     * Execute JavaScript code and return result
+     * @param script JavaScript source code
+     * @return execution result as string, may be null
+     */
+    abstract suspend fun evaluateJs(script: String): String?
 
-	/**
-	 * Execute JavaScript code and return result
-	 * @param script JavaScript source code
-	 * @return execution result as string, may be null
-	 */
-	abstract suspend fun evaluateJs(script: String): String?
-
-	abstract fun getConfig(source: MangaSource): MangaSourceConfig
+    abstract fun getConfig(source: MangaSource): MangaSourceConfig
 }

src/main/kotlin/org/koitharu/kotatsu/parsers/MangaParser.kt

@@ -5,10 +5,8 @@ import okhttp3.Headers
 import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.network.OkHttpWebClient
-import org.koitharu.kotatsu.parsers.network.UserAgents
 import org.koitharu.kotatsu.parsers.network.WebClient
 import org.koitharu.kotatsu.parsers.util.FaviconParser
-import org.koitharu.kotatsu.parsers.util.RelatedMangaFinder
 import org.koitharu.kotatsu.parsers.util.domain
 import org.koitharu.kotatsu.parsers.util.toAbsoluteUrl
 import java.util.*
@@ -23,57 +21,32 @@ abstract class MangaParser @InternalParsersApi constructor(
 	 *
 	 * For better performance use [EnumSet] for more than one item.
 	 */
-	abstract val availableSortOrders: Set<SortOrder>
-
-	/**
-	 * Supported [MangaState] variants for filtering. May be empty.
-	 *
-	 * For better performance use [EnumSet] for more than one item.
-	 */
-	open val availableStates: Set<MangaState>
-		get() = emptySet()
-
-	/**
-	 * Whether parser supports filtering by more than one tag
-	 */
-	open val isMultipleTagsSupported: Boolean = true
-
-	@Deprecated(
-		message = "Use availableSortOrders instead",
-		replaceWith = ReplaceWith("availableSortOrders"),
-	)
-	val sortOrders: Set<SortOrder>
-		get() = availableSortOrders
+	abstract val sortOrders: Set<SortOrder>
 
 	val config by lazy { context.getConfig(source) }
 
 	open val sourceLocale: Locale
 		get() = source.locale?.let { Locale(it) } ?: Locale.ROOT
 
-	val isNsfwSource = source.contentType == ContentType.HENTAI
-
 	/**
 	 * Provide default domain and available alternatives, if any.
 	 *
-	 * Never hardcode domain in requests, use [domain] instead.
+	 * Never hardcode domain in requests, use [getDomain] instead.
 	 */
 	@InternalParsersApi
 	abstract val configKeyDomain: ConfigKey.Domain
 
-	open val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_MOBILE)
-		.build()
+	open val headers: Headers? = null
 
 	/**
 	 * Used as fallback if value of `sortOrder` passed to [getList] is null
 	 */
 	protected open val defaultSortOrder: SortOrder
 		get() {
-			val supported = availableSortOrders
-			return SortOrder.entries.first { it in supported }
+			val supported = sortOrders
+			return SortOrder.values().first { it in supported }
 		}
 
-	@JvmField
 	protected val webClient: WebClient = OkHttpWebClient(context.httpClient, source)
 
 	/**
@@ -82,15 +55,11 @@ abstract class MangaParser @InternalParsersApi constructor(
 	 * @param offset starting from 0 and used for pagination.
 	 * Note than passed value may not be divisible by internal page size, so you should adjust it manually.
 	 * @param query search query, may be null or empty if no search needed
-	 * @param tags genres for filtering, values from [getAvailableTags] and [Manga.tags]. May be null or empty
-	 * @param sortOrder one of [availableSortOrders] or null for default value
+	 * @param tags genres for filtering, values from [getTags] and [Manga.tags]. May be null or empty
+	 * @param sortOrder one of [sortOrders] or null for default value
 	 */
 	@JvmSynthetic
 	@InternalParsersApi
-	@Deprecated(
-		"Use getList with filter instead",
-		replaceWith = ReplaceWith("getList(offset, filter)"),
-	)
 	abstract suspend fun getList(
 		offset: Int,
 		query: String?,
@@ -104,15 +73,8 @@ abstract class MangaParser @InternalParsersApi constructor(
 	 * @param offset starting from 0 and used for pagination.
 	 * @param query search query
 	 */
-	@Deprecated(
-		"Use getList with filter instead",
-		ReplaceWith(
-			"getList(offset, MangaListFilter.Search(query))",
-			"org.koitharu.kotatsu.parsers.model.MangaListFilter",
-		),
-	)
 	open suspend fun getList(offset: Int, query: String): List<Manga> {
-		return getList(offset, MangaListFilter.Search(query))
+		return getList(offset, query, null, defaultSortOrder)
 	}
 
 	/**
@@ -120,29 +82,11 @@ abstract class MangaParser @InternalParsersApi constructor(
 	 *
 	 * @param offset starting from 0 and used for pagination.
 	 * Note than passed value may not be divisible by internal page size, so you should adjust it manually.
-	 * @param tags genres for filtering, values from [getAvailableTags] and [Manga.tags]. May be null or empty
-	 * @param sortOrder one of [availableSortOrders] or null for default value
+	 * @param tags genres for filtering, values from [getTags] and [Manga.tags]. May be null or empty
+	 * @param sortOrder one of [sortOrders] or null for default value
 	 */
-	@Deprecated(
-		"Use getList with filter instead",
-		ReplaceWith(
-			"getList(offset, MangaListFilter.Advanced(sortOrder, tags, null, emptySet()))",
-			"org.koitharu.kotatsu.parsers.model.MangaListFilter",
-		),
-	)
 	open suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga> {
-		return getList(
-			offset,
-			MangaListFilter.Advanced(sortOrder ?: defaultSortOrder, tags.orEmpty(), null, emptySet()),
-		)
-	}
-
-	open suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> {
-		return when (filter) {
-			is MangaListFilter.Advanced -> getList(offset, null, filter.tags, filter.sortOrder)
-			is MangaListFilter.Search -> getList(offset, filter.query, null, defaultSortOrder)
-			null -> getList(offset, null, null, defaultSortOrder)
-		}
+		return getList(offset, null, tags, sortOrder ?: defaultSortOrder)
 	}
 
 	/**
@@ -166,18 +110,7 @@ abstract class MangaParser @InternalParsersApi constructor(
 	/**
 	 * Fetch available tags (genres) for source
 	 */
-	abstract suspend fun getAvailableTags(): Set<MangaTag>
-
-	/**
-	 * Fetch available locales for multilingual sources
-	 */
-	open suspend fun getAvailableLocales(): Set<Locale> = emptySet()
-
-	@Deprecated(
-		message = "Use getAvailableTags instead",
-		replaceWith = ReplaceWith("getAvailableTags()"),
-	)
-	suspend fun getTags(): Set<MangaTag> = getAvailableTags()
+	abstract suspend fun getTags(): Set<MangaTag>
 
 	/**
 	 * Parse favicons from the main page of the source`s website
@@ -190,14 +123,4 @@ abstract class MangaParser @InternalParsersApi constructor(
 	open fun onCreateConfig(keys: MutableCollection<ConfigKey<*>>) {
 		keys.add(configKeyDomain)
 	}
-
-	open suspend fun getRelatedManga(seed: Manga): List<Manga> {
-		return RelatedMangaFinder(listOf(this)).invoke(seed)
-	}
-
-	protected fun getParser(source: MangaSource) = if (this.source == source) {
-		this
-	} else {
-		context.newParserInstance(source)
-	}
 }

src/main/kotlin/org/koitharu/kotatsu/parsers/MangaSourceParser.kt

@@ -1,7 +1,5 @@
 package org.koitharu.kotatsu.parsers
 
-import org.koitharu.kotatsu.parsers.model.ContentType
-
 /**
  * Annotate each [MangaParser] implementation with this annotation, used by codegen
  */
@@ -13,15 +11,10 @@ annotation class MangaSourceParser(
 	val name: String,
 	/**
 	 * User-friendly title of manga source. In most case equals the website name.
-	 * Avoid extra whitespaces between the words if it is not required.
 	 */
 	val title: String,
 	/**
 	 * Language code (for example "en" or "ru") or blank if parser provide manga on different languages.
 	 */
 	val locale: String = "",
-	/**
-	 * Type of content provided by parser. See [ContentType] for more info
-	 */
-	val type: ContentType = ContentType.MANGA,
-)
+)

src/main/kotlin/org/koitharu/kotatsu/parsers/PagedMangaParser.kt

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.parsers
 
-import androidx.annotation.RestrictTo
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
@@ -9,47 +8,44 @@ import org.koitharu.kotatsu.parsers.util.Paginator
 
 @InternalParsersApi
 abstract class PagedMangaParser(
-	context: MangaLoaderContext,
-	source: MangaSource,
-	@RestrictTo(RestrictTo.Scope.TESTS) @JvmField internal val pageSize: Int,
-	searchPageSize: Int = pageSize,
+    context: MangaLoaderContext,
+    source: MangaSource,
+    pageSize: Int,
+    searchPageSize: Int = pageSize,
 ) : MangaParser(context, source) {
 
-	@JvmField
-	protected val paginator = Paginator(pageSize)
+    protected val paginator = Paginator(pageSize)
+    protected val searchPaginator = Paginator(searchPageSize)
 
-	@JvmField
-	protected val searchPaginator = Paginator(searchPageSize)
+    override suspend fun getList(offset: Int, query: String): List<Manga> {
+        return getList(searchPaginator, offset, query, null, defaultSortOrder)
+    }
 
-	override suspend fun getList(offset: Int, query: String): List<Manga> {
-		return getList(searchPaginator, offset, query, null, defaultSortOrder)
-	}
+    override suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga> {
+        return getList(paginator, offset, null, tags, sortOrder ?: defaultSortOrder)
+    }
 
-	override suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga> {
-		return getList(paginator, offset, null, tags, sortOrder ?: defaultSortOrder)
-	}
+    @InternalParsersApi
+    @Deprecated("You should use getListPage for PagedMangaParser", level = DeprecationLevel.HIDDEN)
+    final override suspend fun getList(
+        offset: Int,
+        query: String?,
+        tags: Set<MangaTag>?,
+        sortOrder: SortOrder,
+    ): List<Manga> = throw UnsupportedOperationException("You should use getListPage for PagedMangaParser")
 
-	@InternalParsersApi
-	@Deprecated("You should use getListPage for PagedMangaParser", level = DeprecationLevel.HIDDEN)
-	final override suspend fun getList(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> = throw UnsupportedOperationException("You should use getListPage for PagedMangaParser")
+    abstract suspend fun getListPage(page: Int, query: String?, tags: Set<MangaTag>?, sortOrder: SortOrder): List<Manga>
 
-	abstract suspend fun getListPage(page: Int, query: String?, tags: Set<MangaTag>?, sortOrder: SortOrder): List<Manga>
-
-	private suspend fun getList(
-		paginator: Paginator,
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val page = paginator.getPage(offset)
-		val list = getListPage(page, query, tags, sortOrder)
-		paginator.onListReceived(offset, page, list.size)
-		return list
-	}
+    private suspend fun getList(
+        paginator: Paginator,
+        offset: Int,
+        query: String?,
+        tags: Set<MangaTag>?,
+        sortOrder: SortOrder,
+    ): List<Manga> {
+        val page = paginator.getPage(offset)
+        val list = getListPage(page, query, tags, sortOrder)
+        paginator.onListReceived(offset, page, list.size)
+        return list
+    }
 }

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

@@ -7,16 +7,9 @@ sealed class ConfigKey<T>(
 	abstract val defaultValue: T
 
 	class Domain(
-		@JvmField @JvmSuppressWildcards vararg val presetValues: String,
-	) : ConfigKey<String>("domain") {
-
-		init {
-			require(presetValues.isNotEmpty()) { "You must provide at least one domain" }
-		}
-
-		override val defaultValue: String
-			get() = presetValues.first()
-	}
+		override val defaultValue: String,
+		@JvmField val presetValues: Array<String>?,
+	) : ConfigKey<String>("domain")
 
 	class ShowSuspiciousContent(
 		override val defaultValue: Boolean,

src/main/kotlin/org/koitharu/kotatsu/parsers/exception/AuthRequiredException.kt

@@ -6,7 +6,6 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 /**
  * Authorization is required for access to the requested content
  */
-class AuthRequiredException @InternalParsersApi @JvmOverloads constructor(
+class AuthRequiredException @InternalParsersApi constructor(
 	val source: MangaSource,
-	cause: Throwable? = null,
-) : RuntimeException("Authorization required", cause)
+) : RuntimeException("Authorization required")

src/main/kotlin/org/koitharu/kotatsu/parsers/exception/CloudFlareProtectedException.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers
+package org.koitharu.kotatsu.parsers.exception
 
 import okhttp3.Headers
 import okio.IOException
@@ -6,4 +6,4 @@ import okio.IOException
 class CloudFlareProtectedException(
 	val url: String,
 	val headers: Headers,
-) : IOException("Protected by CloudFlare: $url")
+) : IOException("Protected by CloudFlare: $url")

src/main/kotlin/org/koitharu/kotatsu/parsers/model/ContentType.kt

@@ -1,24 +0,0 @@
-package org.koitharu.kotatsu.parsers.model
-
-enum class ContentType {
-
-	/**
-	 * Standard manga, manhua, webtoons, etc
-	 */
-	MANGA,
-
-	/**
-	 * Use this if the source provides mostly nsfw content.
-	 */
-	HENTAI,
-
-	/**
-	 * Western comics
-	 */
-	COMICS,
-
-	/**
-	 * Use this type if no other suits your needs. For example, for an indie manga
-	 */
-	OTHER,
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/model/Favicons.kt

@@ -18,11 +18,6 @@ class Favicons internal constructor(
 
 	override fun iterator(): Iterator<Favicon> = icons.iterator()
 
-	operator fun minus(victim: Favicon): Favicons = Favicons(
-		favicons = icons.filterNot { it == victim },
-		referer = referer,
-	)
-
 	/**
 	 * Finds a favicon whose size in pixels is greater than or equal to the specified size.
 	 * If such icon is not available returns the largest icon

src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaListFilter.kt

@@ -1,29 +0,0 @@
-package org.koitharu.kotatsu.parsers.model
-
-import java.util.*
-
-sealed interface MangaListFilter {
-
-	fun isEmpty(): Boolean
-
-	val sortOrder: SortOrder?
-
-	data class Search(
-		@JvmField val query: String,
-	) : MangaListFilter {
-
-		override val sortOrder: SortOrder? = null
-
-		override fun isEmpty() = query.isBlank()
-	}
-
-	data class Advanced(
-		override val sortOrder: SortOrder,
-		@JvmField val tags: Set<MangaTag>,
-		@JvmField val locale: Locale?,
-		@JvmField val states: Set<MangaState>,
-	) : MangaListFilter {
-
-		override fun isEmpty(): Boolean = tags.isEmpty() && locale == null && states.isEmpty()
-	}
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaState.kt

@@ -1,5 +1,5 @@
 package org.koitharu.kotatsu.parsers.model
 
 enum class MangaState {
-	ONGOING, FINISHED, ABANDONED, PAUSED
-}
+	ONGOING, FINISHED
+}

src/main/kotlin/org/koitharu/kotatsu/parsers/network/OkHttpWebClient.kt

@@ -23,7 +23,9 @@ class OkHttpWebClient(
 			.get()
 			.url(url)
 			.addTags()
-			.addExtraHeaders(extraHeaders)
+		if (extraHeaders != null) {
+			request.headers(extraHeaders)
+		}
 		return httpClient.newCall(request.build()).await().ensureSuccess()
 	}
 
@@ -35,7 +37,7 @@ class OkHttpWebClient(
 		return httpClient.newCall(request.build()).await().ensureSuccess()
 	}
 
-	override suspend fun httpPost(url: HttpUrl, form: Map<String, String>, extraHeaders: Headers?): Response {
+	override suspend fun httpPost(url: HttpUrl, form: Map<String, String>): Response {
 		val body = FormBody.Builder()
 		form.forEach { (k, v) ->
 			body.addEncoded(k, v)
@@ -44,11 +46,10 @@ class OkHttpWebClient(
 			.post(body.build())
 			.url(url)
 			.addTags()
-			.addExtraHeaders(extraHeaders)
 		return httpClient.newCall(request.build()).await().ensureSuccess()
 	}
 
-	override suspend fun httpPost(url: HttpUrl, payload: String, extraHeaders: Headers?): Response {
+	override suspend fun httpPost(url: HttpUrl, payload: String): Response {
 		val body = FormBody.Builder()
 		payload.split('&').forEach {
 			val pos = it.indexOf('=')
@@ -62,18 +63,16 @@ class OkHttpWebClient(
 			.post(body.build())
 			.url(url)
 			.addTags()
-			.addExtraHeaders(extraHeaders)
 		return httpClient.newCall(request.build()).await().ensureSuccess()
 	}
 
-	override suspend fun httpPost(url: HttpUrl, body: JSONObject, extraHeaders: Headers?): Response {
+	override suspend fun httpPost(url: HttpUrl, body: JSONObject): Response {
 		val mediaType = "application/json; charset=utf-8".toMediaType()
 		val requestBody = body.toString().toRequestBody(mediaType)
 		val request = Request.Builder()
 			.post(requestBody)
 			.url(url)
 			.addTags()
-			.addExtraHeaders(extraHeaders)
 		return httpClient.newCall(request.build()).await().ensureSuccess()
 	}
 
@@ -82,14 +81,7 @@ class OkHttpWebClient(
 		body.put("operationName", null as Any?)
 		body.put("variables", JSONObject())
 		body.put("query", "{$query}")
-
-		val mediaType = "application/json; charset=utf-8".toMediaType()
-		val requestBody = body.toString().toRequestBody(mediaType)
-		val request = Request.Builder()
-			.post(requestBody)
-			.url(endpoint)
-			.addTags()
-		val json = httpClient.newCall(request.build()).await().parseJson()
+		val json = httpPost(endpoint, body).parseJson()
 		json.optJSONArray("errors")?.let {
 			if (it.length() != 0) {
 				throw GraphQLException(it)
@@ -103,13 +95,6 @@ class OkHttpWebClient(
 		return this
 	}
 
-	private fun Request.Builder.addExtraHeaders(headers: Headers?): Request.Builder {
-		if (headers != null) {
-			headers(headers)
-		}
-		return this
-	}
-
 	private fun Response.ensureSuccess(): Response {
 		val exception: Exception? = when (code) { // Catch some error codes, not all
 			HttpURLConnection.HTTP_NOT_FOUND -> NotFoundException(message, request.url.toString())

src/main/kotlin/org/koitharu/kotatsu/parsers/network/UserAgents.kt

@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.parsers.network
-
-object UserAgents {
-
-	const val CHROME_MOBILE =
-		"Mozilla/5.0 (Linux; Android 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.5735.196 Mobile Safari/537.36"
-
-	const val CHROME_DESKTOP =
-		"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"
-
-	const val FIREFOX_DESKTOP = "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/116.0"
-
-	const val KOTATSU = "Kotatsu/5.3 (Android 13;;; en)"
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/network/WebClient.kt

@@ -22,11 +22,6 @@ interface WebClient {
 	 */
 	suspend fun httpGet(url: HttpUrl): Response = httpGet(url, null)
 
-	/**
-	 * Do a GET http request to specific url
-	 * @param url
-	 * @param extraHeaders additional HTTP headers for request
-	 */
 	suspend fun httpGet(url: HttpUrl, extraHeaders: Headers?): Response
 
 	/**
@@ -46,66 +41,42 @@ interface WebClient {
 	 * @param url
 	 * @param form payload as key=>value map
 	 */
-	suspend fun httpPost(url: String, form: Map<String, String>): Response = httpPost(url.toHttpUrl(), form, null)
+	suspend fun httpPost(url: String, form: Map<String, String>): Response = httpPost(url.toHttpUrl(), form)
 
 	/**
 	 * Do a POST http request to specific url with `multipart/form-data` payload
 	 * @param url
 	 * @param form payload as key=>value map
 	 */
-	suspend fun httpPost(url: HttpUrl, form: Map<String, String>): Response = httpPost(url, form, null)
-
-	/**
-	 * Do a POST http request to specific url with `multipart/form-data` payload
-	 * @param url
-	 * @param form payload as key=>value map
-	 * @param extraHeaders additional HTTP headers for request
-	 */
-	suspend fun httpPost(url: HttpUrl, form: Map<String, String>, extraHeaders: Headers?): Response
+	suspend fun httpPost(url: HttpUrl, form: Map<String, String>): Response
 
 	/**
 	 * Do a POST http request to specific url with `multipart/form-data` payload
 	 * @param url
 	 * @param payload payload as `key=value` string with `&` separator
 	 */
-	suspend fun httpPost(url: String, payload: String): Response = httpPost(url.toHttpUrl(), payload, null)
+	suspend fun httpPost(url: String, payload: String): Response = httpPost(url.toHttpUrl(), payload)
 
 	/**
 	 * Do a POST http request to specific url with `multipart/form-data` payload
 	 * @param url
 	 * @param payload payload as `key=value` string with `&` separator
 	 */
-	suspend fun httpPost(url: HttpUrl, payload: String): Response = httpPost(url, payload, null)
-
-	/**
-	 * Do a POST http request to specific url with `multipart/form-data` payload
-	 * @param url
-	 * @param payload payload as `key=value` string with `&` separator
-	 * @param extraHeaders additional HTTP headers for request
-	 */
-	suspend fun httpPost(url: HttpUrl, payload: String, extraHeaders: Headers?): Response
+	suspend fun httpPost(url: HttpUrl, payload: String): Response
 
 	/**
 	 * Do a POST http request to specific url with json payload
 	 * @param url
 	 * @param body
 	 */
-	suspend fun httpPost(url: String, body: JSONObject): Response = httpPost(url.toHttpUrl(), body, null)
+	suspend fun httpPost(url: String, body: JSONObject): Response = httpPost(url.toHttpUrl(), body)
 
 	/**
 	 * Do a POST http request to specific url with json payload
 	 * @param url
 	 * @param body
 	 */
-	suspend fun httpPost(url: HttpUrl, body: JSONObject): Response = httpPost(url, body, null)
-
-	/**
-	 * Do a POST http request to specific url with json payload
-	 * @param url
-	 * @param body
-	 * @param extraHeaders additional HTTP headers for request
-	 */
-	suspend fun httpPost(url: HttpUrl, body: JSONObject, extraHeaders: Headers?): Response
+	suspend fun httpPost(url: HttpUrl, body: JSONObject): Response
 
 	/**
 	 * Do a GraphQL request to specific url

src/main/kotlin/org/koitharu/kotatsu/parsers/site/AnibelParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site.be
+package org.koitharu.kotatsu.parsers.site
 
 import androidx.collection.ArraySet
 import org.json.JSONArray
@@ -13,7 +13,6 @@ import org.koitharu.kotatsu.parsers.util.generateUid
 import org.koitharu.kotatsu.parsers.util.getDomain
 import org.koitharu.kotatsu.parsers.util.json.mapJSON
 import org.koitharu.kotatsu.parsers.util.json.mapJSONIndexed
-import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull
 import org.koitharu.kotatsu.parsers.util.json.stringIterator
 import org.koitharu.kotatsu.parsers.util.toAbsoluteUrl
 import java.util.*
@@ -21,9 +20,9 @@ import java.util.*
 @MangaSourceParser("ANIBEL", "Anibel", "be")
 internal class AnibelParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.ANIBEL) {
 
-	override val configKeyDomain = ConfigKey.Domain("anibel.net")
+	override val configKeyDomain = ConfigKey.Domain("anibel.net", null)
 
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
+	override val sortOrders: Set<SortOrder> = EnumSet.of(
 		SortOrder.NEWEST,
 	)
 
@@ -73,7 +72,7 @@ internal class AnibelParser(context: MangaLoaderContext) : MangaParser(context,
 				title = title.getString("be"),
 				coverUrl = jo.getString("poster").removePrefix("/cdn")
 					.toAbsoluteUrl(getDomain("cdn")) + "?width=200&height=280",
-				altTitle = title.optJSONArray("alt")?.optString(0)?.takeUnless(String::isEmpty),
+				altTitle = title.getString("alt").takeUnless(String::isEmpty),
 				author = null,
 				isNsfw = false,
 				rating = jo.getDouble("rating").toFloat() / 10f,
@@ -111,21 +110,20 @@ internal class AnibelParser(context: MangaLoaderContext) : MangaParser(context,
 			""".trimIndent(),
 		).getJSONObject("media")
 		val title = details.getJSONObject("title")
-		val poster = details.getString("poster").removePrefix("/cdn").toAbsoluteUrl(getDomain("cdn"))
+		val poster = details.getString("poster").removePrefix("/cdn")
+			.toAbsoluteUrl(getDomain("cdn"))
 		val chapters = apiCall(
 			"""
-			chapters(mediaId: "${details.getString("mediaId")}", offset: 0, limit: 99999) {
-				docs {
-					id
-					chapter
-					released
-				}
+			chapters(mediaId: "${details.getString("mediaId")}") {
+				id
+				chapter
+				released
 			}
 			""".trimIndent(),
-		).getJSONObject("chapters").getJSONArray("docs")
+		).getJSONArray("chapters")
 		return manga.copy(
 			title = title.getString("be"),
-			altTitle = title.optJSONArray("alt")?.optString(0)?.takeUnless(String::isEmpty),
+			altTitle = title.getString("alt"),
 			coverUrl = "$poster?width=200&height=280",
 			largeCoverUrl = poster,
 			description = details.getJSONObject("description").getString("be"),
@@ -166,6 +164,7 @@ internal class AnibelParser(context: MangaLoaderContext) : MangaParser(context,
 			""".trimIndent(),
 		).getJSONObject("chapter")
 		val pages = chapterJson.getJSONArray("images")
+		val chapterUrl = "https://${domain}/${chapter.url}"
 		return pages.mapJSONIndexed { i, jo ->
 			MangaPage(
 				id = generateUid("${chapter.url}/$i"),
@@ -176,7 +175,7 @@ internal class AnibelParser(context: MangaLoaderContext) : MangaParser(context,
 		}
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		val json = apiCall(
 			"""
 			getFilters(mediaType: manga) {
@@ -191,29 +190,23 @@ internal class AnibelParser(context: MangaLoaderContext) : MangaParser(context,
 	private suspend fun search(query: String): List<Manga> {
 		val json = apiCall(
 			"""
-			search(query: "$query", limit: 60) {
-				mediaId
+			search(query: "$query", limit: 40) {
+				id
 				title {
 					be
 					en
 				}
 				poster
-				status
-				slug
-				mediaType
-				genres
+				url
+				type
 			}
 			""".trimIndent(),
 		)
 		val array = json.getJSONArray("search")
-		return array.mapJSONNotNull { jo ->
-			val type = jo.getString("mediaType").lowercase()
-			if (type != "manga") {
-				return@mapJSONNotNull null
-			}
-			val mediaId = jo.getString("mediaId")
+		return array.mapJSON { jo ->
+			val mediaId = jo.getString("id")
 			val title = jo.getJSONObject("title")
-			val href = "$type/${jo.getString("slug")}"
+			val href = "${jo.getString("type").lowercase()}/${jo.getString("url")}"
 			Manga(
 				id = generateUid(mediaId),
 				title = title.getString("be"),
@@ -225,19 +218,16 @@ internal class AnibelParser(context: MangaLoaderContext) : MangaParser(context,
 				rating = RATING_UNKNOWN,
 				url = href,
 				publicUrl = "https://${domain}/$href",
-				tags = jo.getJSONArray("genres").mapToTags(),
-				state = when (jo.getString("status")) {
-					"ongoing" -> MangaState.ONGOING
-					"finished" -> MangaState.FINISHED
-					else -> null
-				},
+				tags = emptySet(),
+				state = null,
 				source = source,
 			)
 		}
 	}
 
 	private suspend fun apiCall(request: String): JSONObject {
-		return webClient.graphQLQuery("https://${domain}/graphql", request).getJSONObject("data")
+		return webClient.graphQLQuery("https://api.${domain}/graphql", request)
+			.getJSONObject("data")
 	}
 
 	private fun JSONArray.mapToTags(): Set<MangaTag> {

src/main/kotlin/org/koitharu/kotatsu/parsers/site/BatoToParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site.all
+package org.koitharu.kotatsu.parsers.site
 
 import androidx.collection.ArraySet
 import org.json.JSONArray
@@ -26,7 +26,7 @@ internal class BatoToParser(context: MangaLoaderContext) : PagedMangaParser(
 	searchPageSize = 20,
 ) {
 
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
+	override val sortOrders: Set<SortOrder> = EnumSet.of(
 		SortOrder.NEWEST,
 		SortOrder.UPDATED,
 		SortOrder.POPULARITY,
@@ -35,30 +35,16 @@ internal class BatoToParser(context: MangaLoaderContext) : PagedMangaParser(
 
 	override val configKeyDomain = ConfigKey.Domain(
 		"bato.to",
-		"batocomic.com",
-		"batocomic.net",
-		"batocomic.org",
-		"batotoo.com",
-		"batotwo.com",
-		"battwo.com",
-		"comiko.net",
-		"comiko.org",
-		"mangatoto.com",
-		"mangatoto.net",
-		"mangatoto.org",
-		"readtoto.com",
-		"readtoto.net",
-		"readtoto.org",
-		"dto.to",
-		"hto.to",
-		"mto.to",
-		"wto.to",
-		"xbato.com",
-		"xbato.net",
-		"xbato.org",
-		"zbato.com",
-		"zbato.net",
-		"zbato.org",
+		arrayOf(
+			"bato.to",
+			"mto.to",
+			"hto.to",
+			"mangatoto.com",
+			"battwo.com",
+			"batotwo.com",
+			"comiko.net",
+			"batotoo.com",
+		),
 	)
 
 	override suspend fun getListPage(
@@ -82,7 +68,6 @@ internal class BatoToParser(context: MangaLoaderContext) : PagedMangaParser(
 				SortOrder.POPULARITY -> append("views_a.za")
 				SortOrder.NEWEST -> append("create.za")
 				SortOrder.ALPHABETICAL -> append("title.az")
-				SortOrder.RATING -> Unit
 			}
 			if (!tags.isNullOrEmpty()) {
 				append("&genres=")
@@ -159,7 +144,7 @@ internal class BatoToParser(context: MangaLoaderContext) : PagedMangaParser(
 		throw ParseException("Cannot find images list", fullUrl)
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		val scripts = webClient.httpGet(
 			"https://${domain}/browse",
 		).parseHtml().selectOrThrow("script")

src/main/kotlin/org/koitharu/kotatsu/parsers/site/BentomangaParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site.fr
+package org.koitharu.kotatsu.parsers.site
 
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -15,10 +15,10 @@ import org.koitharu.kotatsu.parsers.util.*
 import org.koitharu.kotatsu.parsers.util.json.getIntOrDefault
 import java.util.*
 
-@MangaSourceParser("BENTOMANGA", "BentoManga", "fr")
+@MangaSourceParser("BENTOMANGA", "Bentomanga", "fr")
 internal class BentomangaParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.BENTOMANGA, 10) {
 
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
+	override val sortOrders: Set<SortOrder> = EnumSet.of(
 		SortOrder.UPDATED,
 		SortOrder.POPULARITY,
 		SortOrder.RATING,
@@ -26,7 +26,11 @@ internal class BentomangaParser(context: MangaLoaderContext) : PagedMangaParser(
 		SortOrder.ALPHABETICAL,
 	)
 
-	override val configKeyDomain = ConfigKey.Domain("bentomanga.com", "www.bentomanga.com")
+	override val configKeyDomain = ConfigKey.Domain("www.bentomanga.com", null)
+
+	override val headers: Headers = Headers.Builder()
+		.add("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/113.0")
+		.build()
 
 	init {
 		paginator.firstPage = 0
@@ -75,7 +79,7 @@ internal class BentomangaParser(context: MangaLoaderContext) : PagedMangaParser(
 					?.div(10f)
 					?: RATING_UNKNOWN,
 				isNsfw = div.selectFirst(".badge-adult_content") != null,
-				coverUrl = div.selectFirstOrThrow("img").src().assertNotNull("src").orEmpty(),
+				coverUrl = div.selectFirstOrThrow("img").src(),
 				tags = div.selectFirst(".component-manga-categories")
 					.assertNotNull("tags")
 					?.select("a")
@@ -99,14 +103,11 @@ internal class BentomangaParser(context: MangaLoaderContext) : PagedMangaParser(
 		val root = webClient.httpGet(mangaUrl).parseHtml()
 			.requireElementById("container_manga_show")
 		return manga.copy(
-			altTitle = root.selectFirst(".component-manga-title_alt")?.text(),
+			altTitle = root.selectFirst(".component-manga-title_alt")?.textOrNull().assertNotNull("altTitle"),
 			description = root.selectFirst(".datas_synopsis")?.html().assertNotNull("description")
 				?: manga.description,
 			state = when (root.selectFirst(".datas_more-status-data")?.textOrNull().assertNotNull("status")) {
 				"En cours" -> MangaState.ONGOING
-				"Terminé" -> MangaState.FINISHED
-				"Abandonné" -> MangaState.ABANDONED
-				"En pause" -> MangaState.PAUSED
 				else -> null
 			},
 			author = root.selectFirst(".datas_more-authors-people")?.textOrNull().assertNotNull("author"),
@@ -117,9 +118,9 @@ internal class BentomangaParser(context: MangaLoaderContext) : PagedMangaParser(
 					parseChapters(root)
 				} else {
 					coroutineScope {
-						val result = ArrayList(parseChapters(root))
+						val result = ArrayList<MangaChapter>(parseChapters(root))
 						result.ensureCapacity(result.size * max)
-						(1..max).map { i ->
+						(2..max).map { i ->
 							async {
 								loadChapters(mangaUrl, i)
 							}
@@ -159,7 +160,7 @@ internal class BentomangaParser(context: MangaLoaderContext) : PagedMangaParser(
 		}
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		val root = webClient.httpGet(urlBuilder().addPathSegment("manga_list").build())
 			.parseHtml()
 			.requireElementById("search_options-form")
@@ -181,7 +182,7 @@ internal class BentomangaParser(context: MangaLoaderContext) : PagedMangaParser(
 	private fun parseChapters(root: Element): List<MangaChapter> {
 		return root.requireElementById("chapters_content")
 			.select(".component-chapter").map { div ->
-				val a = div.selectFirstOrThrow("a:not([style*='display:none'])")
+				val a = div.selectFirstOrThrow("a")
 				val href = a.attrAsRelativeUrl("href")
 				val title = div.selectFirstOrThrow(".chapter_volume").text()
 				val name = div.selectFirst(".chapter_title")?.textOrNull()
@@ -226,4 +227,14 @@ internal class BentomangaParser(context: MangaLoaderContext) : PagedMangaParser(
 		calendar.add(calendarUnit, -count)
 		return calendar.timeInMillis
 	}
+
+	private fun Element.src(): String {
+		return attrAsAbsoluteUrlOrNull("data-cfsrc")
+			?: attrAsAbsoluteUrlOrNull("src")
+			?: attrAsAbsoluteUrlOrNull("data-src")
+			?: run {
+				assert(false) { "Image src not found" }
+				""
+			}
+	}
 }

src/main/kotlin/org/koitharu/kotatsu/parsers/site/BlogTruyenParser.kt

@@ -1,7 +1,8 @@
-package org.koitharu.kotatsu.parsers.site.vi
+package org.koitharu.kotatsu.parsers.site
 
 import androidx.collection.ArrayMap
-import okhttp3.Headers
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import org.json.JSONArray
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -10,7 +11,6 @@ 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.*
@@ -20,17 +20,14 @@ class BlogTruyenParser(context: MangaLoaderContext) :
 	PagedMangaParser(context, MangaSource.BLOGTRUYEN, pageSize = 20) {
 
 	override val configKeyDomain: ConfigKey.Domain
-		get() = ConfigKey.Domain("blogtruyenmoi.com")
+		get() = ConfigKey.Domain("blogtruyen.vn", null)
 
-	override val availableSortOrders: Set<SortOrder>
+	override val sortOrders: Set<SortOrder>
 		get() = EnumSet.of(SortOrder.UPDATED)
 
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_DESKTOP)
-		.build()
-
+	private val mutex = Mutex()
 	private val dateFormat = SimpleDateFormat("dd/MM/yyyy HH:mm", Locale.US)
-	private var cacheTags = SuspendLazy(::fetchTags)
+	private var cacheTags: ArrayMap<String, MangaTag>? = null
 
 	override suspend fun getDetails(manga: Manga): Manga {
 		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
@@ -58,15 +55,14 @@ class BlogTruyenParser(context: MangaLoaderContext) :
 			}
 		}
 
-		val tags = cacheTags.tryGet().getOrNull()?.let { tagMap ->
-			descriptionElement.select("p > span.category").mapNotNullToSet {
-				val tagName = it.selectFirst("a")?.text()?.trim() ?: return@mapNotNullToSet null
-				tagMap[tagName]
-			}
+		val tagMap = getOrCreateTagMap()
+		val tags = descriptionElement.select("p > span.category").mapNotNullToSet {
+			val tagName = it.selectFirst("a")?.text()?.trim() ?: return@mapNotNullToSet null
+			tagMap[tagName]
 		}
 
 		return manga.copy(
-			tags = tags ?: emptySet(),
+			tags = tags,
 			author = descriptionElement.selectFirst("p:contains(Tác giả) > a")?.text(),
 			description = doc.selectFirst(".detail .content")?.html(),
 			chapters = parseChapterList(doc),
@@ -130,25 +126,24 @@ class BlogTruyenParser(context: MangaLoaderContext) :
 		val listElements = doc.selectFirstOrThrow("section.list-mainpage.listview")
 			.select("div.bg-white.storyitem")
 
-		return listElements.mapNotNull { el ->
-			val linkTag = el.selectFirst("div.fl-l > a") ?: return@mapNotNull null
+		return listElements.mapNotNull {
+			val linkTag = it.selectFirst("div.fl-l > a") ?: return@mapNotNull null
 			val relativeUrl = linkTag.attrAsRelativeUrl("href")
-			val tags = cacheTags.tryGet().getOrNull()?.let { tagMap ->
-				el.select("footer > div.category > a").mapNotNullToSet { a ->
-					tagMap[a.text()]
-				}
+			val tagMap = getOrCreateTagMap()
+			val tags = it.select("footer > div.category > a").mapNotNullToSet { a ->
+				tagMap[a.text()]
 			}
 
 			Manga(
 				id = generateUid(relativeUrl),
 				title = linkTag.attr("title"),
 				altTitle = null,
-				description = el.selectFirst("p.al-j.break.line-height-15")?.text(),
+				description = it.selectFirst("p.al-j.break.line-height-15")?.text(),
 				url = relativeUrl,
 				publicUrl = relativeUrl.toAbsoluteUrl(domain),
 				coverUrl = linkTag.selectLast("img")?.imageUrl().orEmpty(),
 				source = source,
-				tags = tags ?: emptySet(),
+				tags = tags,
 				isNsfw = false,
 				rating = RATING_UNKNOWN,
 				author = null,
@@ -187,6 +182,7 @@ class BlogTruyenParser(context: MangaLoaderContext) :
 
 		val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml()
 		val pages = ArrayList<MangaPage>()
+		val referer = chapter.url.toAbsoluteUrl(domain)
 		doc.select("#content > img").forEach { img ->
 			pages.add(
 				MangaPage(
@@ -219,12 +215,19 @@ class BlogTruyenParser(context: MangaLoaderContext) :
 		return pages
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		return cacheTags.get().values.toSet()
+	override suspend fun getTags(): Set<MangaTag> {
+		val map = getOrCreateTagMap()
+		val tags = HashSet<MangaTag>(map.size)
+		for (entry in map) {
+			tags.add(entry.value)
+		}
+
+		return tags
 	}
 
 
-	private suspend fun fetchTags(): Map<String, MangaTag> {
+	private suspend fun getOrCreateTagMap(): ArrayMap<String, MangaTag> = mutex.withLock {
+		cacheTags?.let { return@withLock it }
 		val doc = webClient.httpGet("/timkiem/nangcao".toAbsoluteUrl(domain)).parseHtml()
 		val tagItems = doc.select("li[data-id]")
 		val tagMap = ArrayMap<String, MangaTag>(tagItems.size)
@@ -236,7 +239,9 @@ class BlogTruyenParser(context: MangaLoaderContext) :
 				source = source,
 			)
 		}
-		return tagMap
+
+		cacheTags = tagMap
+		tagMap
 	}
 
 	private fun Element.imageUrl(): String {

src/main/kotlin/org/koitharu/kotatsu/parsers/site/CloneMangaParser.kt

@@ -1,39 +1,46 @@
-package org.koitharu.kotatsu.parsers.site.en
+package org.koitharu.kotatsu.parsers.site
 
-import org.koitharu.kotatsu.parsers.InternalParsersApi
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.MangaSourceParser
+import org.koitharu.kotatsu.parsers.PagedMangaParser
 import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.util.*
 import java.util.*
 
 @MangaSourceParser("CLONEMANGA", "CloneManga", "en")
-internal class CloneMangaParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.CLONEMANGA) {
+internal class CloneMangaParser(context: MangaLoaderContext) : PagedMangaParser(
+	context,
+	MangaSource.CLONEMANGA,
+	pageSize = 1,
+) {
 
-	override val availableSortOrders: Set<SortOrder> = Collections.singleton(
+	override val sortOrders: Set<SortOrder> = Collections.singleton(
 		SortOrder.POPULARITY,
 	)
 
-	override val configKeyDomain = ConfigKey.Domain("manga.clone-army.org")
+	override val configKeyDomain = ConfigKey.Domain("manga.clone-army.org", null)
 
-	@InternalParsersApi
-	override suspend fun getList(offset: Int, query: String?, tags: Set<MangaTag>?, sortOrder: SortOrder): List<Manga> {
-		if (query != null || offset > 0) {
+	override suspend fun getListPage(
+		page: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder,
+	): List<Manga> {
+		if (query != null || page > 1) {
 			return emptyList()
 		}
-		val link = "https://$domain/viewer_landing.php"
+		val link = "https://${domain}/viewer_landing.php"
 		val doc = webClient.httpGet(link).parseHtml()
 		val mangas = doc.getElementsByClass("comicPreviewContainer")
 		return mangas.mapNotNull { item ->
 			val background = item.selectFirstOrThrow(".comicPreview").styleValueOrNull("background")
-			val href = item.selectFirst("a")?.attrAsRelativeUrl("href") ?: return@mapNotNull null
+			val href = item.selectFirst("a")?.attrAsAbsoluteUrl("href") ?: return@mapNotNull null
 			val cover = background?.substring(background.indexOf("site/themes"), background.indexOf(")"))
 			Manga(
 				id = generateUid(href),
 				title = item.selectFirst("h3")?.text() ?: return@mapNotNull null,
-				coverUrl = "https://$domain/$cover",
+				coverUrl = "https://${domain}/$cover",
 				altTitle = null,
 				author = "Dan Kim",
 				rating = RATING_UNKNOWN,
@@ -89,5 +96,5 @@ internal class CloneMangaParser(context: MangaLoaderContext) : MangaParser(conte
 		)
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> = emptySet()
+	override suspend fun getTags(): Set<MangaTag> = emptySet()
 }

src/main/kotlin/org/koitharu/kotatsu/parsers/site/ComickFunParser.kt

@@ -1,7 +1,8 @@
-package org.koitharu.kotatsu.parsers.site.all
+package org.koitharu.kotatsu.parsers.site
 
 import androidx.collection.ArraySet
 import androidx.collection.SparseArrayCompat
+import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaParser
@@ -23,9 +24,9 @@ private const val CHAPTERS_LIMIT = 99999
 @MangaSourceParser("COMICK_FUN", "ComicK")
 internal class ComickFunParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.COMICK_FUN) {
 
-	override val configKeyDomain = ConfigKey.Domain("comick.app")
+	override val configKeyDomain = ConfigKey.Domain("comick.app", null)
 
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
+	override val sortOrders: Set<SortOrder> = EnumSet.of(
 		SortOrder.POPULARITY,
 		SortOrder.UPDATED,
 		SortOrder.RATING,
@@ -85,7 +86,7 @@ internal class ComickFunParser(context: MangaLoaderContext) : MangaParser(contex
 				coverUrl = jo.getString("cover_url"),
 				largeCoverUrl = null,
 				description = jo.getStringOrNull("desc"),
-				tags = jo.selectGenres(tagsMap),
+				tags = jo.selectGenres("genres", tagsMap),
 				state = runCatching {
 					if (jo.getBoolean("translation_completed")) {
 						MangaState.FINISHED
@@ -109,11 +110,10 @@ internal class ComickFunParser(context: MangaLoaderContext) : MangaParser(contex
 			altTitle = null, // TODO
 			isNsfw = jo.getBoolean("matureContent") || comic.getBoolean("hentai"),
 			description = comic.getStringOrNull("parsed") ?: comic.getString("desc"),
-			tags = manga.tags + comic.getJSONArray("md_comic_md_genres").mapJSONToSet {
-				val g = it.getJSONObject("md_genres")
+			tags = manga.tags + jo.getJSONArray("genres").mapJSONToSet {
 				MangaTag(
-					title = g.getString("name"),
-					key = g.getString("slug"),
+					title = it.getString("name"),
+					key = it.getString("slug"),
 					source = source,
 				)
 			},
@@ -126,6 +126,7 @@ internal class ComickFunParser(context: MangaLoaderContext) : MangaParser(contex
 		val jo = webClient.httpGet(
 			"https://api.${domain}/chapter/${chapter.url}?tachiyomi=true",
 		).parseJson().getJSONObject("chapter")
+		val referer = "https://${domain}/"
 		return jo.getJSONArray("images").mapJSON {
 			val url = it.getString("url")
 			MangaPage(
@@ -137,7 +138,7 @@ internal class ComickFunParser(context: MangaLoaderContext) : MangaParser(contex
 		}
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		val sparseArray = cachedTags ?: loadTags()
 		val set = ArraySet<MangaTag>(sparseArray.size())
 		for (i in 0 until sparseArray.size()) {
@@ -168,44 +169,41 @@ internal class ComickFunParser(context: MangaLoaderContext) : MangaParser(contex
 			url = "https://api.${domain}/comic/$hid/chapters?limit=$CHAPTERS_LIMIT",
 		).parseJson().getJSONArray("chapters")
 		val dateFormat = SimpleDateFormat("yyyy-MM-dd")
-		val list = ja.toJSONList().reversed()
-
-		val chaptersBuilder = ChaptersListBuilder(list.size)
-		val branchedChapters = HashMap<String?, HashMap<Pair<String?, String?>, MangaChapter>>()
-		for (jo in list) {
-			val vol = jo.getStringOrNull("vol")
-			val chap = jo.getStringOrNull("chap")
-			val volChap = vol to chap
+		val counters = HashMap<Locale, Int>()
+		return ja.mapReversed { jo ->
 			val locale = Locale.forLanguageTag(jo.getString("lang"))
-			val lc = locale.getDisplayName(locale).toTitleCase(locale)
-			val branch = (list.indices).firstNotNullOf { i ->
-				val b = if (i == 0) lc else "$lc ($i)"
-				if (branchedChapters[b]?.get(volChap) == null) b else null
-			}
-			val chapter = MangaChapter(
+			var number = counters[locale] ?: 0
+			number++
+			counters[locale] = number
+			MangaChapter(
 				id = generateUid(jo.getLong("id")),
 				name = buildString {
-					vol?.let { append("Vol ").append(it).append(' ') }
-					chap?.let { append("Chap ").append(it) }
+					jo.getStringOrNull("vol")?.let { append("Vol ").append(it).append(' ') }
+					jo.getStringOrNull("chap")?.let { append("Chap ").append(it) }
 					jo.getStringOrNull("title")?.let { append(": ").append(it) }
 				},
-				number = branchedChapters[branch]?.size?.plus(1) ?: 1,
+				number = number,
 				url = jo.getString("hid"),
-				scanlator = jo.optJSONArray("group_name")?.asIterable<String>()?.joinToString()
-					?.takeUnless { it.isBlank() },
+				scanlator = jo.optJSONArray("group_name")?.optString(0),
 				uploadDate = dateFormat.tryParse(jo.getString("created_at").substringBefore('T')),
-				branch = branch,
+				branch = locale.getDisplayName(locale).toTitleCase(locale),
 				source = source,
 			)
-			if (chaptersBuilder.add(chapter)) {
-				branchedChapters.getOrPut(branch, ::HashMap)[volChap] = chapter
-			}
 		}
-		return chaptersBuilder.toList()
 	}
 
-	private fun JSONObject.selectGenres(tags: SparseArrayCompat<MangaTag>): Set<MangaTag> {
-		val array = optJSONArray("genres") ?: return emptySet()
+	private inline fun <R> JSONArray.mapReversed(block: (JSONObject) -> R): List<R> {
+		val len = length()
+		val destination = ArrayList<R>(len)
+		for (i in (0 until len).reversed()) {
+			val jo = getJSONObject(i)
+			destination.add(block(jo))
+		}
+		return destination
+	}
+
+	private fun JSONObject.selectGenres(name: String, tags: SparseArrayCompat<MangaTag>): Set<MangaTag> {
+		val array = optJSONArray(name) ?: return emptySet()
 		val res = ArraySet<MangaTag>(array.length())
 		for (i in 0 until array.length()) {
 			val id = array.getInt(i)

src/main/kotlin/org/koitharu/kotatsu/parsers/site/DesuMeParser.kt

@@ -1,36 +1,30 @@
-package org.koitharu.kotatsu.parsers.site.ru
+package org.koitharu.kotatsu.parsers.site
 
 import androidx.collection.ArrayMap
-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.exception.ParseException
 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 org.koitharu.kotatsu.parsers.util.json.mapJSONIndexed
 import org.koitharu.kotatsu.parsers.util.json.mapJSONToSet
 import java.util.*
 
-@MangaSourceParser("DESUME", "Desu.Me", "ru")
+@MangaSourceParser("DESUME", "Desu.me", "ru")
 internal class DesuMeParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.DESUME, 20) {
 
-	override val configKeyDomain = ConfigKey.Domain("desu.me", "desu.win")
+	override val configKeyDomain = ConfigKey.Domain("desu.me", null)
 
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
+	override val sortOrders: Set<SortOrder> = EnumSet.of(
 		SortOrder.UPDATED,
 		SortOrder.POPULARITY,
 		SortOrder.NEWEST,
 		SortOrder.ALPHABETICAL,
 	)
 
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.KOTATSU)
-		.build()
-
 	private val tagsCache = SuspendLazy(::fetchTags)
 
 	override suspend fun getListPage(
@@ -148,7 +142,7 @@ internal class DesuMeParser(context: MangaLoaderContext) : PagedMangaParser(cont
 		}
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		return tagsCache.get().values.toSet()
 	}
 
@@ -162,7 +156,7 @@ internal class DesuMeParser(context: MangaLoaderContext) : PagedMangaParser(cont
 		}
 
 	private suspend fun fetchTags(): Map<String, MangaTag> {
-		val doc = webClient.httpGet("https://$domain/manga/").parseHtml()
+		val doc = webClient.httpGet("https://${domain}/manga/").parseHtml()
 		val root = doc.body().requireElementById("animeFilter")
 			.selectFirstOrThrow(".catalog-genres")
 		val li = root.select("li")

src/main/kotlin/org/koitharu/kotatsu/parsers/site/DoujinDesuParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site.id
+package org.koitharu.kotatsu.parsers.site
 
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaSourceParser
@@ -9,13 +9,13 @@ import org.koitharu.kotatsu.parsers.util.*
 import java.text.SimpleDateFormat
 import java.util.*
 
-@MangaSourceParser("DOUJINDESU", "DoujinDesu.tv", "id")
+@MangaSourceParser("DOUJINDESU", "DoujinDesu", "id")
 class DoujinDesuParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.DOUJINDESU, pageSize = 18) {
 
 	override val configKeyDomain: ConfigKey.Domain
-		get() = ConfigKey.Domain("doujindesu.tv")
+		get() = ConfigKey.Domain("212.32.226.234", null)
 
-	override val availableSortOrders: Set<SortOrder>
+	override val sortOrders: Set<SortOrder>
 		get() = EnumSet.of(SortOrder.UPDATED, SortOrder.NEWEST, SortOrder.ALPHABETICAL, SortOrder.POPULARITY)
 
 	override suspend fun getDetails(manga: Manga): Manga {
@@ -97,7 +97,7 @@ class DoujinDesuParser(context: MangaLoaderContext) : PagedMangaParser(context,
 					publicUrl = relativeUrl.toAbsoluteUrl(domain),
 					rating = RATING_UNKNOWN,
 					isNsfw = true,
-					coverUrl = it.selectFirst(".thumbnail > img")?.src().orEmpty(),
+					coverUrl = it.selectFirst(".thumbnail > img")?.attrAsAbsoluteUrl("src").orEmpty(),
 					tags = emptySet(),
 					state = null,
 					author = null,
@@ -125,7 +125,7 @@ class DoujinDesuParser(context: MangaLoaderContext) : PagedMangaParser(context,
 			}
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		return webClient.httpGet("/genre/".toAbsoluteUrl(domain)).parseHtml()
 			.requireElementById("taxonomy")
 			.selectFirstOrThrow(".entries")

src/main/kotlin/org/koitharu/kotatsu/parsers/site/ExHentaiParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site.all
+package org.koitharu.kotatsu.parsers.site
 
 import androidx.collection.SparseArrayCompat
 import androidx.collection.set
@@ -18,20 +18,17 @@ import kotlin.math.pow
 private const val DOMAIN_UNAUTHORIZED = "e-hentai.org"
 private const val DOMAIN_AUTHORIZED = "exhentai.org"
 
-@MangaSourceParser("EXHENTAI", "ExHentai", type = ContentType.HENTAI)
+@MangaSourceParser("EXHENTAI", "ExHentai")
 internal class ExHentaiParser(
 	context: MangaLoaderContext,
 ) : PagedMangaParser(context, MangaSource.EXHENTAI, pageSize = 25), MangaParserAuthProvider {
 
-	override val availableSortOrders: Set<SortOrder> = Collections.singleton(
+	override val sortOrders: Set<SortOrder> = Collections.singleton(
 		SortOrder.NEWEST,
 	)
 
 	override val configKeyDomain: ConfigKey.Domain
-		get() = ConfigKey.Domain(
-			if (isAuthorized) DOMAIN_AUTHORIZED else DOMAIN_UNAUTHORIZED,
-			if (isAuthorized) DOMAIN_UNAUTHORIZED else DOMAIN_AUTHORIZED,
-		)
+		get() = ConfigKey.Domain(if (isAuthorized) DOMAIN_AUTHORIZED else DOMAIN_UNAUTHORIZED, null)
 
 	override val authUrl: String
 		get() = "https://${domain}/bounce_login.php"
@@ -213,7 +210,7 @@ internal class ExHentaiParser(
 		return doc.body().requireElementById("img").attrAsAbsoluteUrl("src")
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		val doc = webClient.httpGet("https://${domain}").parseHtml()
 		val root = doc.body().requireElementById("searchbox").selectFirstOrThrow("table")
 		return root.select("div.cs").mapNotNullToSet { div ->

src/main/kotlin/org/koitharu/kotatsu/parsers/site/HoneyMangaParser.kt

@@ -1,6 +1,7 @@
-package org.koitharu.kotatsu.parsers.site.uk
+package org.koitharu.kotatsu.parsers.site
 
 import androidx.collection.ArraySet
+import okhttp3.Headers
 import okhttp3.Interceptor
 import okhttp3.Response
 import org.json.JSONArray
@@ -17,11 +18,12 @@ import org.koitharu.kotatsu.parsers.util.json.mapJSONIndexed
 import java.text.SimpleDateFormat
 import java.util.*
 
+
 private const val PAGE_SIZE = 20
 private const val INFINITE = 999999
 private const val HEADER_ENCODING = "Content-Encoding"
 
-@MangaSourceParser("HONEYMANGA", "HoneyManga", "uk")
+@MangaSourceParser("HONEYMANGA", "Honey Manga", "uk")
 class HoneyMangaParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.HONEYMANGA, PAGE_SIZE),
 	Interceptor {
 
@@ -30,14 +32,19 @@ class HoneyMangaParser(context: MangaLoaderContext) : PagedMangaParser(context,
 	private val chapterApi get() = "$urlApi/v2/chapter/cursor-list"
 	private val genresListApi get() = "$urlApi/genres-tags/genres-list"
 	private val framesApi get() = "$urlApi/chapter/frames"
-	private val searchApi get() = "https://search.api.$domain/v2/manga/pattern?query="
+	private val searchApi get() = "https://search.api.$domain/api/v1/title/search-matching?query="
 
 	private val imageStorageUrl = "https://manga-storage.fra1.digitaloceanspaces.com/public-resources"
 
-	override val configKeyDomain: ConfigKey.Domain
-		get() = ConfigKey.Domain("honey-manga.com.ua")
+	override val headers
+		get() = Headers.Builder()
+			.add("User-Agent", "Mozilla/5.0 (Android 13; Mobile; rv:68.0) Gecko/68.0 Firefox/109.0")
+			.build()
 
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
+	override val configKeyDomain: ConfigKey.Domain
+		get() = ConfigKey.Domain("honey-manga.com.ua", null)
+
+	override val sortOrders: Set<SortOrder> = EnumSet.of(
 		SortOrder.POPULARITY,
 		SortOrder.NEWEST,
 	)
@@ -51,7 +58,7 @@ class HoneyMangaParser(context: MangaLoaderContext) : PagedMangaParser(context,
 		body.put("sortOrder", "ASC")
 		val chapterRequest = webClient.httpPost(chapterApi, body).parseJson()
 		return manga.copy(
-			chapters = chapterRequest.getJSONArray("data").mapJSONIndexed { i, jo ->
+			chapters = chapterRequest.getJSONArray("data").mapJSONIndexed() { i, jo ->
 				MangaChapter(
 					id = generateUid(jo.getString("id")),
 					name = buildString {
@@ -166,7 +173,7 @@ class HoneyMangaParser(context: MangaLoaderContext) : PagedMangaParser(context,
 		}
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		// https://data.api.honey-manga.com.ua/genres-tags/genres-list
 		val content = webClient.httpGet(genresListApi).parseJsonArray()
 		val tagsSet = ArraySet<MangaTag>(content.length())

src/main/kotlin/org/koitharu/kotatsu/parsers/site/JapScanParser.kt

@@ -0,0 +1,193 @@
+package org.koitharu.kotatsu.parsers.site
+
+import okhttp3.Headers
+import org.json.JSONObject
+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.exception.ParseException
+import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.util.*
+import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
+import org.koitharu.kotatsu.parsers.util.json.mapJSON
+import java.text.SimpleDateFormat
+import java.util.*
+
+@MangaSourceParser("JAPSCAN", "JapScan", "fr")
+internal class JapScanParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.JAPSCAN, 30) {
+
+	override val sortOrders: Set<SortOrder> = EnumSet.of(SortOrder.ALPHABETICAL)
+
+	override val configKeyDomain = ConfigKey.Domain("www.japscan.lol", arrayOf("www.japscan.lol", "japscan.ws"))
+
+	override val headers: Headers = Headers.Builder()
+		.add("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/113.0")
+		.build()
+
+	override suspend fun getListPage(
+		page: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder,
+	): List<Manga> {
+		require(tags.isNullOrEmpty()) { "Tags are not supported by this source" }
+		if (!query.isNullOrEmpty()) {
+			return if (page == paginator.firstPage) getListPageSearch(query) else emptyList()
+		}
+		val url = urlBuilder()
+			.addPathSegment("mangas")
+			.addPathSegment(page.toString())
+			.build()
+		val root = webClient.httpGet(url).parseHtml()
+			.requireElementById("main")
+			.selectFirstOrThrow(".flex-wrap")
+		return root.select(".mainTitle")
+			.map { p ->
+				val div = checkNotNull(p.parent())
+				val a = div.selectFirstOrThrow("a")
+				val href = a.attrAsRelativeUrl("href")
+				Manga(
+					id = generateUid(href),
+					title = p.text(),
+					altTitle = null,
+					url = href,
+					publicUrl = href.toAbsoluteUrl(domain),
+					rating = RATING_UNKNOWN,
+					isNsfw = false,
+					coverUrl = div.selectFirstOrThrow("img").attrAsAbsoluteUrl("src"),
+					tags = setOf(),
+					state = null,
+					author = null,
+					source = source,
+				)
+			}
+	}
+
+	override suspend fun getDetails(manga: Manga): Manga {
+		val root = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml().requireElementById("main")
+		val dateFormat = SimpleDateFormat("dd MMM yyyy", Locale.ENGLISH)
+		return manga.copy(
+			altTitle = root.tableValue("Nom Original:"),
+			isNsfw = root.tableValue("Âge conseillé :")?.extractIntOrNull().let { it != null && it >= 18 },
+			tags = root.tableValue("Type(s):")?.split(", ")?.mapNotNullToSet {
+				it.toTag()
+			}.orEmpty() + root.tableValue("Genre(s):")?.split(", ")?.mapNotNullToSet {
+				it.toTag()
+			}.orEmpty(),
+			state = when (root.tableValue("Statut:")) {
+				"En Cours" -> MangaState.ONGOING
+				"Terminé", "Abondonné" -> MangaState.FINISHED
+				else -> null
+			},
+			author = root.tableValue("Artiste(s):")?.substringBefore(','),
+			description = root.selectFirst("p.list-group-item-primary")?.html(),
+			chapters = root.requireElementById("chapters_list")
+				.select("div.chapters_list")
+				.mapChapters(reversed = true) { i, div ->
+					val a = div.selectFirst("a") ?: return@mapChapters null
+					val href = a.attrAsRelativeUrl("href")
+					MangaChapter(
+						id = generateUid(href),
+						name = a.text(),
+						number = i,
+						url = href,
+						scanlator = null,
+						uploadDate = dateFormat.tryParse(div.selectFirst("span.float-right")?.text()),
+						branch = null,
+						source = source,
+					)
+				},
+		)
+	}
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		val chapterUrl = chapter.url.toAbsoluteUrl(domain)
+		val doc = webClient.httpGet(chapterUrl).parseHtml()
+		val scriptUrl = doc.getElementsByTag("script").firstNotNullOf { script ->
+			script.attrAsAbsoluteUrlOrNull("src")?.takeIf { it.contains("/zjs/") }
+		}
+		val embeddedData = doc.requireElementById("data").attr("data-data")
+		val script = webClient.httpGet(scriptUrl).parseRaw()
+
+		val sample = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".toList()
+		val keyRegex = Regex("""'([\dA-Z]{62})'""", RegexOption.IGNORE_CASE)
+
+		val keyTables = keyRegex.findAll(script)
+			.mapNotNullTo(ArrayList(2)) { match ->
+				match.groupValues[1].takeIf {
+					it.toList().sorted() == sample
+				}
+			}
+		check(keyTables.size == 2)
+
+		var error: Exception? = null
+		repeat(2) { i ->
+			val key = keyTables[i].zip(keyTables[1 - i]).toMap()
+			try {
+				val unscrambledData = embeddedData.map { key[it] ?: it }.joinToString("")
+				if (unscrambledData.startsWith("ey")) {
+					val array = JSONObject(context.decodeBase64(unscrambledData).toString(Charsets.UTF_8))
+						.getJSONArray("imagesLink")
+					val result = ArrayList<MangaPage>(array.length())
+					repeat(array.length()) { index ->
+						val url = array.getString(index)
+						result += MangaPage(
+							id = generateUid(url),
+							url = url,
+							preview = null,
+							source = source,
+						)
+					}
+					return result
+				}
+			} catch (e: Exception) {
+				error = e
+			}
+		}
+		throw (error ?: ParseException("Cannot decode pages list", chapterUrl))
+	}
+
+	override suspend fun getTags(): Set<MangaTag> {
+		return emptySet() // not supported
+	}
+
+	private suspend fun getListPageSearch(
+		query: String,
+	): List<Manga> {
+		val json = webClient.httpPost(
+			"https://$domain/live-search/",
+			mapOf("search" to query.urlEncoded()),
+		).parseJsonArray()
+		return json.mapJSON { jo ->
+			val url = jo.getString("url")
+			Manga(
+				id = generateUid(url),
+				title = jo.getString("name"),
+				altTitle = jo.getStringOrNull("alternate_names")?.substringBefore(','),
+				url = url,
+				publicUrl = url.toAbsoluteUrl(domain),
+				rating = RATING_UNKNOWN,
+				isNsfw = false,
+				coverUrl = jo.getString("image").toAbsoluteUrl(domain),
+				tags = emptySet(),
+				state = null,
+				author = null,
+				source = source,
+			)
+		}
+	}
+
+	private fun Element.tableValue(label: String): String? {
+		return getElementsMatchingOwnText(label).firstOrNull()?.parent()?.ownTextOrNull()
+	}
+
+	private fun String.extractIntOrNull(): Int? = this.filter(Char::isDigit).toIntOrNull()
+
+	private fun String.toTag() = MangaTag(
+		title = this.toTitleCase(sourceLocale),
+		key = this.replace(' ', '-').lowercase(sourceLocale),
+		source = source,
+	)
+}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/MangaDexParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site.all
+package org.koitharu.kotatsu.parsers.site
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -28,9 +28,9 @@ private const val LOCALE_FALLBACK = "en"
 @MangaSourceParser("MANGADEX", "MangaDex")
 internal class MangaDexParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.MANGADEX) {
 
-	override val configKeyDomain = ConfigKey.Domain("mangadex.org")
+	override val configKeyDomain = ConfigKey.Domain("mangadex.org", null)
 
-	override val availableSortOrders: EnumSet<SortOrder> = EnumSet.of(
+	override val sortOrders: EnumSet<SortOrder> = EnumSet.of(
 		SortOrder.UPDATED,
 		SortOrder.ALPHABETICAL,
 		SortOrder.NEWEST,
@@ -134,10 +134,35 @@ internal class MangaDexParser(context: MangaLoaderContext) : MangaParser(context
 		val feedDeferred = async { loadChapters(mangaId) }
 		val mangaAttrs = attrsDeferred.await()
 		val feed = feedDeferred.await()
+		// 2022-01-02T00:27:11+00:00
+		val dateFormat = SimpleDateFormat(
+			"yyyy-MM-dd'T'HH:mm:ss'+00:00'",
+			Locale.ROOT,
+		)
 		manga.copy(
 			description = mangaAttrs.optJSONObject("description")?.selectByLocale()
 				?: manga.description,
-			chapters = mapChapters(feed),
+			chapters = feed.mapChapters { _, jo ->
+				val id = jo.getString("id")
+				val attrs = jo.getJSONObject("attributes")
+				if (!attrs.isNull("externalUrl")) {
+					return@mapChapters null
+				}
+				val locale = attrs.getStringOrNull("translatedLanguage")?.let { Locale.forLanguageTag(it) }
+				val relations = jo.getJSONArray("relationships").associateByKey("type")
+				val number = attrs.getFloatOrDefault("chapter", 0f)
+				MangaChapter(
+					id = generateUid(id),
+					name = attrs.getStringOrNull("title")?.takeUnless(String::isEmpty)
+						?: "Chapter #$number",
+					number = number.toInt(),
+					url = id,
+					scanlator = relations["scanlation_group"]?.getStringOrNull("name"),
+					uploadDate = dateFormat.tryParse(attrs.getString("publishAt")),
+					branch = locale?.getDisplayName(locale)?.toTitleCase(locale),
+					source = source,
+				)
+			},
 		)
 	}
 
@@ -159,7 +184,7 @@ internal class MangaDexParser(context: MangaLoaderContext) : MangaParser(context
 		}
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		val tags = webClient.httpGet("https://api.${domain}/manga/tag").parseJson()
 			.getJSONArray("data")
 		return tags.mapJSONToSet { jo ->
@@ -237,48 +262,6 @@ internal class MangaDexParser(context: MangaLoaderContext) : MangaParser(context
 		}
 	}
 
-	private fun mapChapters(list: List<JSONObject>): List<MangaChapter> {
-		// 2022-01-02T00:27:11+00:00
-		val dateFormat = SimpleDateFormat(
-			"yyyy-MM-dd'T'HH:mm:ss'+00:00'",
-			Locale.ROOT,
-		)
-		val chaptersBuilder = ChaptersListBuilder(list.size)
-		val branchedChapters = HashMap<String?, HashMap<Float, MangaChapter>>()
-		for (jo in list) {
-			val id = jo.getString("id")
-			val attrs = jo.getJSONObject("attributes")
-			if (!attrs.isNull("externalUrl")) {
-				continue
-			}
-			val number = jo.getJSONObject("attributes").getFloatOrDefault("chapter", 0f)
-			val locale = attrs.getStringOrNull("translatedLanguage")?.let { Locale.forLanguageTag(it) }
-			val lc = locale?.getDisplayName(locale)?.toTitleCase(locale)
-			val relations = jo.getJSONArray("relationships").associateByKey("type")
-			val team = relations["scanlation_group"]?.getJSONObject("attributes")?.getStringOrNull("name")
-				?.takeUnless { it.isBlank() }
-			val branch = (list.indices).firstNotNullOf { i ->
-				val b = if (i == 0) lc else "$lc ($i)"
-				if (branchedChapters[b]?.get(number) == null) b else null
-			}
-			val chapter = MangaChapter(
-				id = generateUid(id),
-				name = attrs.getStringOrNull("title")?.takeUnless(String::isEmpty)
-					?: "Chapter #${number.toString().removeSuffix(".0")}",
-				number = if (number <= 0f) (branchedChapters[branch]?.size?.plus(1) ?: 0) else number.toInt(),
-				url = id,
-				scanlator = team,
-				uploadDate = dateFormat.tryParse(attrs.getString("publishAt")),
-				branch = branch,
-				source = source,
-			)
-			if (chaptersBuilder.add(chapter)) {
-				branchedChapters.getOrPut(branch, ::HashMap)[number] = chapter
-			}
-		}
-		return chaptersBuilder.toList()
-	}
-
 	private class Chapters(
 		val data: List<JSONObject>,
 		val total: Int,

src/main/kotlin/org/koitharu/kotatsu/parsers/site/MangaInUaParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site.uk
+package org.koitharu.kotatsu.parsers.site
 
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaSourceParser
@@ -19,13 +19,10 @@ class MangaInUaParser(context: MangaLoaderContext) : PagedMangaParser(
 	searchPageSize = 10,
 ) {
 
-	override val availableSortOrders: Set<SortOrder> = setOf(SortOrder.UPDATED)
+	override val sortOrders: Set<SortOrder>
+		get() = Collections.singleton(SortOrder.UPDATED)
 
-	override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("manga.in.ua")
-
-	private val userHashRegex by lazy {
-		Regex("site_login_hash\\s*=\\s*\'([^\']+)\'", RegexOption.IGNORE_CASE)
-	}
+	override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("manga.in.ua", null)
 
 	override suspend fun getListPage(
 		page: Int,
@@ -34,9 +31,14 @@ class MangaInUaParser(context: MangaLoaderContext) : PagedMangaParser(
 		sortOrder: SortOrder,
 	): List<Manga> {
 		val url = when {
-			!query.isNullOrEmpty() -> ("/index.php?do=search&subaction=search&search_start=$page&full_search=1&story=$query&titleonly=3").toAbsoluteUrl(
-				domain,
-			)
+			!query.isNullOrEmpty() -> (
+				"/index.php?do=search" +
+					"&subaction=search" +
+					"&search_start=$page" +
+					"&full_search=1" +
+					"&story=$query" +
+					"&titleonly=3"
+				).toAbsoluteUrl(domain)
 
 			tags.isNullOrEmpty() -> "/mangas/page/$page".toAbsoluteUrl(domain)
 			tags.size == 1 -> "${tags.first().key}/page/$page"
@@ -56,15 +58,17 @@ class MangaInUaParser(context: MangaLoaderContext) : PagedMangaParser(
 				}.orEmpty(),
 				altTitle = null,
 				author = null,
-				rating = item.selectFirst("div.card__short-rate--num")?.text()?.toFloatOrNull()?.div(10F)
-					?: RATING_UNKNOWN,
+				rating = item.selectFirst("div.card__short-rate--num")
+					?.text()
+					?.toFloatOrNull()
+					?.div(10F) ?: RATING_UNKNOWN,
 				url = href,
 				isNsfw = item.selectFirst("ul.card__list")?.select("li")?.lastOrNull()?.text() == "18+",
 				tags = runCatching {
 					item.selectFirst("div.card__category")?.select("a")?.mapToSet {
 						MangaTag(
 							title = it.ownText(),
-							key = it.attrOrThrow("href").removeSuffix("/"),
+							key = it.attr("href").removeSuffix("/"),
 							source = source,
 						)
 					}
@@ -79,21 +83,8 @@ class MangaInUaParser(context: MangaLoaderContext) : PagedMangaParser(
 	override suspend fun getDetails(manga: Manga): Manga {
 		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
 		val root = doc.body().requireElementById("site-content")
-		val linkToComics = root.requireElementById("linkstocomics")
-		val userHash = doc.select("script").firstNotNullOf { script ->
-			userHashRegex.find(script.html())?.groupValues?.getOrNull(1)
-		}
 		val dateFormat = SimpleDateFormat("dd.MM.yyyy", Locale.US)
-		val chapterNodes = webClient.httpPost(
-			"https://$domain/engine/ajax/controller.php?mod=load_chapters",
-			mapOf(
-				"action" to "show",
-				"news_id" to linkToComics.attrOrThrow("data-news_id"),
-				"news_category" to linkToComics.attrOrThrow("data-news_category"),
-				"this_link" to "",
-				"user_hash" to userHash,
-			),
-		).parseHtml().select(".ltcitems")
+		val chapterNodes = root.selectFirstOrThrow(".linkstocomics").select(".ltcitems")
 		var prevChapterName: String? = null
 		var i = 0
 		return manga.copy(
@@ -101,7 +92,8 @@ class MangaInUaParser(context: MangaLoaderContext) : PagedMangaParser(
 			largeCoverUrl = root.selectFirst("div.item__full-sidebar--poster")?.selectFirst("img")
 				?.attrAsAbsoluteUrlOrNull("src"),
 			chapters = chapterNodes.mapChapters { _, item ->
-				val href = item?.selectFirst("a")?.attrAsRelativeUrlOrNull("href") ?: return@mapChapters null
+				val href = item?.selectFirst("a")?.attrAsRelativeUrlOrNull("href")
+					?: return@mapChapters null
 				val isAlternative = item.styleValueOrNull("background") != null
 				val name = item.selectFirst("a")?.text().orEmpty()
 				if (!isAlternative) i++
@@ -131,14 +123,7 @@ class MangaInUaParser(context: MangaLoaderContext) : PagedMangaParser(
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
 		val fullUrl = chapter.url.toAbsoluteUrl(domain)
 		val doc = webClient.httpGet(fullUrl).parseHtml()
-		val userHash = doc.select("script").firstNotNullOf { script ->
-			userHashRegex.find(script.html())?.groupValues?.getOrNull(1)
-		}
-		val ajaxUrl = urlBuilder().addPathSegment("engine").addPathSegment("ajax").addPathSegment("controller.php")
-			.addEncodedQueryParameter("mod", "load_chapters_image")
-			.addQueryParameter("news_id", doc.requireElementById("comics").attrOrThrow("data-news_id"))
-			.addEncodedQueryParameter("action", "show").addQueryParameter("user_hash", userHash).build()
-		val root = webClient.httpGet(ajaxUrl).parseHtml().root()
+		val root = doc.body().requireElementById("comics").selectFirstOrThrow("ul.xfieldimagegallery")
 		return root.select("li").map { ul ->
 			val img = ul.selectFirstOrThrow("img")
 			val url = img.attrAsAbsoluteUrl("data-src")
@@ -151,7 +136,7 @@ class MangaInUaParser(context: MangaLoaderContext) : PagedMangaParser(
 		}
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		val domain = domain
 		val doc = webClient.httpGet("https://$domain/mangas").parseHtml()
 		val root = doc.body().requireElementById("menu_1").selectFirstOrThrow("div.menu__wrapper")
@@ -159,7 +144,7 @@ class MangaInUaParser(context: MangaLoaderContext) : PagedMangaParser(
 			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
 			MangaTag(
 				title = a.ownText(),
-				key = a.attrOrThrow("href").removeSuffix("/"),
+				key = a.attr("href").removeSuffix("/"),
 				source = source,
 			)
 		}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/MangaTownParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site.en
+package org.koitharu.kotatsu.parsers.site
 
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaParser
@@ -13,9 +13,9 @@ import java.util.*
 @MangaSourceParser("MANGATOWN", "MangaTown", "en")
 internal class MangaTownParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.MANGATOWN) {
 
-	override val configKeyDomain = ConfigKey.Domain("www.mangatown.com")
+	override val configKeyDomain = ConfigKey.Domain("www.mangatown.com", null)
 
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
+	override val sortOrders: Set<SortOrder> = EnumSet.of(
 		SortOrder.ALPHABETICAL,
 		SortOrder.RATING,
 		SortOrder.POPULARITY,
@@ -157,7 +157,7 @@ internal class MangaTownParser(context: MangaLoaderContext) : MangaParser(contex
 		return doc.requireElementById("image").attrAsAbsoluteUrl("src")
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		val doc = webClient.httpGet("/directory/".toAbsoluteUrl(domain)).parseHtml()
 		val root = doc.body().selectFirst("aside.right")
 			?.getElementsContainingOwnText("Genres")

src/main/kotlin/org/koitharu/kotatsu/parsers/site/Manhwa18Parser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site.en
+package org.koitharu.kotatsu.parsers.site
 
 import androidx.collection.ArrayMap
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
@@ -9,13 +9,14 @@ import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.util.*
 import java.util.*
 
-@MangaSourceParser("MANHWA18", "Manhwa18", "en", type = ContentType.HENTAI)
+@MangaSourceParser("MANHWA18", "Manhwa18", "en")
 class Manhwa18Parser(context: MangaLoaderContext) :
-	PagedMangaParser(context, MangaSource.MANHWA18, pageSize = 18, searchPageSize = 18) {
+	PagedMangaParser(context, MangaSource.MANHWA18, pageSize = 20, searchPageSize = 20) {
 
-	override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("manhwa18.net")
+	override val configKeyDomain: ConfigKey.Domain
+		get() = ConfigKey.Domain("manhwa18.net", null)
 
-	override val availableSortOrders: Set<SortOrder>
+	override val sortOrders: Set<SortOrder>
 		get() = EnumSet.of(SortOrder.UPDATED, SortOrder.POPULARITY, SortOrder.ALPHABETICAL, SortOrder.NEWEST)
 
 	private val tagsMap = SuspendLazy(::parseTags)
@@ -23,7 +24,7 @@ class Manhwa18Parser(context: MangaLoaderContext) :
 	override suspend fun getFavicons(): Favicons {
 		return Favicons(
 			listOf(
-				Favicon("https://$domain/uploads/logos/logo-mini.png", 92, null),
+				Favicon("https://${domain}/uploads/logos/logo-mini.png", 92, null),
 			),
 			domain,
 		)
@@ -31,20 +32,20 @@ class Manhwa18Parser(context: MangaLoaderContext) :
 
 	override suspend fun getDetails(manga: Manga): Manga {
 		val docs = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-		val cardInfoElement = docs.selectFirst("div.series-information")
-		val author = cardInfoElement?.selectFirst(".info-name:contains(Author)")?.parent()
-			?.select("a")
+		val cardInfoElement = docs.selectFirst(".card .manga-info")
+		val author = cardInfoElement?.selectFirst("b:contains(Author(s))")?.parent()
+			?.select("a.btn")
 			?.joinToString(", ") { it.text() }
 		val availableTags = tagsMap.get()
-		val tags = cardInfoElement?.selectFirst(".info-name:contains(Genre)")?.parent()
-			?.select("a")
+		val tags = cardInfoElement?.selectFirst("b:contains(Genre(s))")?.parent()
+			?.select("a.btn")
 			?.mapNotNullToSet { availableTags[it.text().lowercase(Locale.ENGLISH)] }
-		val state = cardInfoElement?.selectFirst(".info-name:contains(Status)")?.parent()
-			?.selectFirst("a")
+		val state = cardInfoElement?.selectFirst("b:contains(Status)")?.parent()
+			?.selectFirst("a.btn")
 			?.let {
-				when (it.text().lowercase()) {
-					"on going" -> MangaState.ONGOING
-					"completed" -> MangaState.FINISHED
+				when (it.text()) {
+					"On going" -> MangaState.ONGOING
+					"Completed" -> MangaState.FINISHED
 					else -> null
 				}
 			}
@@ -56,6 +57,7 @@ class Manhwa18Parser(context: MangaLoaderContext) :
 			tags = tags.orEmpty(),
 			state = state,
 			chapters = docs.select(".card-body > .list-chapters > a").mapChapters(reversed = true) { index, element ->
+				// attrAsRelativeUrl only return page url without the '/'
 				val chapterUrl = element.attrAsAbsoluteUrlOrNull("href")?.toRelativeUrl(domain)
 					?: return@mapChapters null
 				val uploadDate = parseUploadDate(element.selectFirst(".chapter-time")?.text())
@@ -169,7 +171,7 @@ class Manhwa18Parser(context: MangaLoaderContext) :
 		}
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		return tagsMap.get().values.toSet()
 	}
 

src/main/kotlin/org/koitharu/kotatsu/parsers/site/NHentaiParser.kt

@@ -0,0 +1,187 @@
+package org.koitharu.kotatsu.parsers.site
+
+import androidx.collection.ArraySet
+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.*
+import org.koitharu.kotatsu.parsers.util.*
+import java.text.SimpleDateFormat
+import java.util.*
+
+@MangaSourceParser("NHENTAI", "N-Hentai")
+class NHentaiParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.NHENTAI, pageSize = 25) {
+
+	override val configKeyDomain: ConfigKey.Domain
+		get() = ConfigKey.Domain("nhentai.net", null)
+
+	override val sortOrders: Set<SortOrder>
+		get() = EnumSet.of(SortOrder.NEWEST, SortOrder.POPULARITY)
+
+	override suspend fun getListPage(
+		page: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder,
+	): List<Manga> {
+		if (query.isNullOrEmpty() && tags != null && tags.size > 1) {
+			return getListPage(page, buildQuery(tags), emptySet(), sortOrder)
+		}
+		val domain = domain
+		val url = buildString {
+			append("https://")
+			append(domain)
+			if (!query.isNullOrEmpty()) {
+				append("/search/?q=")
+				append(query.urlEncoded())
+				append("&page=")
+				append(page)
+				if (sortOrder == SortOrder.POPULARITY) {
+					append("&sort=popular")
+				}
+			} else {
+				append('/')
+				if (!tags.isNullOrEmpty()) {
+					val tag = tags.single()
+					append("tag/")
+					append(tag.key)
+					append('/')
+					if (sortOrder == SortOrder.POPULARITY) {
+						append("popular")
+					}
+					append("?page=")
+					append(page)
+				} else {
+					if (sortOrder == SortOrder.POPULARITY) {
+						append("?sort=popular&page=")
+					} else {
+						append("?page=")
+					}
+					append(page)
+				}
+			}
+		}
+		val root = webClient.httpGet(url).parseHtml().body().requireElementById("content")
+			.selectLastOrThrow("div.index-container")
+		val regexBrackets = Regex("\\[[^]]+]|\\([^)]+\\)")
+		val regexSpaces = Regex("\\s+")
+		return root.select(".gallery").map { div ->
+			val a = div.selectFirstOrThrow("a.cover")
+			val href = a.attrAsRelativeUrl("href")
+			val img = div.selectFirstOrThrow("img")
+			val title = div.selectFirstOrThrow(".caption").text()
+			Manga(
+				id = generateUid(href),
+				title = title.replace(regexBrackets, "")
+					.replace(regexSpaces, " ")
+					.trim(),
+				altTitle = null,
+				url = href,
+				publicUrl = href.toAbsoluteUrl(domain),
+				rating = RATING_UNKNOWN,
+				isNsfw = true,
+				coverUrl = img.attrAsAbsoluteUrlOrNull("data-src")
+					?: img.attrAsAbsoluteUrl("src"),
+				tags = setOf(),
+				state = null,
+				author = null,
+				largeCoverUrl = null,
+				description = null,
+				chapters = listOf(),
+				source = source,
+			)
+		}
+	}
+
+	override suspend fun getDetails(manga: Manga): Manga {
+		val root = webClient.httpGet(
+			url = manga.url.toAbsoluteUrl(domain),
+		).parseHtml().body().requireElementById("bigcontainer")
+		val img = root.requireElementById("cover").selectFirstOrThrow("img")
+		val tagContainers = root.requireElementById("tags").select(".tag-container")
+		val dateFormat = SimpleDateFormat(
+			"yyyy-MM-dd'T'HH:mm:ss.SSSSSS'+00:00'",
+			Locale.ROOT,
+		)
+		return manga.copy(
+			tags = tagContainers.find { x -> x.ownText() == "Tags:" }?.parseTags() ?: manga.tags,
+			author = tagContainers.find { x -> x.ownText() == "Artists:" }
+				?.selectFirst("span.name")?.text()?.toCamelCase(),
+			largeCoverUrl = img.attrAsAbsoluteUrlOrNull("data-src")
+				?: img.attrAsAbsoluteUrl("src"),
+			description = null,
+			chapters = listOf(
+				MangaChapter(
+					id = manga.id,
+					name = manga.title,
+					number = 1,
+					url = manga.url,
+					scanlator = null,
+					uploadDate = dateFormat.tryParse(
+						tagContainers.find { x -> x.ownText() == "Uploaded:" }
+							?.selectFirst("time")
+							?.attr("datetime"),
+					),
+					branch = null,
+					source = source,
+				),
+			),
+		)
+	}
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		val url = chapter.url.toAbsoluteUrl(domain)
+		val root = webClient.httpGet(url).parseHtml().requireElementById("thumbnail-container")
+		return root.select(".thumb-container").map { div ->
+			val a = div.selectFirstOrThrow("a")
+			val img = div.selectFirstOrThrow("img")
+			val href = a.attrAsRelativeUrl("href")
+			MangaPage(
+				id = generateUid(href),
+				url = href,
+				preview = img.attrAsAbsoluteUrlOrNull("data-src")
+					?: img.attrAsAbsoluteUrl("src"),
+				source = source,
+			)
+		}
+	}
+
+	override suspend fun getPageUrl(page: MangaPage): String {
+		val root = webClient.httpGet(page.url.toAbsoluteUrl(domain)).parseHtml().body()
+			.requireElementById("image-container")
+		return root.selectFirstOrThrow("img").attrAsAbsoluteUrl("src")
+	}
+
+	override suspend fun getTags(): Set<MangaTag> {
+		return coroutineScope {
+			// parse first 3 pages of tags
+			(1..3).map { page ->
+				async { getTags(page) }
+			}
+		}.awaitAll().flattenTo(ArraySet(360))
+	}
+
+	private suspend fun getTags(page: Int): Set<MangaTag> {
+		val root = webClient.httpGet("https://${domain}/tags/popular?page=$page").parseHtml().body()
+			.getElementById("tag-container")
+		return root?.parseTags().orEmpty()
+	}
+
+	private fun Element.parseTags() = select("a.tag").mapToSet { a ->
+		val href = a.attr("href").removeSuffix('/')
+		MangaTag(
+			title = a.selectFirstOrThrow(".name").text().toTitleCase(),
+			key = href.substringAfterLast('/'),
+			source = source,
+		)
+	}
+
+	private fun buildQuery(tags: Collection<MangaTag>) = tags.joinToString(separator = " ") { tag ->
+		"tag:\"${tag.key}\""
+	}
+}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/NetTruyenParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site.vi
+package org.koitharu.kotatsu.parsers.site
 
 import androidx.collection.ArrayMap
 import androidx.collection.ArraySet
@@ -18,15 +18,13 @@ import java.util.*
 class NetTruyenParser(context: MangaLoaderContext) :
 	PagedMangaParser(context, MangaSource.NETTRUYEN, pageSize = 36) {
 
-	override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain(
-		"www.nettruyenlive.com",
-		"www.nettruyenio.com",
-		"www.nettruyento.com",
-		"nettruyento.com",
-		"nettruyenin.com",
-	)
+	override val configKeyDomain: ConfigKey.Domain
+		get() = ConfigKey.Domain(
+			"www.nettruyento.com",
+			arrayOf("www.nettruyento.com", "nettruyento.com", "nettruyenin.com"),
+		)
 
-	override val availableSortOrders: Set<SortOrder>
+	override val sortOrders: Set<SortOrder>
 		get() = EnumSet.of(SortOrder.UPDATED, SortOrder.POPULARITY, SortOrder.NEWEST, SortOrder.RATING)
 
 	private val mutex = Mutex()
@@ -194,7 +192,7 @@ class NetTruyenParser(context: MangaLoaderContext) :
 		}
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		val map = getOrCreateTagMap()
 		val tagSet = ArraySet<MangaTag>(map.size)
 		for (entry in map) {

src/main/kotlin/org/koitharu/kotatsu/parsers/site/NicovideoSeigaParser.kt

@@ -1,26 +1,20 @@
-package org.koitharu.kotatsu.parsers.site.ja
+package org.koitharu.kotatsu.parsers.site
 
-import okhttp3.Headers
 import org.koitharu.kotatsu.parsers.*
 import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.network.UserAgents
 import org.koitharu.kotatsu.parsers.util.*
 import java.util.*
 
 private const val STATUS_ONGOING = "連載"
 private const val STATUS_FINISHED = "完結"
 
-@MangaSourceParser("NICOVIDEO_SEIGA", "NicoVideo Seiga", "ja")
+@MangaSourceParser("NICOVIDEO_SEIGA", "Nicovideo Seiga", "ja")
 class NicovideoSeigaParser(context: MangaLoaderContext) :
 	MangaParser(context, MangaSource.NICOVIDEO_SEIGA),
 	MangaParserAuthProvider {
 
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_DESKTOP)
-		.build()
-
 	override val authUrl: String
 		get() = "https://${getDomain("account")}/login?site=seiga"
 
@@ -34,12 +28,12 @@ class NicovideoSeigaParser(context: MangaLoaderContext) :
 		return body.selectFirst("#userinfo > div > div > strong")?.text() ?: throw AuthRequiredException(source)
 	}
 
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
+	override val sortOrders: Set<SortOrder> = EnumSet.of(
 		SortOrder.UPDATED,
 		SortOrder.POPULARITY,
 	)
 
-	override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("nicovideo.jp")
+	override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("nicovideo.jp", null)
 
 	@InternalParsersApi
 	override suspend fun getList(
@@ -95,7 +89,7 @@ class NicovideoSeigaParser(context: MangaLoaderContext) :
 
 	override suspend fun getDetails(manga: Manga): Manga {
 		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(getDomain("seiga"))).parseHtml()
-		val contents = doc.body().requireElementById("contents")
+		val contents = doc.body().selectFirstOrThrow("#contents")
 		val statusText = contents
 			.select("div.mg_work_detail > div > div:nth-child(2) > div.tip.content_status.status_series > span")
 			.text()
@@ -143,7 +137,7 @@ class NicovideoSeigaParser(context: MangaLoaderContext) :
 		}
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		val doc = webClient.httpGet("https://${getDomain("seiga")}/manga/list").parseHtml()
 		val root = doc.body().selectOrThrow("#mg_category_list > ul > li")
 		return root.mapToSet { li ->

src/main/kotlin/org/koitharu/kotatsu/parsers/site/NineMangaParser.kt

@@ -1,11 +1,10 @@
-package org.koitharu.kotatsu.parsers.site.all
+package org.koitharu.kotatsu.parsers.site
 
-import androidx.collection.ArrayMap
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
+import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Interceptor
 import okhttp3.Response
+import okio.IOException
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaSourceParser
 import org.koitharu.kotatsu.parsers.PagedMangaParser
@@ -21,28 +20,32 @@ internal abstract class NineMangaParser(
 	defaultDomain: String,
 ) : PagedMangaParser(context, source, pageSize = 26), Interceptor {
 
-	override val configKeyDomain = ConfigKey.Domain(defaultDomain)
+	override val configKeyDomain = ConfigKey.Domain(defaultDomain, null)
 
 	init {
 		context.cookieJar.insertCookies(domain, "ninemanga_template_desk=yes")
 	}
 
-	override val headers = super.headers.newBuilder()
+	override val headers = Headers.Builder()
 		.add("Accept-Language", "en-US;q=0.7,en;q=0.3")
+		.add("User-Agent", "Mozilla/5.0 (Android 13; Mobile; rv:68.0) Gecko/68.0 Firefox/109.0")
 		.build()
 
-	override val availableSortOrders: Set<SortOrder> = Collections.singleton(
+	override val sortOrders: Set<SortOrder> = Collections.singleton(
 		SortOrder.POPULARITY,
 	)
 
 	override fun intercept(chain: Interceptor.Chain): Response {
 		val request = chain.request()
-		val newRequest = if (request.url.host == domain) {
-			request.newBuilder().removeHeader("Referer").build()
-		} else {
-			request
+			.newBuilder()
+			.removeHeader("Referer")
+			.build()
+		val response = chain.proceed(request)
+		val responseUrl = response.request.url
+		if (responseUrl.host != request.url.host) {
+			throw IOException("Unexpected redirect to ${responseUrl.host}")
 		}
-		return chain.proceed(newRequest)
+		return response
 	}
 
 	override suspend fun getListPage(
@@ -78,10 +81,12 @@ internal abstract class NineMangaParser(
 			append(".html")
 		}
 		val doc = webClient.httpGet(url).parseHtml()
-		val root = doc.body().selectFirst("ul.direlist") ?: doc.parseFailed("Cannot find root")
+		val root = doc.body().selectFirst("ul.direlist")
+			?: doc.parseFailed("Cannot find root")
 		val baseHost = root.baseUri().toHttpUrl().host
 		return root.select("li").map { node ->
-			val href = node.selectFirst("a")?.absUrl("href") ?: node.parseFailed("Link not found")
+			val href = node.selectFirst("a")?.absUrl("href")
+				?: node.parseFailed("Link not found")
 			val relUrl = href.toRelativeUrl(baseHost)
 			val dd = node.selectFirst("dd")
 			Manga(
@@ -108,20 +113,24 @@ internal abstract class NineMangaParser(
 		).parseHtml()
 		val root = doc.body().selectFirstOrThrow("div.manga")
 		val infoRoot = root.selectFirstOrThrow("div.bookintro")
-		val tagMap = getOrCreateTagMap()
-		val selectTag = infoRoot.getElementsByAttributeValue("itemprop", "genre").first()?.select("a")
-		val tags = selectTag?.mapNotNullToSet { tagMap[it.text()] }
 		return manga.copy(
-			tags = tags.orEmpty(),
+			tags = infoRoot.getElementsByAttributeValue("itemprop", "genre").first()
+				?.select("a")?.mapToSet { a ->
+					MangaTag(
+						title = a.text().toTitleCase(),
+						key = a.attr("href").substringBetween("/", "."),
+						source = source,
+					)
+				}.orEmpty(),
 			author = infoRoot.getElementsByAttributeValue("itemprop", "author").first()?.text(),
 			state = parseStatus(infoRoot.select("li a.red").text()),
-			description = infoRoot.getElementsByAttributeValue("itemprop", "description").first()?.html()
-				?.substringAfter("</b>"),
+			description = infoRoot.getElementsByAttributeValue("itemprop", "description").first()
+				?.html()?.substringAfter("</b>"),
 			chapters = root.selectFirst("div.chapterbox")?.select("ul.sub_vol_ul > li")
 				?.mapChapters(reversed = true) { i, li ->
 					val a = li.selectFirst("a.chapter_list_a")
-					val href =
-						a?.attrAsRelativeUrlOrNull("href")?.replace("%20", " ") ?: li.parseFailed("Link not found")
+					val href = a?.attrAsRelativeUrlOrNull("href")
+						?.replace("%20", " ") ?: li.parseFailed("Link not found")
 					MangaChapter(
 						id = generateUid(href),
 						name = a.text(),
@@ -152,56 +161,28 @@ internal abstract class NineMangaParser(
 	override suspend fun getPageUrl(page: MangaPage): String {
 		val doc = webClient.httpGet(page.url.toAbsoluteUrl(domain)).parseHtml()
 		val root = doc.body()
-		return root.selectFirst("a.pic_download")?.absUrl("href") ?: doc.parseFailed("Page image not found")
+		return root.selectFirst("a.pic_download")?.absUrl("href")
+			?: doc.parseFailed("Page image not found")
 	}
 
-	private var tagCache: ArrayMap<String, MangaTag>? = null
-	private val mutex = Mutex()
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		return getOrCreateTagMap().values.toSet()
-	}
-
-	private suspend fun getOrCreateTagMap(): Map<String, MangaTag> = mutex.withLock {
-		tagCache?.let { return@withLock it }
-		val tagMap = ArrayMap<String, MangaTag>()
-		val tagElements = webClient.httpGet("https://${domain}/search/?type=high").parseHtml().select("li.cate_list")
-		for (el in tagElements) {
-			if (el.text().isEmpty()) continue
-			val cateId = el.attr("cate_id")
-			val a = el.selectFirstOrThrow("a")
-			tagMap[el.text()] = MangaTag(
+	override suspend fun getTags(): Set<MangaTag> {
+		val doc = webClient.httpGet("https://${domain}/search/?type=high")
+			.parseHtml()
+		val root = doc.body().getElementById("search_form")
+		return root?.select("li.cate_list")?.mapNotNullToSet { li ->
+			val cateId = li.attr("cate_id") ?: return@mapNotNullToSet null
+			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
+			MangaTag(
 				title = a.text().toTitleCase(),
 				key = cateId,
 				source = source,
 			)
-		}
-		tagCache = tagMap
-		return@withLock tagMap
+		} ?: doc.parseFailed("Root not found")
 	}
 
 	private fun parseStatus(status: String) = when {
-		// en
 		status.contains("Ongoing") -> MangaState.ONGOING
 		status.contains("Completed") -> MangaState.FINISHED
-		//es
-		status.contains("En curso") -> MangaState.ONGOING
-		status.contains("Completado") -> MangaState.FINISHED
-		//ru
-		status.contains("постоянный") -> MangaState.ONGOING
-		status.contains("завершенный") -> MangaState.FINISHED
-		//de
-		status.contains("Laufende") -> MangaState.ONGOING
-		status.contains("Abgeschlossen") -> MangaState.FINISHED
-		//pt
-		status.contains("Completo") -> MangaState.ONGOING
-		status.contains("Em tradução") -> MangaState.FINISHED
-		//it
-		status.contains("In corso") -> MangaState.ONGOING
-		status.contains("Completato") -> MangaState.FINISHED
-		//fr
-		status.contains("En cours") -> MangaState.ONGOING
-		status.contains("Complété") -> MangaState.FINISHED
 		else -> null
 	}
 

src/main/kotlin/org/koitharu/kotatsu/parsers/site/NudeMoonParser.kt

@@ -0,0 +1,226 @@
+package org.koitharu.kotatsu.parsers.site
+
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
+import org.koitharu.kotatsu.parsers.MangaSourceParser
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
+import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.util.*
+import java.text.SimpleDateFormat
+import java.util.*
+
+private const val MAX_THUMB_INDEX = 19
+
+@MangaSourceParser("NUDEMOON", "Nude-Moon", "ru")
+internal class NudeMoonParser(
+	context: MangaLoaderContext,
+) : MangaParser(context, MangaSource.NUDEMOON), MangaParserAuthProvider {
+
+	override val configKeyDomain = ConfigKey.Domain(
+		defaultValue = "nude-moon.org",
+		presetValues = arrayOf("nude-moon.org", "nude-moon.net"),
+	)
+	override val authUrl: String
+		get() = "https://${domain}/index.php"
+
+	override val isAuthorized: Boolean
+		get() {
+			return context.cookieJar.getCookies(domain).any {
+				it.name == "fusion_user"
+			}
+		}
+
+	override val sortOrders: Set<SortOrder> = EnumSet.of(
+		SortOrder.NEWEST,
+		SortOrder.POPULARITY,
+		SortOrder.RATING,
+	)
+
+	init {
+		context.cookieJar.insertCookies(
+			domain,
+			"NMfYa=1;",
+			"nm_mobile=0;",
+		)
+	}
+
+	override suspend fun getList(
+		offset: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder,
+	): List<Manga> {
+		val domain = domain
+		val url = when {
+			!query.isNullOrEmpty() -> "https://$domain/search?stext=${query.urlEncoded()}&rowstart=$offset"
+			!tags.isNullOrEmpty() -> tags.joinToString(
+				separator = "_",
+				prefix = "https://$domain/tags/",
+				postfix = "&rowstart=$offset",
+				transform = { it.key.urlEncoded() },
+			)
+
+			else -> "https://$domain/all_manga?${getSortKey(sortOrder)}&rowstart=$offset"
+		}
+		val doc = webClient.httpGet(url).parseHtml()
+		val root = doc.body().run {
+			selectFirst("td.main-bg") ?: selectFirst("td.main-body")
+		} ?: doc.parseFailed("Cannot find root")
+		return root.select("table.news_pic2").mapNotNull { row ->
+			val a = row.selectFirst("td.bg_style1")?.selectFirst("a")
+				?: return@mapNotNull null
+			val href = a.attrAsRelativeUrl("href")
+			val title = a.selectFirst("h2")?.text().orEmpty()
+			val info = row.selectFirst("td[width=100%]") ?: return@mapNotNull null
+			Manga(
+				id = generateUid(href),
+				url = href,
+				title = title.substringAfter(" / "),
+				altTitle = title.substringBefore(" / ", "")
+					.takeUnless { it.isBlank() },
+				author = info.getElementsContainingOwnText("Автор:").firstOrNull()
+					?.nextElementSibling()?.ownText(),
+				coverUrl = row.selectFirst("img.news_pic2")?.absUrl("data-src")
+					.orEmpty(),
+				tags = row.selectFirst("span.tag-links")?.select("a")
+					?.mapToSet {
+						MangaTag(
+							title = it.text().toTitleCase(),
+							key = it.attr("href").substringAfterLast('/'),
+							source = source,
+						)
+					}.orEmpty(),
+				source = source,
+				publicUrl = a.absUrl("href"),
+				rating = RATING_UNKNOWN,
+				isNsfw = true,
+				description = row.selectFirst("div.description")?.html(),
+				state = null,
+			)
+		}
+	}
+
+	override suspend fun getDetails(manga: Manga): Manga {
+		val body = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml().body()
+		val root = body.selectFirst("table.shoutbox")
+			?: body.parseFailed("Cannot find root")
+		val info = root.select("div.tbl2")
+		val lastInfo = info.last()
+		return manga.copy(
+			largeCoverUrl = body.selectFirst("img.news_pic2")?.absUrl("src"),
+			description = info.select("div.blockquote").lastOrNull()?.html() ?: manga.description,
+			tags = info.select("span.tag-links").firstOrNull()?.select("a")?.mapToSet {
+				MangaTag(
+					title = it.text().toTitleCase(),
+					key = it.attr("href").substringAfterLast('/'),
+					source = source,
+				)
+			}?.plus(manga.tags) ?: manga.tags,
+			author = lastInfo?.getElementsByAttributeValueContaining("href", "mangaka/")?.text()
+				?: manga.author,
+			chapters = listOf(
+				MangaChapter(
+					id = manga.id,
+					url = getReadLink(manga.url),
+					source = source,
+					number = 1,
+					name = manga.title,
+					scanlator = lastInfo?.getElementsByAttributeValueContaining("href", "perevod/")?.text(),
+					uploadDate = lastInfo?.getElementsContainingOwnText("Дата:")
+						?.firstOrNull()
+						?.html()
+						?.parseDate() ?: 0L,
+					branch = null,
+				),
+			),
+		)
+	}
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		val fullUrl = chapter.url.toAbsoluteUrl(domain)
+		val doc = webClient.httpGet(fullUrl).parseHtml()
+		val mangaId = chapter.url.substringAfterLast('/').substringBefore('-').toIntOrNull()
+
+		val script = doc.select("script").firstNotNullOfOrNull {
+			it.html().takeIf { x -> x.contains(" images = new ") }
+		} ?: if (isAuthorized) {
+			doc.parseFailed("Cannot find pages list")
+		} else {
+			throw AuthRequiredException(source)
+		}
+		val pagesRegex = Regex("images\\[(\\d+)].src\\s*=\\s*'([^']+)'", RegexOption.MULTILINE)
+		return pagesRegex.findAll(script).map { match ->
+			val i = match.groupValues[1].toInt()
+			val url = match.groupValues[2]
+			MangaPage(
+				id = generateUid(url),
+				url = url,
+				preview = if (i <= MAX_THUMB_INDEX && mangaId != null) {
+					val part2 = url.substringBeforeLast('/')
+					val part3 = url.substringAfterLast('/')
+					val part1 = part2.substringBeforeLast('/')
+					"$part1/thumb/$mangaId/thumb_$part3"
+				} else {
+					null
+				},
+				source = source,
+			)
+		}.toList()
+	}
+
+	override suspend fun getTags(): Set<MangaTag> {
+		val domain = domain
+		val doc = webClient.httpGet("https://$domain/all_manga").parseHtml()
+		val root = doc.body().getElementsContainingOwnText("Поиск манги по тегам")
+			.firstOrNull()?.parents()?.find { it.tag().normalName() == "tbody" }
+			?.selectFirst("td.textbox")?.selectFirst("td.small")
+			?: doc.parseFailed("Tags root not found")
+		return root.select("a").mapToSet {
+			MangaTag(
+				title = it.text().toTitleCase(),
+				key = it.attr("href").substringAfterLast('/')
+					.removeSuffix("+"),
+				source = source,
+			)
+		}
+	}
+
+	override suspend fun getUsername(): String {
+		val body = webClient.httpGet("https://${domain}/").parseHtml()
+			.body()
+		return body
+			.getElementsContainingOwnText("Профиль")
+			.firstOrNull()
+			?.attr("href")
+			?.substringAfterLast('/')
+			?: run {
+				throw if (body.selectFirst("form[name=\"loginform\"]") != null) {
+					AuthRequiredException(source)
+				} else {
+					body.parseFailed("Cannot find username")
+				}
+			}
+	}
+
+	private fun getSortKey(sortOrder: SortOrder) =
+		when (sortOrder) {
+			SortOrder.POPULARITY -> "views"
+			SortOrder.NEWEST -> "date"
+			SortOrder.RATING -> "like"
+			else -> "like"
+		}
+
+	private fun String.parseDate(): Long {
+		val dateString = substringBetweenFirst("Дата:", "<")?.trim() ?: return 0
+		val dateFormat = SimpleDateFormat("d MMMM yyyy", Locale("ru"))
+		return dateFormat.tryParse(dateString)
+	}
+
+	private fun getReadLink(url: String): String {
+		val prefix = url.substringBefore('-', "")
+		val suffix = url.substringAfter('-').trimStart('-')
+		return "$prefix-online-$suffix"
+	}
+}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/RemangaParser.kt

@@ -1,9 +1,6 @@
-package org.koitharu.kotatsu.parsers.site.ru
+package org.koitharu.kotatsu.parsers.site
 
 import okhttp3.Headers
-import okhttp3.Interceptor
-import okhttp3.Response
-import okhttp3.internal.closeQuietly
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
@@ -15,7 +12,6 @@ import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.exception.ContentUnavailableException
 import org.koitharu.kotatsu.parsers.exception.ParseException
 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.*
 import java.net.URLDecoder
@@ -26,28 +22,24 @@ import java.util.*
 private const val PAGE_SIZE = 30
 private const val STATUS_ONGOING = 1
 private const val STATUS_FINISHED = 0
-private const val TOO_MANY_REQUESTS = 429
 
-@MangaSourceParser("REMANGA", "ReManga", "ru")
+@MangaSourceParser("REMANGA", "Remanga", "ru")
 internal class RemangaParser(
 	context: MangaLoaderContext,
-) : PagedMangaParser(context, MangaSource.REMANGA, PAGE_SIZE), MangaParserAuthProvider, Interceptor {
+) : PagedMangaParser(context, MangaSource.REMANGA, PAGE_SIZE), MangaParserAuthProvider {
 
-	private val userAgentKey = ConfigKey.UserAgent(UserAgents.CHROME_MOBILE)
-
-	private val baseHeaders: Headers
-		get() = Headers.Builder()
-			.add("User-Agent", config[userAgentKey])
-			.build()
+	private val baseHeaders = Headers.Builder()
+		.add("User-Agent", "Mozilla/5.0 (Android 13; Mobile; rv:68.0) Gecko/68.0 Firefox/109.0")
+		.build()
 
 	override val headers
 		get() = getApiHeaders()
 
-	override val configKeyDomain = ConfigKey.Domain("remanga.org", "реманга.орг")
+	override val configKeyDomain = ConfigKey.Domain("remanga.org", arrayOf("remanga.org", "реманга.орг"))
 	override val authUrl: String
 		get() = "https://${domain}/user/login"
 
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
+	override val sortOrders: Set<SortOrder> = EnumSet.of(
 		SortOrder.UPDATED,
 		SortOrder.POPULARITY,
 		SortOrder.RATING,
@@ -63,16 +55,6 @@ internal class RemangaParser(
 
 	private val regexLastUrlPath = Regex("/[^/]+/?$")
 
-	override fun intercept(chain: Interceptor.Chain): Response {
-		val response = chain.proceed(chain.request())
-		if (response.code == TOO_MANY_REQUESTS) {
-			response.closeQuietly()
-			Thread.sleep(1000)
-			return chain.proceed(chain.request().newBuilder().build())
-		}
-		return response
-	}
-
 	override suspend fun getListPage(
 		page: Int,
 		query: String?,
@@ -221,7 +203,7 @@ internal class RemangaParser(
 		return result
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		val domain = domain
 		val content = webClient.httpGet("https://api.$domain/api/forms/titles/?get=genres")
 			.parseJson().getJSONObject("content").getJSONArray("genres")
@@ -241,11 +223,6 @@ internal class RemangaParser(
 		return jo.getJSONObject("content").getString("username")
 	}
 
-	override fun onCreateConfig(keys: MutableCollection<ConfigKey<*>>) {
-		super.onCreateConfig(keys)
-		keys.add(userAgentKey)
-	}
-
 	private fun getApiHeaders(): Headers {
 		val userCookie = context.cookieJar.getCookies(domain).find {
 			it.name == "user"
@@ -280,7 +257,7 @@ internal class RemangaParser(
 		var page = 1
 		while (true) {
 			val content = webClient.httpGet(
-				url = "https://api.$domain/api/titles/chapters/?branch_id=$branchId&page=$page&count=500",
+				url = "https://api.$domain/api/titles/chapters/?branch_id=$branchId&page=$page&count=100",
 			).parseJson().getJSONArray("content")
 			val len = content.length()
 			if (len == 0) {

src/main/kotlin/org/koitharu/kotatsu/parsers/site/TruyentranhLHParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site.vi
+package org.koitharu.kotatsu.parsers.site
 
 import androidx.collection.ArrayMap
 import androidx.collection.ArraySet
@@ -17,8 +17,8 @@ import java.util.*
 class TruyentranhLHParser(context: MangaLoaderContext) :
 	PagedMangaParser(context, source = MangaSource.TRUYENTRANHLH, pageSize = 18) {
 
-	override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("truyentranhlh.net")
-	override val availableSortOrders: Set<SortOrder> = EnumSet.allOf(SortOrder::class.java)
+	override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("truyentranhlh.net", null)
+	override val sortOrders: Set<SortOrder> = EnumSet.allOf(SortOrder::class.java)
 
 	private val mutex = Mutex()
 	private var tagCache: Map<String, MangaTag>? = null
@@ -130,7 +130,7 @@ class TruyentranhLHParser(context: MangaLoaderContext) :
 		}
 	}
 
-	override suspend fun getAvailableTags(): Set<MangaTag> {
+	override suspend fun getTags(): Set<MangaTag> {
 		return ArraySet(getOrCreateTagMap().values)
 	}
 

src/main/kotlin/org/koitharu/kotatsu/parsers/site/UnionMangasParser.kt

@@ -0,0 +1,176 @@
+package org.koitharu.kotatsu.parsers.site
+
+import org.jsoup.nodes.Element
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaSourceParser
+import org.koitharu.kotatsu.parsers.PagedMangaParser
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.util.*
+import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
+import org.koitharu.kotatsu.parsers.util.json.mapJSON
+import java.text.SimpleDateFormat
+import java.util.*
+
+@MangaSourceParser("UNION_MANGAS", "Union Mangás", "pt")
+class UnionMangasParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.UNION_MANGAS, 40) {
+
+	override val sortOrders = EnumSet.of(
+		SortOrder.ALPHABETICAL,
+		SortOrder.POPULARITY,
+	)
+
+	override val configKeyDomain = ConfigKey.Domain("unionleitor.top", emptyArray())
+
+	override suspend fun getListPage(
+		page: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder,
+	): List<Manga> {
+		if (!query.isNullOrEmpty()) {
+			return if (page == searchPaginator.firstPage) {
+				search(query)
+			} else {
+				emptyList()
+			}
+		}
+		val tag = tags.oneOrThrowIfMany()
+		val url = urlBuilder()
+			.addPathSegment("lista-mangas")
+			.addPathSegment(
+				when {
+					tag != null -> tag.key
+					sortOrder == SortOrder.ALPHABETICAL -> "a-z"
+					else -> "visualizacoes"
+				},
+			).addPathSegment(page.toString())
+		val doc = webClient.httpGet(url.build()).parseHtml()
+		val root = doc.selectFirstOrThrow("div.tamanho-bloco-perfil")
+		return root.select(".lista-mangas-novos").map { div ->
+			val a = div.selectFirstOrThrow("a")
+			val img = div.selectFirstOrThrow("img")
+			val href = a.attrAsRelativeUrl("href")
+			Manga(
+				id = generateUid(href),
+				url = href,
+				publicUrl = a.attrAsAbsoluteUrl("href"),
+				title = div.selectLastOrThrow("a").text(),
+				coverUrl = img.attrAsAbsoluteUrl("src"),
+				altTitle = null,
+				rating = RATING_UNKNOWN,
+				tags = emptySet(),
+				description = div.selectLast("div")?.ownText(),
+				state = null,
+				author = null,
+				isNsfw = false,
+				source = source,
+			)
+		}
+	}
+
+	override suspend fun getDetails(manga: Manga): Manga {
+		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
+		val root = doc.selectFirstOrThrow(".perfil-manga")
+		val dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.ROOT)
+		return manga.copy(
+			rating = root.select("h2")
+				.find { it.ownText().startsWith('#') }
+				?.ownText()?.drop(1)?.toFloatOrNull()?.div(10f) ?: manga.rating,
+			largeCoverUrl = root.selectFirst("img.img-thumbnail")?.attrAsAbsoluteUrlOrNull("src"),
+			description = root.selectFirst(".panel-default")?.selectFirst(".panel-body")?.html(),
+			author = root.tableValue("Autor")?.ownText(),
+			altTitle = root.tableValue("Título(s) Alternativo(s)")?.ownText(),
+			state = when (root.tableValue("Status")?.selectLast(".label")?.text()) {
+				"Completo" -> MangaState.FINISHED
+				"Ativo" -> MangaState.ONGOING
+				else -> null
+			},
+			tags = root.tableValue("Gênero(s)")?.select("a")?.mapToSet {
+				it.toMangaTag()
+			} ?: manga.tags,
+			isNsfw = root.selectFirst(".alert-danger")?.html()?.contains("18 anos") == true,
+			chapters = root.select("div.row.capitulos").mapChapters(reversed = true) { i, div ->
+				val a = div.selectFirstOrThrow("a")
+				val href = a.attrAsRelativeUrl("href")
+				val title = a.text()
+				MangaChapter(
+					id = generateUid(href),
+					name = title,
+					number = i + 1,
+					url = href,
+					scanlator = div.selectLast("a")?.text()?.takeUnless { it == title },
+					uploadDate = dateFormat.tryParse(
+						a.nextElementSibling()?.text()?.removeSurrounding("(", ")"),
+					),
+					branch = null,
+					source = source,
+				)
+			},
+		)
+	}
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		val fullUrl = chapter.url.toAbsoluteUrl(domain)
+		val doc = webClient.httpGet(fullUrl).parseHtml()
+		val root = doc.body().selectFirstOrThrow("article")
+		return root.selectOrThrow("img[pag]").mapNotNull { img ->
+			val href = img.attrAsRelativeUrl("src")
+			if (href.startsWith("/images/banner")) {
+				return@mapNotNull null
+			}
+			MangaPage(
+				id = generateUid(href),
+				url = href,
+				preview = null,
+				source = source,
+			)
+		}
+	}
+
+	override suspend fun getTags(): Set<MangaTag> {
+		val doc = webClient.httpGet(urlBuilder().addPathSegment("lista-mangas").build()).parseHtml()
+		val ul = doc.body().selectFirstOrThrow(".nav-tabs").selectFirstOrThrow("ul.dropdown-menu")
+		return ul.select("li").mapToSet { li ->
+			li.selectFirstOrThrow("a").toMangaTag()
+		}
+	}
+
+	private suspend fun search(query: String): List<Manga> {
+		val domain = domain
+		val json = webClient.httpGet(
+			urlBuilder()
+				.addPathSegments("assets/busca.php")
+				.addQueryParameter("nomeManga", query)
+				.build(),
+		).parseJson()
+		return json.getJSONArray("items").mapJSON { jo ->
+			val href = "/pagina-manga/" + jo.getString("url")
+			Manga(
+				id = generateUid(href),
+				url = href,
+				publicUrl = href.toAbsoluteUrl(domain),
+				title = jo.getString("titulo"),
+				rating = RATING_UNKNOWN,
+				tags = emptySet(),
+				author = jo.getStringOrNull("autor"),
+				coverUrl = jo.getString("imagem"),
+				state = null,
+				isNsfw = false,
+				altTitle = null,
+				source = source,
+			)
+		}
+	}
+
+	private fun Element.tableValue(title: String): Element? {
+		return select("h4.media-heading")
+			.find { it.selectFirst("label.subtit-manga")?.text()?.contains(title, ignoreCase = true) == true }
+	}
+
+	private fun Element.toMangaTag() = MangaTag(
+		title = text().toTitleCase(sourceLocale),
+		key = attr("href").removeSuffix('/').substringAfterLast('/'),
+		source = source,
+	)
+}

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

@@ -1,182 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.all
-
-import androidx.collection.ArraySet
-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.*
-import org.koitharu.kotatsu.parsers.util.*
-import java.util.*
-
-@MangaSourceParser("IMHENTAI", "ImHentai", type = ContentType.HENTAI)
-internal class ImHentai(context: MangaLoaderContext) :
-	PagedMangaParser(context, MangaSource.IMHENTAI, pageSize = 20) {
-
-	override val availableSortOrders: Set<SortOrder> =
-		EnumSet.of(SortOrder.UPDATED, SortOrder.POPULARITY, SortOrder.RATING)
-
-	override val configKeyDomain = ConfigKey.Domain("imhentai.xxx")
-
-	override val isMultipleTagsSupported = false
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url = buildString {
-			append("https://")
-			append(domain)
-
-			if (!query.isNullOrEmpty()) {
-				append("/search/?key=")
-				append(query.urlEncoded())
-				append("&page=")
-				append(page)
-			} else if (!tags.isNullOrEmpty()) {
-				append("/tag/")
-				append(tag?.key.orEmpty())
-				append("/")
-				when (sortOrder) {
-					SortOrder.UPDATED -> append("")
-					SortOrder.POPULARITY -> append("popular/")
-					else -> append("")
-				}
-				append("?page=")
-				append(page)
-			} else {
-				append("/search/?page=")
-				append(page)
-				when (sortOrder) {
-					SortOrder.UPDATED -> append("&lt=1&pp=0")
-					SortOrder.POPULARITY -> append("&lt=0&pp=1")
-					SortOrder.RATING -> append("&lt=0&pp=0")
-					else -> append("&lt=1&pp=0")
-				}
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select("div.galleries div.thumb").map { div ->
-			val a = div.selectFirstOrThrow(".inner_thumb a")
-			val href = a.attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				coverUrl = a.selectFirst("img")?.src().orEmpty(),
-				title = div.selectFirst(".caption")?.text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	//Tags are deliberately reduced because there are too many and this slows down the application.
-	//only the most popular ones are taken.
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		return coroutineScope {
-			(1..3).map { page ->
-				async { getTags(page) }
-			}
-		}.awaitAll().flattenTo(ArraySet(360))
-	}
-
-	private suspend fun getTags(page: Int): Set<MangaTag> {
-		val url = "https://$domain/tags/popular/?page=$page"
-		val root = webClient.httpGet(url).parseHtml()
-		return root.parseTags()
-	}
-
-	private fun Element.parseTags() = select("div.stags a.tag_btn").mapToSet {
-		val href = it.attr("href").substringAfterLast("tag/").substringBeforeLast('/')
-		MangaTag(
-			key = href,
-			title = it.selectFirstOrThrow("h3.list_tag").text(),
-			source = source,
-		)
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		manga.copy(
-			tags = doc.body().select("li:contains(Tags) a.tag").mapNotNullToSet {
-				val href = it.attr("href").substringAfterLast("tag/").substringBeforeLast('/')
-				val name = it.html().substringBeforeLast("<span")
-				MangaTag(
-					key = href,
-					title = name,
-					source = source,
-				)
-			},
-			author = doc.selectFirst("li:contains(Artists) a.tag")?.html()?.substringBefore("<span"),
-			chapters = listOf(
-				MangaChapter(
-					id = manga.id,
-					name = manga.title,
-					number = 1,
-					url = manga.url,
-					scanlator = null,
-					uploadDate = 0,
-					branch = doc.selectFirst("li:contains(Language) a.tag")?.html()?.substringBeforeLast("<span"),
-					source = source,
-				),
-			),
-		)
-	}
-
-	override suspend fun getRelatedManga(seed: Manga): List<Manga> {
-		val doc = webClient.httpGet(seed.url.toAbsoluteUrl(domain)).parseHtml()
-		val root = doc.body().selectFirstOrThrow("div.related")
-		return root.select("div.thumb").mapNotNull { div ->
-			val a = div.selectFirstOrThrow(".inner_thumb a")
-			val href = a.attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				coverUrl = a.selectFirst("img")?.src().orEmpty(),
-				title = div.selectFirst(".caption")?.text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = false,
-			)
-		}
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		val totalPages = doc.selectFirstOrThrow(".pages").text().replace("Pages: ", "").toInt() + 1
-		val domainImg = doc.requireElementById("append_thumbs").selectFirstOrThrow("img").src()?.replace("1t.jpg", "")
-		val pages = ArrayList<MangaPage>(totalPages)
-		for (i in 1 until totalPages) {
-			val url = "$domainImg$i.jpg"
-			pages.add(
-				MangaPage(
-					id = generateUid(url),
-					url = url,
-					preview = null,
-					source = source,
-				),
-			)
-		}
-		return pages
-	}
-}

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

@@ -1,320 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.all
-
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import okhttp3.Headers
-import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.json.JSONObject
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaParser
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.exception.NotFoundException
-import org.koitharu.kotatsu.parsers.exception.ParseException
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.util.*
-import org.koitharu.kotatsu.parsers.util.json.*
-import java.util.*
-import javax.crypto.Mac
-import javax.crypto.spec.SecretKeySpec
-
-internal abstract class LineWebtoonsParser(
-	context: MangaLoaderContext,
-	source: MangaSource,
-) : MangaParser(context, source) {
-
-	override val isMultipleTagsSupported = false
-
-	private val signer by lazy {
-		WebtoonsUrlSigner("gUtPzJFZch4ZyAGviiyH94P99lQ3pFdRTwpJWDlSGFfwgpr6ses5ALOxWHOIT7R1")
-	}
-
-	// we don't __really__ support changing this domain because:
-	// 1. I don't think other websites have this exact API
-	// 2. most communication is done with other domains (hosting API and static content), which are not configurable
-	// 3. we rely on the HTTP client setting the referer header to webtoons.com
-	//
-	// This effectively means that changing the domain will break the source. Yikes
-	override val configKeyDomain = ConfigKey.Domain("webtoons.com")
-
-	private val apiDomain = "global.apis.naver.com"
-	private val staticDomain = "webtoon-phinf.pstatic.net"
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.POPULARITY,
-		// doesn't actually sort by rating, but by likes
-		// this should be fine though
-		SortOrder.RATING,
-		SortOrder.UPDATED,
-	)
-	override val headers: Headers
-		get() = Headers.Builder()
-			.add("User-Agent", "nApps (Android 12;; linewebtoon; 3.1.0)")
-			.build()
-
-	override suspend fun getPageUrl(page: MangaPage): String {
-		return page.url.toAbsoluteUrl(staticDomain)
-	}
-
-	// some language tags do not map perfectly to the ones used by the API
-	private val languageCode: String
-		get() = when (val tag = sourceLocale.toLanguageTag()) {
-			"in" -> "id"
-			"zh" -> "zh-hant"
-			else -> tag
-		}
-
-	private suspend fun getChapters(titleNo: Long): List<MangaChapter> {
-		val firstResult = makeRequest(
-			url = "/lineWebtoon/webtoon/challengeEpisodeList.json?v=2&titleNo=$titleNo&startIndex=0&pageSize=30",
-		)
-
-		val totalEpisodeCount = firstResult
-			.getJSONObject("episodeList")
-			.getInt("totalServiceEpisodeCount")
-
-		val episodes = firstResult
-			.getJSONObject("episodeList")
-			.getJSONArray("episode")
-			.toJSONList()
-			.toMutableList()
-
-		while (episodes.count() < totalEpisodeCount) {
-			val page = makeRequest(
-				url = "/lineWebtoon/webtoon/challengeEpisodeList.json?v=2&titleNo=$titleNo&startIndex=${episodes.count()}&pageSize=30",
-			).getJSONObject("episodeList")
-				.getJSONArray("episode")
-				.toJSONList()
-
-			episodes.addAll(page)
-		}
-
-		return episodes.mapChapters { i, jo ->
-			MangaChapter(
-				id = generateUid("$titleNo-$i"),
-				name = jo.getString("episodeTitle"),
-				number = jo.getInt("episodeSeq"),
-				url = "$titleNo-${jo.get("episodeNo")}",
-				uploadDate = jo.getLong("modifyYmdt"),
-				branch = null,
-				scanlator = null,
-				source = source,
-			)
-		}.sortedBy { it.number }
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val titleNo = manga.url.toLong()
-		val chaptersDeferred = async { getChapters(titleNo) }
-
-		makeRequest("/lineWebtoon/webtoon/challengeTitleInfo.json?v=2&titleNo=${titleNo}")
-			.getJSONObject("titleInfo")
-			.let { jo ->
-				Manga(
-					id = generateUid(titleNo),
-					title = jo.getString("title"),
-					altTitle = null,
-					url = "$titleNo",
-					publicUrl = "https://$domain/$languageCode/canvas/a/list?title_no=${titleNo}",
-					rating = jo.getFloatOrDefault("starScoreAverage", -10f) / 10f,
-					isNsfw = jo.getBooleanOrDefault("ageGradeNotice", isNsfwSource),
-					coverUrl = jo.getString("thumbnail").toAbsoluteUrl(staticDomain),
-					largeCoverUrl = jo.getStringOrNull("thumbnailVertical")?.toAbsoluteUrl(staticDomain),
-					tags = setOf(parseTag(jo.getJSONObject("genreInfo"))),
-					author = jo.getStringOrNull("writingAuthorName"),
-					description = jo.getString("synopsis"),
-					// I don't think the API provides this info
-					state = null,
-					chapters = chaptersDeferred.await(),
-					source = source,
-				)
-			}
-	}
-
-	override suspend fun getList(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val genre = tags.oneOrThrowIfMany()?.key ?: "ALL"
-
-		val sortOrderStr = when (sortOrder) {
-			SortOrder.UPDATED -> "UPDATE"
-			SortOrder.POPULARITY -> "READ_COUNT"
-			SortOrder.RATING -> "LIKEIT"
-			else -> throw IllegalArgumentException("Unsupported sort order: $sortOrder")
-		}
-
-		val manga = if (query != null) {
-			if (!tags.isNullOrEmpty()) {
-				throw IllegalArgumentException("This source does not support search with tags")
-			}
-
-			makeRequest("/lineWebtoon/webtoon/searchChallenge?query=${query.urlEncoded()}&startIndex=${offset + 1}&pageSize=20")
-				.getJSONObject("challengeSearch")
-				.getJSONArray("titleList")
-				.mapJSON { jo ->
-					val titleNo = jo.getLong("titleNo")
-
-					Manga(
-						id = generateUid(titleNo),
-						title = jo.getString("title"),
-						altTitle = null,
-						url = titleNo.toString(),
-						publicUrl = "https://$domain/$languageCode/canvas/a/list?title_no=$titleNo",
-						rating = RATING_UNKNOWN,
-						isNsfw = isNsfwSource,
-						coverUrl = jo.getString("thumbnail").toAbsoluteUrl(staticDomain),
-						largeCoverUrl = null,
-						tags = emptySet(),
-						author = jo.getStringOrNull("writingAuthorName"),
-						description = null,
-						state = null,
-						source = source,
-					)
-				}
-		} else {
-			val result =
-				makeRequest("/lineWebtoon/webtoon/challengeGenreTitleList.json?genre=$genre&sortOrder=$sortOrderStr&startIndex=${offset + 1}&pageSize=20")
-
-			val genres = result.getJSONObject("genreList")
-				.getJSONArray("challengeGenres")
-				.mapJSON { jo -> parseTag(jo) }
-				.associateBy { tag -> tag.key }
-
-			result
-				.getJSONObject("titleList")
-				.getJSONArray("titles")
-				.mapJSON { jo ->
-					val titleNo = jo.getLong("titleNo")
-
-					Manga(
-						id = generateUid(titleNo),
-						title = jo.getString("title"),
-						altTitle = null,
-						url = titleNo.toString(),
-						publicUrl = "https://$domain/$languageCode/canvas/a/list?title_no=$titleNo",
-						rating = jo.getFloatOrDefault("starScoreAverage", -10f) / 10f,
-						isNsfw = jo.getBooleanOrDefault("ageGradeNotice", isNsfwSource),
-						coverUrl = jo.getString("thumbnail").toAbsoluteUrl(staticDomain),
-						largeCoverUrl = jo.getStringOrNull("thumbnailVertical")?.toAbsoluteUrl(staticDomain),
-						tags = setOfNotNull(genres[jo.getString("representGenre")]),
-						author = jo.getStringOrNull("writingAuthorName"),
-						description = jo.getString("synopsis"),
-						// I don't think the API provides this info
-						state = null,
-						source = source,
-					)
-				}
-		}
-
-		return manga
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val (titleNo, episodeNo) = requireNotNull(chapter.url.splitTwoParts('-'))
-
-		return makeRequest("/lineWebtoon/webtoon/challengeEpisodeInfo.json?v=2&titleNo=$titleNo&episodeNo=$episodeNo")
-			.getJSONObject("episodeInfo")
-			.getJSONArray("imageInfo")
-			.mapJSONIndexed { i, jo ->
-				MangaPage(
-					id = generateUid("$titleNo-$episodeNo-$i"),
-					url = jo.getString("url"),
-					preview = null,
-					source = source,
-				)
-			}
-	}
-
-	private fun parseTag(jo: JSONObject): MangaTag {
-		return MangaTag(
-			title = jo.getString("name"),
-			key = jo.getString("code"),
-			source = source,
-		)
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		return makeRequest("/lineWebtoon/webtoon/challengeGenreList.json")
-			.getJSONObject("genreList")
-			.getJSONArray("challengeGenres")
-			.mapJSONToSet { jo -> parseTag(jo) }
-	}
-
-	private suspend fun makeRequest(url: String): JSONObject {
-		val resp = webClient.httpGet(finalizeUrl(url))
-		val message: JSONObject? = resp.parseJson().optJSONObject("message")
-		return when (resp.code) {
-			in 200..299 -> checkNotNull(message).getJSONObject("result")
-			404 -> throw NotFoundException(message?.getStringOrNull("message").orEmpty(), url)
-			else -> {
-				val code = message?.getIntOrDefault("code", 0)
-				val errorMessage = message?.getStringOrNull("message")
-				throw ParseException("Api error (code=$code): $errorMessage", url)
-			}
-		}
-	}
-
-	private fun finalizeUrl(url: String): HttpUrl {
-		val httpUrl = url.toAbsoluteUrl(apiDomain).toHttpUrl()
-		val builder = httpUrl.newBuilder()
-			.addQueryParameter("serviceZone", "GLOBAL")
-		if (httpUrl.queryParameter("v") == null) {
-			builder.addQueryParameter("v", "1")
-		}
-		builder.addQueryParameter("language", languageCode)
-			.addQueryParameter("locale", "languageCode")
-			.addQueryParameter("platform", "APP_ANDROID")
-		signer.makeEncryptUrl(builder)
-		return builder.build()
-	}
-
-	@MangaSourceParser("LINEWEBTOONS_EN", "LineWebtoons English", "en", type = ContentType.MANGA)
-	class English(context: MangaLoaderContext) : LineWebtoonsParser(context, MangaSource.LINEWEBTOONS_EN)
-
-	@MangaSourceParser("LINEWEBTOONS_ZH", "LineWebtoons Chinese", "zh", type = ContentType.MANGA)
-	class Chinese(context: MangaLoaderContext) : LineWebtoonsParser(context, MangaSource.LINEWEBTOONS_ZH)
-
-	@MangaSourceParser("LINEWEBTOONS_TH", "LineWebtoons Thai", "th", type = ContentType.MANGA)
-	class Thai(context: MangaLoaderContext) : LineWebtoonsParser(context, MangaSource.LINEWEBTOONS_TH)
-
-	@MangaSourceParser("LINEWEBTOONS_ID", "LineWebtoons Indonesian", "id", type = ContentType.MANGA)
-	class Indonesian(context: MangaLoaderContext) : LineWebtoonsParser(context, MangaSource.LINEWEBTOONS_ID)
-
-	@MangaSourceParser("LINEWEBTOONS_ES", "LineWebtoons Spanish", "es", type = ContentType.MANGA)
-	class Spanish(context: MangaLoaderContext) : LineWebtoonsParser(context, MangaSource.LINEWEBTOONS_ES)
-
-	@MangaSourceParser("LINEWEBTOONS_FR", "LineWebtoons French", "fr", type = ContentType.MANGA)
-	class French(context: MangaLoaderContext) : LineWebtoonsParser(context, MangaSource.LINEWEBTOONS_FR)
-
-	@MangaSourceParser("LINEWEBTOONS_DE", "LineWebtoons German", "de", type = ContentType.MANGA)
-	class German(context: MangaLoaderContext) : LineWebtoonsParser(context, MangaSource.LINEWEBTOONS_DE)
-
-	private inner class WebtoonsUrlSigner(private val secret: String) {
-
-		private val mac = Mac.getInstance("HmacSHA1").apply {
-			this.init(SecretKeySpec(secret.encodeToByteArray(), "HmacSHA1"))
-		}
-
-		private fun getMessage(url: String, msgpad: String): String {
-			return url.substring(0, 0xFF.coerceAtMost(url.length)) + msgpad
-		}
-
-		private fun getMessageDigest(s: String): String {
-			val signedMessage = synchronized(mac) { mac.doFinal(s.toByteArray()) }
-			return context.encodeBase64(signedMessage)
-		}
-
-		fun makeEncryptUrl(urlBuilder: HttpUrl.Builder) {
-			val msgpad = Calendar.getInstance().timeInMillis.toString()
-			val digest = getMessageDigest(getMessage(urlBuilder.build().toString(), msgpad))
-			urlBuilder
-				.addQueryParameter("msgpad", msgpad)
-				.addQueryParameter("md", digest)
-//				.addEncodedQueryParameter("md", digest.urlEncoded())
-		}
-	}
-}

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

@@ -1,201 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.animebootstrap
-
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import org.json.JSONArray
-import org.jsoup.nodes.Document
-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.util.*
-
-// see https://themewagon.com/themes/free-bootstrap-4-html5-gaming-anime-website-template-anime/
-
-internal abstract class AnimeBootstrapParser(
-	context: MangaLoaderContext,
-	source: MangaSource,
-	domain: String,
-	pageSize: Int = 24,
-) : PagedMangaParser(context, source, pageSize) {
-
-	override val configKeyDomain = ConfigKey.Domain(domain)
-
-	override val isMultipleTagsSupported = false
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.UPDATED,
-		SortOrder.POPULARITY,
-		SortOrder.ALPHABETICAL,
-		SortOrder.NEWEST,
-	)
-
-	protected open val listUrl = "/manga"
-	protected open val datePattern = "dd MMM. yyyy"
-
-
-	init {
-		paginator.firstPage = 1
-		searchPaginator.firstPage = 1
-	}
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url = buildString {
-			append("https://")
-			append(domain)
-			append(listUrl)
-			append("?page=")
-			append(page.toString())
-			append("&type=all")
-
-			if (!query.isNullOrEmpty()) {
-				append("&search=")
-				append(query.urlEncoded())
-			}
-
-			if (!tags.isNullOrEmpty()) {
-				append("&categorie=")
-				append(tag?.key.orEmpty())
-			}
-
-			append("&sort=")
-			when (sortOrder) {
-				SortOrder.POPULARITY -> append("view")
-				SortOrder.UPDATED -> append("updated")
-				SortOrder.ALPHABETICAL -> append("default")
-				SortOrder.NEWEST -> append("published")
-				else -> append("updated")
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-
-		return doc.select("div.col-6 div.product__item").map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(div.host ?: domain),
-				coverUrl = div.selectFirstOrThrow("div.product__item__pic").attr("data-setbg").orEmpty(),
-				title = div.selectFirstOrThrow("div.product__item__text").text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val doc = webClient.httpGet("https://$domain$listUrl").parseHtml()
-		return doc.select("div.product__page__filter div:contains(Genre:) option ").mapNotNullToSet { option ->
-			val key = option.attr("value") ?: return@mapNotNullToSet null
-			val name = option.text()
-			MangaTag(
-				key = key,
-				title = name,
-				source = source,
-			)
-		}
-	}
-
-	protected open val selectDesc = "div.anime__details__text p"
-	protected open val selectState = "div.anime__details__widget li:contains(Ongoing)"
-	protected open val selectTag = "div.anime__details__widget li:contains(Categorie) a"
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-
-		val chaptersDeferred = async { getChapters(doc) }
-
-		val desc = doc.selectFirstOrThrow(selectDesc).html()
-
-		val state = if (doc.select(selectState).isNullOrEmpty()) {
-			MangaState.FINISHED
-		} else {
-			MangaState.ONGOING
-		}
-
-		manga.copy(
-			tags = doc.body().select(selectTag).mapNotNullToSet { a ->
-				MangaTag(
-					key = a.attr("href").substringAfterLast('='),
-					title = a.text().toTitleCase().replace(",", ""),
-					source = source,
-				)
-			},
-			description = desc,
-			state = state,
-			chapters = chaptersDeferred.await(),
-		)
-	}
-
-
-	protected open val selectChapter = "div.anime__details__episodes a"
-
-	protected open suspend fun getChapters(doc: Document): List<MangaChapter> {
-		return doc.body().select(selectChapter).mapChapters(reversed = true) { i, a ->
-			val href = a.attr("href")
-			MangaChapter(
-				id = generateUid(href),
-				name = a.text(),
-				number = i + 1,
-				url = href,
-				uploadDate = 0,
-				source = source,
-				scanlator = null,
-				branch = null,
-			)
-		}
-	}
-
-
-	protected open val selectPage = "div.read-img img"
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-
-		if (doc.select("script:containsData(page_image)").isNullOrEmpty()) {
-			return doc.select(selectPage).map { img ->
-				val url = img.attr("onerror").replace("this.onerror=null;this.src=`", "").replace("`;", "")
-				MangaPage(
-					id = generateUid(url),
-					url = url,
-					preview = null,
-					source = source,
-				)
-			}
-		} else {
-			val script = doc.selectFirstOrThrow("script:containsData(page_image)")
-			val images = JSONArray(script.data().substringAfterLast("var pages = ").substringBefore(';'))
-
-			val pages = ArrayList<MangaPage>(images.length())
-			for (i in 0 until images.length()) {
-
-				val pageTake = images.getJSONObject(i)
-				pages.add(
-					MangaPage(
-						id = generateUid(pageTake.getString("page_image")),
-						url = pageTake.getString("page_image"),
-						preview = null,
-						source = source,
-					),
-				)
-			}
-
-			return pages
-		}
-
-	}
-}

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

@@ -1,149 +0,0 @@
-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.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.site.animebootstrap.AnimeBootstrapParser
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.SimpleDateFormat
-import java.util.EnumSet
-import java.util.Locale
-
-
-@MangaSourceParser("PAPSCAN", "PapScan", "fr")
-internal class PapScan(context: MangaLoaderContext) :
-	AnimeBootstrapParser(context, MangaSource.PAPSCAN, "papscan.com") {
-
-	override val sourceLocale: Locale = Locale.ENGLISH
-
-	override val isMultipleTagsSupported = false
-
-	override val listUrl = "/liste-manga"
-
-	override val selectState = "div.anime__details__widget li:contains(En cours)"
-	override val selectTag = "div.anime__details__widget li:contains(Genre) a"
-
-	override val selectChapter = "ul.chapters li"
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.POPULARITY,
-		SortOrder.ALPHABETICAL,
-	)
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-
-		val tag = tags.oneOrThrowIfMany()
-
-		val url = buildString {
-			append("https://")
-			append(domain)
-			append("/filterList")
-			append("?page=")
-			append(page.toString())
-
-			if (!query.isNullOrEmpty()) {
-				append("&alpha=")
-				append(query.urlEncoded())
-			}
-
-			if (!tags.isNullOrEmpty()) {
-				append("&cat=")
-				append(tag?.key.orEmpty())
-			}
-			append("&sortBy=")
-			when (sortOrder) {
-				SortOrder.POPULARITY -> append("views")
-				SortOrder.ALPHABETICAL -> append("name")
-				else -> append("updated")
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-
-		return doc.select("div.product__item").map { div ->
-			val href = div.selectFirstOrThrow("h5 a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(div.host ?: domain),
-				coverUrl = div.selectFirstOrThrow("div.product__item__pic").attr("data-setbg").orEmpty(),
-				title = div.selectFirstOrThrow("div.product__item__text h5").text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val doc = webClient.httpGet("https://$domain$listUrl").parseHtml()
-		return doc.select("a.category ").mapNotNullToSet { a ->
-			val key = a.attr("href").substringAfterLast('=')
-			val name = a.text()
-			MangaTag(
-				key = key,
-				title = name,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-
-		val chaptersDeferred = async { getChapters(doc) }
-
-		val desc = doc.selectFirstOrThrow(selectDesc).html()
-
-		val state = if (doc.select(selectState).isNullOrEmpty()) {
-			MangaState.FINISHED
-		} else {
-			MangaState.ONGOING
-		}
-
-		manga.copy(
-			tags = doc.body().select(selectTag).mapNotNullToSet { a ->
-				MangaTag(
-					key = a.attr("href").removeSuffix('/').substringAfterLast('/'),
-					title = a.text().toTitleCase(),
-					source = source,
-				)
-			},
-			description = desc,
-			state = state,
-			chapters = chaptersDeferred.await(),
-		)
-	}
-
-	override suspend fun getChapters(doc: Document): List<MangaChapter> {
-		val dateFormat = SimpleDateFormat(datePattern, sourceLocale)
-		return doc.body().select(selectChapter).mapChapters(reversed = true) { i, li ->
-			val href = li.selectFirstOrThrow("a").attr("href")
-			val dateText = li.selectFirst("span.date-chapter-title-rtl")?.text()
-			MangaChapter(
-				id = generateUid(href),
-				name = li.selectFirstOrThrow("span em").text(),
-				number = i + 1,
-				url = href,
-				uploadDate = dateFormat.tryParse(dateText),
-				source = source,
-				scanlator = null,
-				branch = null,
-			)
-		}
-	}
-
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/id/KomikzoId.kt

@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.animebootstrap.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.animebootstrap.AnimeBootstrapParser
-
-@MangaSourceParser("KOMIKZOID", "Komikzo Id", "id")
-internal class KomikzoId(context: MangaLoaderContext) :
-	AnimeBootstrapParser(context, MangaSource.KOMIKZOID, "komikzoid.xyz")

src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/id/NeuManga.kt

@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.animebootstrap.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.animebootstrap.AnimeBootstrapParser
-
-
-@MangaSourceParser("NEUMANGA", "NeuManga", "id")
-internal class NeuManga(context: MangaLoaderContext) :
-	AnimeBootstrapParser(context, MangaSource.NEUMANGA, "neumanga.xyz")

src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/id/SekteKomik.kt

@@ -1,11 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.animebootstrap.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.animebootstrap.AnimeBootstrapParser
-
-@MangaSourceParser("SEKTEKOMIK", "SekteKomik", "id")
-internal class SekteKomik(context: MangaLoaderContext) :
-	AnimeBootstrapParser(context, MangaSource.SEKTEKOMIK, "sektekomik.xyz")

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

@@ -1,167 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.ar
-
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import org.json.JSONArray
-import org.json.JSONObject
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.PagedMangaParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.util.*
-import org.koitharu.kotatsu.parsers.util.json.mapJSON
-import org.koitharu.kotatsu.parsers.util.json.mapJSONIndexed
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("FLIXSCANS", "FlixScans", "ar")
-internal class FlixScans(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.FLIXSCANS, 18) {
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.UPDATED)
-	override val configKeyDomain = ConfigKey.Domain("flixscans.com")
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val json = if (!query.isNullOrEmpty()) {
-			if (page > 1) {
-				return emptyList()
-			}
-			val url = "https://api.$domain/api/v1/search/serie"
-			val body = JSONObject()
-			body.put("title", query.urlEncoded())
-			webClient.httpPost(url, body).parseJson().getJSONArray("data")
-		} else if (!tags.isNullOrEmpty()) {
-			if (page > 1) {
-				return emptyList()
-			}
-			val tagQuery = tags.joinToString(separator = ",") { it.key }
-			val url = "https://api.$domain/api/v1/search/advance?=&genres=$tagQuery&serie_type=webtoon"
-			webClient.httpGet(url).parseJson().getJSONArray("data")
-		} else {
-			val url = "https://api.$domain/api/v1/webtoon/homepage/latest/home?page=$page"
-			webClient.httpGet(url).parseJson().getJSONArray("data")
-		}
-		return json.mapJSON { j ->
-			val href = "https://$domain/series/${j.getString("prefix")}-${j.getString("id")}-${j.getString("slug")}"
-			val cover = "https://api.$domain/storage/" + j.getString("thumbnail")
-			Manga(
-				id = generateUid(href),
-				title = j.getString("title"),
-				altTitle = null,
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				rating = RATING_UNKNOWN,
-				isNsfw = false,
-				coverUrl = cover,
-				tags = emptySet(),
-				state = when (j.getString("status")) {
-					"ongoing" -> MangaState.ONGOING
-					"completed" -> MangaState.FINISHED
-					else -> null
-				},
-				author = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val doc = webClient.httpGet("https://$domain/search/advance").parseHtml()
-		val json = JSONArray(doc.requireElementById("__NUXT_DATA__").data())
-		val tagsList = json.getJSONArray(3).toString().replace("[", "").replace("]", "").split(",")
-		return tagsList.mapNotNullToSet { idTag ->
-			val id = idTag.toInt()
-			val idKey = json.getJSONObject(id).getInt("id")
-			val key = json.get(idKey).toString()
-			val idName = json.getJSONObject(id).getInt("name")
-			val name = json.get(idName).toString()
-			MangaTag(
-				key = key,
-				title = name,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-		val chaptersDeferred = async { loadChapters(manga.url) }
-		val json = JSONArray(doc.requireElementById("__NUXT_DATA__").data())
-		val descId = json.getJSONObject(6).getInt("story")
-		val desc = json.getString(descId)
-		val tagsId = json.getJSONObject(6).getInt("genres")
-		val tagsList = json.getJSONArray(tagsId).toString().replace("[", "").replace("]", "").split(",")
-		val ratingId = json.getJSONObject(6).getInt("rating")
-		val rating = json.getString(ratingId)
-		val nsfwId = json.getJSONObject(6).getInt("nsfw")
-		val nsfw = json.getBoolean(nsfwId)
-		manga.copy(
-			description = desc,
-			tags = tagsList.mapToSet { idTag ->
-				val id = idTag.toInt()
-				val idKey = json.getJSONObject(id).getInt("id")
-				val key = json.get(idKey).toString()
-				val idName = json.getJSONObject(id).getInt("name")
-				val name = json.get(idName).toString()
-				MangaTag(
-					key = key,
-					title = name,
-					source = source,
-				)
-			},
-			rating = rating?.toFloatOrNull()?.div(5f) ?: RATING_UNKNOWN,
-			isNsfw = nsfw,
-			chapters = chaptersDeferred.await(),
-		)
-	}
-
-	private val dateFormat = SimpleDateFormat("yyyy-MM-dd", sourceLocale)
-
-	private suspend fun loadChapters(baseUrl: String): List<MangaChapter> {
-		val key = baseUrl.substringAfter("-").substringBefore("-")
-		val seriesKey = baseUrl.substringAfterLast("/").substringBefore("-")
-		val json = JSONArray(webClient.httpGet("https://api.$domain/api/v1/webtoon/chapters/$key-desc").parseRaw())
-		return json.mapJSONIndexed { i, j ->
-			val url = "https://$domain/read/webtoon/$seriesKey-${j.getString("id")}-${j.getString("slug")}"
-			val date = j.getString("createdAt").substringBeforeLast("T")
-			MangaChapter(
-				id = generateUid(url),
-				url = url,
-				name = j.getString("slug").replace('-', ' '),
-				number = i + 1,
-				branch = null,
-				uploadDate = dateFormat.tryParse(date),
-				scanlator = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		val json = JSONArray(doc.requireElementById("__NUXT_DATA__").data())
-		val chapterData = json.getJSONObject(6).getInt("chapterData")
-		val pageLocate = json.getJSONObject(chapterData).getInt("webtoon")
-		val jsonPages = json.getJSONArray(pageLocate)
-		val pages = ArrayList<MangaPage>(jsonPages.length())
-		for (i in 0 until jsonPages.length()) {
-			val id = jsonPages.getInt(i)
-			val url = "https://api.$domain/storage/" + json.getString(id)
-			pages.add(
-				MangaPage(
-					id = generateUid(url),
-					url = url,
-					preview = null,
-					source = source,
-				),
-			)
-		}
-		return pages
-	}
-}

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

@@ -1,121 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.ar
-
-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.util.*
-
-@MangaSourceParser("MANGASTORM", "MangaStorm", "ar")
-internal class MangaStorm(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.MANGASTORM, 30) {
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.POPULARITY)
-	override val configKeyDomain = ConfigKey.Domain("mangastorm.org")
-	override val isMultipleTagsSupported = false
-
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_DESKTOP)
-		.build()
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url =
-			if (!tags.isNullOrEmpty()) {
-				buildString {
-					append("https://")
-					append(domain)
-					append("/categories/")
-					append(tag?.key.orEmpty())
-					append("?page=")
-					append(page)
-				}
-			} else {
-				buildString {
-					append("https://")
-					append(domain)
-					append("/mangas?page=")
-					append(page)
-					if (!query.isNullOrEmpty()) {
-						append("&query=")
-						append(query.urlEncoded())
-					}
-				}
-			}
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select("div.row div.col").map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				title = div.select(".manga-ct-title").text(),
-				altTitle = null,
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				rating = RATING_UNKNOWN,
-				isNsfw = false,
-				coverUrl = div.selectFirstOrThrow("img").src().orEmpty(),
-				tags = emptySet(),
-				state = null,
-				author = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> = emptySet()
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-
-		val root = doc.selectFirstOrThrow(".card-body .col-lg-9")
-
-		return manga.copy(
-			altTitle = null,
-			state = null,
-			tags = root.select(".flex-wrap a").mapNotNullToSet { a ->
-				MangaTag(
-					key = a.attr("href").substringAfterLast('/'),
-					title = a.text(),
-					source = source,
-				)
-			},
-			author = null,
-			description = root.selectFirstOrThrow(".card-text").text(),
-			chapters = doc.select(".card-body a.btn-fixed-width").mapChapters(reversed = true) { i, a ->
-				val url = a.attrAsRelativeUrl("href")
-				MangaChapter(
-					id = generateUid(url),
-					name = a.text(),
-					number = i + 1,
-					url = url,
-					scanlator = null,
-					uploadDate = 0,
-					branch = null,
-					source = source,
-				)
-			},
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml().requireElementById("content")
-		return doc.select("div.text-center .img-fluid").map { img ->
-			val url = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,182 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.ar
-
-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.*
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("TEAMXNOVEL", "TeamXNovel", "ar")
-internal class TeamXNovel(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.TEAMXNOVEL, 10) {
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.UPDATED, SortOrder.POPULARITY)
-	override val configKeyDomain = ConfigKey.Domain("team11x11.com")
-	override val isMultipleTagsSupported = false
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url = buildString {
-			append("https://")
-			append(domain)
-			if (!tags.isNullOrEmpty()) {
-				append("/series?genre=")
-				append(tag?.key.orEmpty())
-				if (page > 1) {
-					append("&page=")
-					append(page)
-				}
-			} else if (!query.isNullOrEmpty()) {
-				append("/series?search=")
-				append(query.urlEncoded())
-				if (page > 1) {
-					append("&page=")
-					append(page)
-				}
-			} else {
-				when (sortOrder) {
-					SortOrder.POPULARITY -> append("/series")
-					SortOrder.UPDATED -> append("/")
-					else -> append("/")
-				}
-				if (page > 1) {
-					append("?page=")
-					append(page)
-				}
-			}
-		}
-
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select("div.listupd .bs .bsx").ifEmpty {
-			doc.select("div.post-body .box")
-		}.map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				title = div.select(".tt, h3").text(),
-				altTitle = null,
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				rating = RATING_UNKNOWN,
-				isNsfw = false,
-				coverUrl = div.selectFirstOrThrow("img").src().orEmpty(),
-				tags = emptySet(),
-				state = when (div.selectFirst(".status")?.text()) {
-					"مستمرة" -> MangaState.ONGOING
-					"متوقف", "مكتمل" -> MangaState.FINISHED
-					else -> null
-				},
-				author = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val doc = webClient.httpGet("https://$domain/series").parseHtml()
-		return doc.requireElementById("select_genre").select("option").mapNotNullToSet {
-			MangaTag(
-				key = it.attr("value"),
-				title = it.text(),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-		val mangaUrl = manga.url.toAbsoluteUrl(domain)
-		val maxPageChapterSelect = doc.select(".pagination .page-item a")
-		var maxPageChapter = 1
-		if (!maxPageChapterSelect.isNullOrEmpty()) {
-			maxPageChapterSelect.map {
-				val i = it.attr("href").substringAfterLast("=").toInt()
-				if (i > maxPageChapter) {
-					maxPageChapter = i
-				}
-			}
-		}
-		return manga.copy(
-			altTitle = null,
-			state = when (doc.selectFirstOrThrow(".full-list-info:contains(الحالة:) a").text()) {
-				"مستمرة" -> MangaState.ONGOING
-				"متوقف", "مكتمل" -> MangaState.FINISHED
-				else -> null
-			},
-			tags = doc.select(".review-author-info a").mapNotNullToSet { a ->
-				MangaTag(
-					key = a.attr("href").substringAfterLast("="),
-					title = a.text(),
-					source = source,
-				)
-			},
-			author = null,
-			description = doc.selectFirstOrThrow(".review-content").text(),
-			chapters = run {
-				if (maxPageChapter == 1) {
-					parseChapters(doc)
-				} else {
-					coroutineScope {
-						val result = ArrayList(parseChapters(doc))
-						result.ensureCapacity(result.size * maxPageChapter)
-						(2..maxPageChapter).map { i ->
-							async {
-								loadChapters(mangaUrl, i)
-							}
-						}.awaitAll()
-							.flattenTo(result)
-						result
-					}
-				}
-			}.reversed(),
-		)
-	}
-
-	private suspend fun loadChapters(baseUrl: String, page: Int): List<MangaChapter> {
-		return parseChapters(webClient.httpGet("$baseUrl?page=$page").parseHtml().body())
-	}
-
-	private val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", sourceLocale)
-
-	private fun parseChapters(root: Element): List<MangaChapter> {
-		return root.requireElementById("chapter-contact").select(".eplister ul li")
-			.map { li ->
-				val url = li.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-				MangaChapter(
-					id = generateUid(url),
-					name = li.selectFirstOrThrow(".epl-title").text(),
-					number = url.substringAfterLast('/').toIntOrNull() ?: 0,
-					url = url,
-					scanlator = null,
-					uploadDate = dateFormat.tryParse(li.selectFirstOrThrow(".epl-date").text()),
-					branch = null,
-					source = source,
-				)
-			}
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		return doc.select(".image_list img").map { img ->
-			val url = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,138 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.en
-
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.PagedMangaParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("BEETOON", "BeeToon.net", "en")
-internal class BeeToon(context: MangaLoaderContext) :
-	PagedMangaParser(context, MangaSource.BEETOON, pageSize = 30) {
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.UPDATED, SortOrder.POPULARITY)
-
-	override val configKeyDomain = ConfigKey.Domain("ww7.beetoon.net")
-
-	override val isMultipleTagsSupported = false
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url = buildString {
-			append("https://")
-			append(domain)
-			when {
-				!query.isNullOrEmpty() -> {
-					if (page > 1) {
-						return emptyList()
-					}
-					append("/?s=")
-					append(query.urlEncoded())
-				}
-
-				!tags.isNullOrEmpty() -> {
-					append("/genre/")
-					append(tag?.key.orEmpty())
-					append("/page-")
-					append(page)
-					append("/")
-				}
-
-				else -> {
-					when (sortOrder) {
-						SortOrder.UPDATED -> append("/latest-update/")
-						SortOrder.POPULARITY -> append("/popular-manga/")
-						else -> append("/latest-update/")
-					}
-					append("page-")
-					append(page)
-					append("/")
-				}
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select(".comics-grid .entry").map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				coverUrl = div.selectFirst("img")?.src().orEmpty(),
-				title = div.selectFirst(".name")?.text().orEmpty(),
-				altTitle = null,
-				rating = div.selectFirst(".counter")?.text()?.toFloatOrNull()?.div(5f) ?: RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = when (div.selectLastOrThrow(".status span").text()) {
-					"Ongoing" -> MangaState.ONGOING
-					"Completed" -> MangaState.FINISHED
-					else -> null
-				},
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val doc = webClient.httpGet("https://$domain/").parseHtml()
-		return doc.requireElementById("menu-item-3").select("ul.sub-menu li a").mapNotNullToSet {
-			MangaTag(
-				key = it.attr("href").removeSuffix('/').substringAfterLast('/'),
-				title = it.text(),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-		return manga.copy(
-			description = doc.getElementById("desc")?.text().orEmpty(),
-			rating = doc.selectFirst(".counter")?.text()?.toFloatOrNull()?.div(5f) ?: RATING_UNKNOWN,
-			tags = doc.body().select(".info .genre a").mapNotNullToSet {
-				MangaTag(
-					key = it.attr("href").removeSuffix('/').substringAfterLast('/'),
-					title = it.text(),
-					source = source,
-				)
-			},
-			author = doc.selectFirst(".info .author a")?.text(),
-			chapters = doc.select(".items-chapters  a").mapChapters(reversed = true) { i, a ->
-				val url = a.attrAsRelativeUrl("href").toAbsoluteUrl(domain)
-				MangaChapter(
-					id = generateUid(url),
-					name = a.selectFirstOrThrow(".chap").text(),
-					number = i + 1,
-					url = url,
-					scanlator = null,
-					uploadDate = SimpleDateFormat("MM/dd/yyyy HH:mm:ss", Locale.ENGLISH)
-						.tryParse(a.selectFirst(".chapter-date")?.attr("title") ?: "0"),
-					branch = null,
-					source = source,
-				)
-			},
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml()
-		return doc.select(".chapter-content-inner center img").map { img ->
-			val urlPage = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found")
-			MangaPage(
-				id = generateUid(urlPage),
-				url = urlPage,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,149 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.en
-
-import okhttp3.Headers
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.PagedMangaParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.network.UserAgents
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("COMICEXTRA", "ComicExtra", "en")
-internal class ComicExtra(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.COMICEXTRA, 25) {
-
-	override val availableSortOrders: Set<SortOrder> =
-		EnumSet.of(SortOrder.POPULARITY, SortOrder.UPDATED, SortOrder.NEWEST)
-
-	override val configKeyDomain = ConfigKey.Domain("comicextra.me")
-
-	override val isMultipleTagsSupported = false
-
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_DESKTOP)
-		.build()
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url = buildString {
-			append("https://$domain/")
-			if (!tags.isNullOrEmpty()) {
-				append(tag?.key.orEmpty())
-				if (page > 1) {
-					append("/")
-					append(page)
-				}
-			} else if (!query.isNullOrEmpty()) {
-				append("comic-search?key=")
-				append(query.urlEncoded())
-				if (page > 1) {
-					append("&page=")
-					append(page)
-				}
-			} else {
-				when (sortOrder) {
-					SortOrder.POPULARITY -> append("popular-comic/")
-					SortOrder.UPDATED -> append("new-comic/")
-					SortOrder.NEWEST -> append("recent-comic/")
-					else -> append("new-comic/")
-				}
-				if (page > 1) {
-					append(page)
-				}
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select("div.movie-list-index div.cartoon-box").map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				title = div.selectFirstOrThrow("h3").text(),
-				altTitle = null,
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				rating = RATING_UNKNOWN,
-				isNsfw = false,
-				coverUrl = div.selectFirstOrThrow("img").attrAsAbsoluteUrl("src"),
-				tags = emptySet(),
-				state = when (div.selectFirstOrThrow(".detail:contains(Stasus: )").text()) {
-					"Stasus: Ongoing" -> MangaState.ONGOING
-					"Stasus: Completed" -> MangaState.FINISHED
-					else -> null
-				},
-				author = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val doc = webClient.httpGet("https://$domain/popular-comic").parseHtml()
-		return doc.select("li.tag-item a").mapNotNullToSet { a ->
-			MangaTag(
-				key = a.attr("href").substringAfterLast('/'),
-				title = a.text(),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-		val dateFormat = SimpleDateFormat("MM/dd/yy", sourceLocale)
-		return manga.copy(
-			altTitle = doc.selectFirstOrThrow("dt.movie-dt:contains(Alternate name:) + dd").text(),
-			state = when (doc.selectFirstOrThrow("dt.movie-dt:contains(Status:) + dd a").text()) {
-				"Ongoing" -> MangaState.ONGOING
-				"Completed" -> MangaState.FINISHED
-				else -> null
-			},
-			tags = doc.select("dt.movie-dt:contains(Genres:) + dd a").mapNotNullToSet { a ->
-				MangaTag(
-					key = a.attr("href").substringAfterLast("/"),
-					title = a.text(),
-					source = source,
-				)
-			},
-			author = doc.select("dt.movie-dt:contains(Author:) + dd").text(),
-			description = doc.getElementById("film-content")?.text(),
-			chapters = doc.requireElementById("list").select("tr")
-				.mapChapters(reversed = true) { i, tr ->
-					val a = tr.selectFirstOrThrow("a")
-					val url = a.attrAsRelativeUrl("href") + "/full"
-					val name = a.text()
-					val dateText = tr.select("td").last()?.text()
-					MangaChapter(
-						id = generateUid(url),
-						name = name,
-						number = i + 1,
-						url = url,
-						scanlator = null,
-						uploadDate = dateFormat.tryParse(dateText),
-						branch = null,
-						source = source,
-					)
-				},
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		return doc.select(".chapter-container img").map { img ->
-			val url = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,170 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.en
-
-import okhttp3.Headers
-import org.json.JSONArray
-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.*
-import org.koitharu.kotatsu.parsers.network.UserAgents
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("DYNASTYSCANS", "DynastyScans", "en")
-internal class DynastyScans(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.DYNASTYSCANS, 117) {
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.ALPHABETICAL)
-	override val configKeyDomain = ConfigKey.Domain("dynasty-scans.com")
-
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_DESKTOP)
-		.build()
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val url = buildString {
-			append("https://")
-			append(domain)
-			if (!query.isNullOrEmpty()) {
-				append("/search?q=")
-				append(query.urlEncoded())
-				append("&")
-				append("classes[]".urlEncoded())
-				append("=Serie&page=")
-				append(page.toString())
-			} else if (!tags.isNullOrEmpty()) {
-				append("/tags/")
-				for (tag in tags) {
-					append(tag.key)
-				}
-				append("?view=groupings&page=")
-				append(page.toString())
-			} else {
-				append("/series?view=cover&page=")
-				append(page.toString())
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-
-		// There are no images on the search page
-		if (!query.isNullOrEmpty()) {
-			return doc.select("dl.chapter-list dd")
-				.map { div ->
-					val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-					Manga(
-						id = generateUid(href),
-						title = div.selectFirstOrThrow("a").text(),
-						altTitle = null,
-						url = href,
-						publicUrl = href.toAbsoluteUrl(domain),
-						rating = RATING_UNKNOWN,
-						isNsfw = false,
-						coverUrl = "",
-						tags = div.select("span.tags a").mapNotNullToSet { a ->
-							MangaTag(
-								key = a.attr("href").removeSuffix('/').substringAfterLast('/'),
-								title = a.text(),
-								source = source,
-							)
-						},
-						state = null,
-						author = null,
-						source = source,
-					)
-				}
-		} else {
-			return doc.select("li.span2")
-				.map { div ->
-					val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-					Manga(
-						id = generateUid(href),
-						title = div.selectFirstOrThrow("div.caption").text(),
-						altTitle = null,
-						url = href,
-						publicUrl = href.toAbsoluteUrl(domain),
-						rating = RATING_UNKNOWN,
-						isNsfw = false,
-						coverUrl = div.selectFirstOrThrow("img").attrAsAbsoluteUrl("src"),
-						tags = setOf(),
-						state = null,
-						author = null,
-						source = source,
-					)
-				}
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> = emptySet()
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-		val chapters = getChapters(doc)
-		val root = doc.requireElementById("main")
-		return manga.copy(
-			altTitle = null,
-			state = when (root.select("h2.tag-title small").last()?.text()) {
-				"— Ongoing" -> MangaState.ONGOING
-				"— Completed" -> MangaState.FINISHED
-				else -> null
-			},
-			coverUrl = root.selectFirst("img.thumbnail")?.src()
-				.orEmpty(), // It is needed if the manga was found via the search.
-			tags = root.select("div.tag-tags a").mapNotNullToSet { a ->
-				val href = a.attr("href").removeSuffix('/').substringAfterLast('/')
-				MangaTag(
-					key = href,
-					title = a.text(),
-					source = source,
-				)
-			},
-			author = null,
-			description = null,
-			chapters = chapters,
-		)
-	}
-
-	private fun getChapters(doc: Document): List<MangaChapter> {
-		val dateFormat = SimpleDateFormat("MMM dd yy", sourceLocale)
-		return doc.body().select("dl.chapter-list dd").mapChapters { i, li ->
-			val a = li.selectFirstOrThrow("a")
-			val href = a.attrAsRelativeUrl("href")
-			val dateText = li.select("small").last()?.text()?.replace("released ", "")?.replace("'", "")
-			MangaChapter(
-				id = generateUid(href),
-				name = a.text(),
-				number = i + 1,
-				url = href,
-				uploadDate = dateFormat.tryParse(dateText),
-				source = source,
-				scanlator = null,
-				branch = null,
-			)
-		}
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val chapterUrl = chapter.url.toAbsoluteUrl(domain)
-		val docs = webClient.httpGet(chapterUrl).parseHtml()
-		val script = docs.selectFirstOrThrow("script:containsData(var pages =)")
-		val json = JSONArray(script.data().substringAfter('=').substringBeforeLast(';'))
-		val pages = ArrayList<MangaPage>(json.length())
-		for (i in 0 until json.length()) {
-			val url = "https://" + domain + json.getString(i).substringAfter(":\"").substringBefore("\",")
-			pages.add(
-				MangaPage(
-					id = generateUid(url),
-					url = url,
-					preview = null,
-					source = source,
-				),
-			)
-		}
-		return pages
-	}
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Fakku.kt

@@ -1,148 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.en
-
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.PagedMangaParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.util.*
-import org.koitharu.kotatsu.parsers.util.json.mapJSONToSet
-import java.util.*
-
-@MangaSourceParser("FAKKU", "Fakku", "en", ContentType.HENTAI)
-internal class Fakku(context: MangaLoaderContext) :
-	PagedMangaParser(context, MangaSource.FAKKU, pageSize = 25) {
-
-	override val availableSortOrders: Set<SortOrder> =
-		EnumSet.of(SortOrder.ALPHABETICAL, SortOrder.NEWEST, SortOrder.UPDATED)
-
-	override val configKeyDomain = ConfigKey.Domain("fakku.cc")
-
-	override val isMultipleTagsSupported = false
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url = buildString {
-			append("https://")
-			append(domain)
-			when {
-				!query.isNullOrEmpty() -> {
-					append("/search?q=")
-					append(query.urlEncoded())
-					append("&")
-				}
-
-				!tags.isNullOrEmpty() -> {
-					append("/tags/")
-					append(tag?.key.orEmpty())
-					append("?")
-				}
-
-				else -> {
-					append("?")
-				}
-			}
-			append("page=")
-			append(page)
-			append("&sort=")
-			when (sortOrder) {
-				SortOrder.ALPHABETICAL -> append("title")
-				SortOrder.NEWEST -> append("created_at")
-				SortOrder.UPDATED -> append("published_at")
-				else -> append("published_at")
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select("div.entries .entry a").map { a ->
-			val href = a.attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				coverUrl = a.selectFirst("img")?.src().orEmpty(),
-				title = a.selectFirst(".title")?.text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val root = webClient.httpGet("https://$domain/tags").parseHtml()
-		return root.select("div.entries .entry a").mapToSet {
-			MangaTag(
-				key = it.attr("href").substringAfterLast("/"),
-				title = it.selectFirstOrThrow(".name").text(),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		val genreDeferred = async {
-			webClient.httpGet(manga.url.toAbsoluteUrl(domain) + ".json").parseJson()
-		}
-		val genre = genreDeferred.await()
-		manga.copy(
-			author = doc.selectFirst("tr.artists a")?.text(),
-			tags = if (genre.toString().contains("tags")) {
-				genre.getJSONArray("tags").mapJSONToSet {
-					MangaTag(
-						key = it.getString("slug"),
-						title = it.getString("name"),
-						source = source,
-					)
-				}
-			} else {
-				emptySet()
-			},
-			chapters = listOf(
-				MangaChapter(
-					id = manga.id,
-					name = manga.title,
-					number = 1,
-					url = manga.url + "/1",
-					scanlator = null,
-					uploadDate = 0,
-					branch = null,
-					source = source,
-				),
-			),
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml()
-		val totalPages = doc.selectFirstOrThrow(".total").text().toInt()
-		val rawUrl = chapter.url.substringBeforeLast("/")
-		return (1..totalPages).map {
-			val url = "$rawUrl/$it"
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getPageUrl(page: MangaPage): String {
-		val doc = webClient.httpGet(page.url.toAbsoluteUrl(domain)).parseHtml()
-		val root = doc.body()
-		return root.selectFirstOrThrow(".page img").attrAsAbsoluteUrl("src")
-	}
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/KskMoe.kt

@@ -1,187 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.en
-
-import androidx.collection.ArraySet
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import org.json.JSONArray
-import org.jsoup.nodes.Element
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.PagedMangaParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.util.*
-import org.koitharu.kotatsu.parsers.util.json.mapJSON
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("KSKMOE", "Ksk.moe", "en", ContentType.HENTAI)
-internal class KskMoe(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.KSKMOE, 35) {
-
-	override val availableSortOrders: Set<SortOrder> =
-		EnumSet.of(SortOrder.UPDATED, SortOrder.POPULARITY, SortOrder.NEWEST, SortOrder.ALPHABETICAL)
-	override val configKeyDomain = ConfigKey.Domain("ksk.moe")
-	override val isMultipleTagsSupported = false
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-
-		val url = buildString {
-			append("https://")
-			append(domain)
-
-			if (!tags.isNullOrEmpty()) {
-				append("/tags/")
-				append(tag?.key.orEmpty())
-			} else {
-				append("/browse")
-			}
-
-			if (page > 1) {
-				append("/page/")
-				append(page)
-			}
-
-			when (sortOrder) {
-				SortOrder.POPULARITY -> append("?sort=32")
-				SortOrder.UPDATED -> append("")
-				SortOrder.NEWEST -> append("?sort=16")
-				SortOrder.ALPHABETICAL -> append("?sort=1")
-				else -> append("")
-			}
-
-			if (!query.isNullOrEmpty()) {
-				append("?s=")
-				append(query.urlEncoded())
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-
-		if (!doc.html().contains("pagination") && page > 1) {
-			return emptyList()
-		}
-		return doc.requireElementById("galleries").select("article").map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				title = div.selectLastOrThrow("h3 span").text(),
-				altTitle = null,
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				rating = RATING_UNKNOWN,
-				isNsfw = true,
-				coverUrl = div.selectFirstOrThrow("img").src()?.toAbsoluteUrl(domain).orEmpty(),
-				tags = div.select("footer span").mapNotNullToSet { span ->
-					MangaTag(
-						key = span.text().urlEncoded(),
-						title = span.text(),
-						source = source,
-					)
-				},
-				state = null,
-				author = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		return coroutineScope {
-			(1..2).map { page ->
-				async { getTags(page) }
-			}
-		}.awaitAll().flattenTo(ArraySet(360))
-	}
-
-	private suspend fun getTags(page: Int): Set<MangaTag> {
-		val url = if (page == 1) {
-			"https://$domain/tags"
-		} else {
-			"https://$domain/tags/page/$page"
-		}
-		val root = webClient.httpGet(url).parseHtml().body().getElementById("tags")
-		return root?.parseTags().orEmpty()
-	}
-
-	private fun Element.parseTags() = select("section.tags div a").mapToSet { a ->
-		MangaTag(
-			key = a.attr("href").substringAfterLast("/tags/"),
-			title = a.selectFirstOrThrow("span").text(),
-			source = source,
-		)
-	}
-
-	private val date = SimpleDateFormat("dd.MM.yyyy hh:mm 'UTC'", Locale.US)
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-
-		return manga.copy(
-			tags = doc.requireElementById("metadata").select("main div:contains(Tag) a").mapNotNullToSet { a ->
-				MangaTag(
-					key = a.attr("href").substringAfterLast("/tags/"),
-					title = a.selectFirstOrThrow("span").text(),
-					source = source,
-				)
-			},
-			author = doc.requireElementById("metadata").selectFirstOrThrow("main div:contains(Artist) a span").text(),
-			chapters = listOf(
-				MangaChapter(
-					id = generateUid(manga.id),
-					name = manga.title,
-					number = 1,
-					url = manga.url,
-					scanlator = null,
-					uploadDate = date.tryParse(doc.selectFirstOrThrow("time.updated").text()),
-					branch = null,
-					source = source,
-				),
-			),
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url
-			.replace("/view/", "/read/")
-			.let { "$it/1" }
-			.toAbsoluteUrl(domain)
-		val document = webClient.httpGet(fullUrl).parseHtml()
-
-		val id = fullUrl
-			.substringAfter("/read/")
-			.substringBeforeLast("/")
-
-		val cdnUrl = document.selectFirst("meta[itemprop=image]")
-			?.attr("content")
-			?.toHttpUrlOrNull()
-			?.host
-			.let { "https://" + (it ?: domain) }
-
-		val script = document.select("script:containsData(window.metadata)").html()
-
-		val rawJson = script
-			.substringAfter("original:")
-			.substringBefore("resampled:")
-			.substringBeforeLast(",")
-
-		return JSONArray(rawJson).mapJSON {
-			val fileName = it.getString("n")
-
-			val url = "$cdnUrl/original/$id/$fileName"
-			val preview = "$cdnUrl/t/$id/320/$fileName"
-
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = preview,
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,148 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.en
-
-import okhttp3.Headers
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.PagedMangaParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.network.UserAgents
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("MANGAGEKO", "MangaGeko", "en")
-internal class MangaGeko(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.MANGAGEKO, 30) {
-
-	override val availableSortOrders: Set<SortOrder> =
-		EnumSet.of(SortOrder.POPULARITY, SortOrder.UPDATED, SortOrder.NEWEST)
-
-	override val configKeyDomain = ConfigKey.Domain("www.mangageko.com")
-
-	override val isMultipleTagsSupported = false
-
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_DESKTOP)
-		.build()
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-
-		val url = if (!query.isNullOrEmpty()) {
-			if (page > 1) {
-				return emptyList()
-			}
-			buildString {
-				append("https://$domain/search/?search=")
-				append(query.urlEncoded())
-			}
-		} else {
-			buildString {
-				append("https://$domain/browse-comics/?results=")
-				append(page)
-				append("&filter=")
-				when (sortOrder) {
-					SortOrder.POPULARITY -> append("views")
-					SortOrder.UPDATED -> append("Updated")
-					SortOrder.NEWEST -> append("New")
-					else -> append("Updated")
-				}
-				if (!tags.isNullOrEmpty()) {
-					append("&genre=")
-					append(tag?.key.orEmpty())
-				}
-			}
-		}
-
-		val doc = webClient.httpGet(url).parseHtml()
-
-		return doc.select("li.novel-item").map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				title = div.selectFirstOrThrow("h4").text(),
-				altTitle = null,
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				rating = RATING_UNKNOWN,
-				isNsfw = false,
-				coverUrl = div.selectFirstOrThrow("img").src().orEmpty(),
-				tags = emptySet(),
-				state = null,
-				author = div.selectFirstOrThrow("h6").text().removePrefix("Author(S): "),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val doc = webClient.httpGet("https://$domain/browse-comics/").parseHtml()
-		return doc.select("label.checkbox-inline").mapNotNullToSet { label ->
-			MangaTag(
-				key = label.selectFirstOrThrow("input").attr("value"),
-				title = label.text(),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-		val dateFormat = SimpleDateFormat("MMM dd, yyyy", sourceLocale)
-		return manga.copy(
-			altTitle = doc.selectFirstOrThrow(".alternative-title").text(),
-			state = when (doc.selectFirstOrThrow(".header-stats span:contains(Status) strong").text()) {
-				"Ongoing" -> MangaState.ONGOING
-				"Completed" -> MangaState.FINISHED
-				else -> null
-			},
-			tags = doc.select(".categories ul li a").mapNotNullToSet { a ->
-				MangaTag(
-					key = a.attr("href").substringAfterLast("="),
-					title = a.text(),
-					source = source,
-				)
-			},
-			author = doc.selectFirstOrThrow(".author").text(),
-			description = doc.selectFirstOrThrow(".description").html(),
-			chapters = doc.requireElementById("chapters").select("ul.chapter-list li")
-				.mapChapters(reversed = true) { i, li ->
-					val a = li.selectFirstOrThrow("a")
-					val url = a.attrAsRelativeUrl("href")
-					val name = li.selectFirstOrThrow(".chapter-title").text()
-					val dateText = li.select(".chapter-update").attr("datetime").substringBeforeLast(',')
-						.replace(".", "").replace("Sept", "Sep")
-					MangaChapter(
-						id = generateUid(url),
-						name = name,
-						number = i + 1,
-						url = url,
-						scanlator = null,
-						uploadDate = dateFormat.tryParse(dateText),
-						branch = null,
-						source = source,
-					)
-				},
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-
-		return doc.requireElementById("chapter-reader").select("img").map { img ->
-			val url = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,193 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.en
-
-import kotlinx.coroutines.coroutineScope
-import okhttp3.Headers
-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.*
-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
-import java.util.*
-
-@MangaSourceParser("MANGAOWL", "MangaOwl.to", "en")
-internal class Mangaowl(context: MangaLoaderContext) :
-	PagedMangaParser(context, MangaSource.MANGAOWL, pageSize = 24) {
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.POPULARITY,
-		SortOrder.NEWEST,
-		SortOrder.UPDATED,
-		SortOrder.RATING,
-	)
-
-	override val configKeyDomain = ConfigKey.Domain("mangaowl.to")
-
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_DESKTOP)
-		.build()
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val sort = when (sortOrder) {
-			SortOrder.POPULARITY -> "view_count"
-			SortOrder.UPDATED -> "-modified_at"
-			SortOrder.NEWEST -> "created_at"
-			SortOrder.RATING -> "rating"
-			else -> "modified_at"
-		}
-		val url = buildString {
-			append("https://")
-			append(domain)
-			when {
-				!query.isNullOrEmpty() -> {
-					append("/8-search")
-					append("?q=")
-					append(query.urlEncoded())
-					append("&page=")
-					append(page.toString())
-				}
-
-				!tags.isNullOrEmpty() -> {
-					append("/8-genres/")
-					for (tag in tags) {
-						append(tag.key)
-					}
-					append("?page=")
-					append(page.toString())
-				}
-
-				else -> {
-					append("/8-comics")
-					append("?page=")
-					append(page.toString())
-					append("&ordering=")
-					append(sort)
-				}
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select("div.manga-item.column").map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(div.host ?: domain),
-				coverUrl = div.selectFirst("img")?.src().orEmpty(),
-				title = div.selectFirst("a.one-line")?.text().orEmpty(),
-				altTitle = null,
-				rating = div.select("span").last()?.text()?.toFloatOrNull()?.div(5f) ?: RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = false,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val doc = webClient.httpGet("https://$domain/8-genres").parseHtml()
-		return doc.select("div.genres-container span.genre-item a").mapNotNullToSet { a ->
-			val key = a.attr("href").substringAfterLast("/")
-			MangaTag(
-				key = key,
-				title = a.text(),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		manga.copy(
-			tags = doc.body().select("div.comic-attrs div.column.my-2:contains(Genres) a").mapNotNullToSet { a ->
-				MangaTag(
-					key = a.attr("href").removeSuffix("/").substringAfterLast('/'),
-					title = a.text().toTitleCase().replace(",", ""),
-					source = source,
-				)
-			},
-			description = doc.select("span.story-desc").html(),
-			state = when (doc.select("div.section-status:contains(Status) span").last()?.text()) {
-				"Ongoing" -> MangaState.ONGOING
-				"Completed" -> MangaState.FINISHED
-				else -> null
-			},
-			chapters = getChapters(manga.url, doc),
-		)
-	}
-
-	private fun getChapters(mangaUrl: String, doc: Document): List<MangaChapter> {
-		val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'", sourceLocale)
-		val script = doc.selectFirstOrThrow("script:containsData(chapters:)")
-		val json =
-			script.data().substringAfter("chapters:[").substringBeforeLast(')').substringBefore("],latest_chapter:")
-				.split("},")
-		val slug = mangaUrl.substringAfterLast("/")
-		val chapter = ArrayList<MangaChapter>()
-		var lastIndexed = 0
-		json.mapIndexed { i, t ->
-			if (t.contains("Chapter")) {
-				val id = t.substringAfter("id:").substringBefore(",created_at")
-				val url = "/reading/$slug/$id"
-				val date = t.substringAfter("created_at:\"").substringBefore("\"")
-				val name = t.substringAfter("name:\"").substringBefore("\"")
-				chapter.add(
-					MangaChapter(
-						id = generateUid(url),
-						name = name,
-						number = i + 1,
-						url = url,
-						uploadDate = dateFormat.tryParse(date),
-						source = source,
-						scanlator = null,
-						branch = null,
-					),
-				)
-				lastIndexed = i
-			}
-		}
-
-		// last chapter
-		val id = script.data().substringAfter("Sign in\",").substringBefore(",\"").split(",").last()
-		val url = "/reading/$slug/$id"
-		val date = script.data().substringAfter("$id,\"").substringBefore("\",")
-		val name = script.data().substringAfter("$date\",\"").substringBefore("\",")
-		chapter.add(
-			MangaChapter(
-				id = generateUid(url),
-				name = name,
-				number = lastIndexed + 1,
-				url = url,
-				uploadDate = dateFormat.tryParse(date),
-				source = source,
-				scanlator = null,
-				branch = null,
-			),
-		)
-		return chapter
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val id = chapter.url.substringAfterLast("/")
-		val json = webClient.httpGet("https://api.mangaowl.to/v1/chapters/$id/images?page_size=100").parseJson()
-		return json.getJSONArray("results").mapJSON { jo ->
-			MangaPage(
-				id = generateUid(jo.getString("image")),
-				preview = null,
-				source = chapter.source,
-				url = jo.getString("image"),
-			)
-		}
-	}
-}

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

@@ -1,151 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.en
-
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.PagedMangaParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("MANHWASMEN", "ManhwasMen", "en", type = ContentType.HENTAI)
-class ManhwasMen(context: MangaLoaderContext) :
-	PagedMangaParser(context, MangaSource.MANHWASMEN, pageSize = 30, searchPageSize = 30) {
-
-	override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("manhwas.men")
-
-	override val isMultipleTagsSupported = false
-
-	override val availableSortOrders: Set<SortOrder>
-		get() = EnumSet.of(SortOrder.POPULARITY)
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url = buildString {
-			append("https://")
-			append(domain)
-			append("/manga-list")
-			append("?page=")
-			append(page)
-			when {
-				!query.isNullOrEmpty() -> {
-					append("&search=")
-					append(query.urlEncoded())
-				}
-
-				!tags.isNullOrEmpty() -> {
-					append("&genero=")
-					append(tag?.key.orEmpty())
-				}
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select("ul.animes li").map { li ->
-			val href = li.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				coverUrl = li.selectFirst("img")?.src().orEmpty(),
-				title = li.selectFirst(".title")?.text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val tags = webClient.httpGet("https://$domain/manga-list").parseHtml()
-			.selectLastOrThrow(".filter-bx .form-group select.custom-select").select("option").drop(1)
-		return tags.mapNotNullToSet { option ->
-			MangaTag(
-				key = option.attr("value").substringAfterLast("="),
-				title = option.text(),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-		return manga.copy(
-			tags = doc.body().select(".genres a").mapNotNullToSet { a ->
-				MangaTag(
-					key = a.attr("href").substringAfterLast('='),
-					title = a.text(),
-					source = source,
-				)
-			},
-			description = doc.select(".sinopsis").html(),
-			state = when (doc.selectLast(".anime-type-peli")?.text()?.lowercase()) {
-				"ongoing" -> MangaState.ONGOING
-				"completed" -> MangaState.FINISHED
-				else -> null
-			},
-			chapters = doc.select(".episodes-list li").mapChapters(reversed = true) { i, li ->
-				val url = li.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-				MangaChapter(
-					id = generateUid(url),
-					name = li.selectFirstOrThrow(".flex-grow-1 span").text(),
-					number = i + 1,
-					url = url,
-					scanlator = null,
-					uploadDate = parseChapterDate(
-						SimpleDateFormat("dd/MM/yyyy", sourceLocale),
-						li.selectLastOrThrow(".flex-grow-1 span").text(),
-					),
-					branch = null,
-					source = source,
-				)
-			},
-		)
-	}
-
-	private fun parseChapterDate(dateFormat: DateFormat, date: String?): Long {
-		val d = date?.lowercase() ?: return 0
-		return when {
-			d.endsWith(" ago") -> parseRelativeDate(date)
-			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("week", "weeks").anyWordIn(date) -> cal.apply { add(Calendar.WEEK_OF_YEAR, -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
-		}
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml().requireElementById("chapter_imgs")
-		return doc.select("img").map { img ->
-			val url = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,96 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.en
-
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaParser
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("PO2SCANS", "Po2Scans", "en")
-internal class Po2Scans(context: MangaLoaderContext) : MangaParser(context, MangaSource.PO2SCANS) {
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.ALPHABETICAL)
-	override val configKeyDomain = ConfigKey.Domain("po2scans.com")
-
-	override suspend fun getList(offset: Int, query: String?, tags: Set<MangaTag>?, sortOrder: SortOrder): List<Manga> {
-		if (offset > 0) {
-			return emptyList()
-		}
-		val url = buildString {
-			append("https://$domain/series")
-			if (!query.isNullOrEmpty()) {
-				append("?search=")
-				append(query.urlEncoded())
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select(".series-list").map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				title = div.selectFirstOrThrow("h2").text(),
-				altTitle = null,
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				rating = RATING_UNKNOWN,
-				isNsfw = false,
-				coverUrl = div.selectFirstOrThrow("img").src()?.toAbsoluteUrl(domain).orEmpty(),
-				tags = emptySet(),
-				state = null,
-				author = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> = emptySet()
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-		val dateFormat = SimpleDateFormat("dd MMM, yy", Locale.ENGLISH)
-		return manga.copy(
-			altTitle = null,
-			state = when (doc.select(".status span").last()?.text()) {
-				"Ongoing" -> MangaState.ONGOING
-				"Done" -> MangaState.FINISHED
-				else -> null
-			},
-			tags = emptySet(),
-			author = doc.select(".author span").last()?.text(),
-			description = doc.selectFirstOrThrow(".summary").text(),
-			chapters = doc.select(".chap-section .chap")
-				.mapChapters(reversed = true) { i, div ->
-					val a = div.selectFirstOrThrow("a")
-					val url = "/" + a.attrAsRelativeUrl("href").toAbsoluteUrl(domain)
-					MangaChapter(
-						id = generateUid(url),
-						name = a.text(),
-						number = i + 1,
-						url = url,
-						scanlator = null,
-						uploadDate = dateFormat.tryParse(div.select(".detail span").last()?.text()),
-						branch = null,
-						source = source,
-					)
-				},
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		return doc.select(".swiper-slide img").map { img ->
-			val url = img.src()?.replace("./assets", "/assets")?.toRelativeUrl(domain)
-				?: img.parseFailed("Image src not found")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,170 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.en
-
-import androidx.collection.ArraySet
-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.*
-import org.koitharu.kotatsu.parsers.util.*
-import java.util.*
-
-@MangaSourceParser("PURURIN", "Pururin", "en", ContentType.HENTAI)
-internal class Pururin(context: MangaLoaderContext) :
-	PagedMangaParser(context, MangaSource.PURURIN, pageSize = 20) {
-
-	override val availableSortOrders: Set<SortOrder> =
-		EnumSet.of(SortOrder.UPDATED, SortOrder.POPULARITY, SortOrder.RATING, SortOrder.ALPHABETICAL)
-
-	override val configKeyDomain = ConfigKey.Domain("pururin.to")
-
-	override val isMultipleTagsSupported = false
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url = buildString {
-			append("https://")
-			append(domain)
-			if (!query.isNullOrEmpty()) {
-				append("/search?q=")
-				append(query.urlEncoded())
-				append("&page=")
-				append(page)
-			} else {
-				append("/browse")
-				if (!tags.isNullOrEmpty()) {
-					append("/tags/content/")
-					append(tag?.key.orEmpty())
-					append("/")
-				}
-				append("?page=")
-				append(page)
-				append("&sort=")
-				when (sortOrder) {
-					SortOrder.UPDATED -> append("")
-					SortOrder.POPULARITY -> append("most-viewed")
-					SortOrder.RATING -> append("highest-rated")
-					SortOrder.ALPHABETICAL -> append("title")
-					else -> append("")
-				}
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select(".row-gallery a.card-gallery").map { a ->
-			val href = a.attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				coverUrl = a.selectFirst("img.card-img-top")?.src().orEmpty(),
-				title = a.selectFirst(".title")?.text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		return coroutineScope {
-			(1..4).map { page ->
-				async { getTags(page) }
-			}
-		}.awaitAll().flattenTo(ArraySet(360))
-	}
-
-	private suspend fun getTags(page: Int): Set<MangaTag> {
-		val url = "https://$domain/tags/content?order=uses&page=$page"
-		val root = webClient.httpGet(url).parseHtml()
-		return root.parseTags()
-	}
-
-	private fun Element.parseTags() = select("table tr td a").mapToSet {
-		val href = it.attr("href").substringAfterLast("content/").substringBeforeLast('/')
-		MangaTag(
-			key = href,
-			title = it.text(),
-			source = source,
-		)
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		manga.copy(
-			description = doc.selectFirst("p.mb-2")?.text().orEmpty(),
-			rating = doc.selectFirst("td span.rating")?.attr("content")?.toFloatOrNull()?.div(5f) ?: RATING_UNKNOWN,
-			tags = doc.body().select("tr:contains(Contents) ul.list-inline a").mapNotNullToSet {
-				val href = it.attr("href").substringAfterLast("content/").substringBeforeLast('/')
-				MangaTag(
-					key = href,
-					title = it.text(),
-					source = source,
-				)
-			},
-			author = doc.selectFirst("a[itemprop=author]")?.text(),
-			chapters = listOf(
-				MangaChapter(
-					id = manga.id,
-					name = manga.title,
-					number = 1,
-					url = manga.url,
-					scanlator = null,
-					uploadDate = 0,
-					branch = null,
-					source = source,
-				),
-			),
-		)
-	}
-
-	override suspend fun getRelatedManga(seed: Manga): List<Manga> {
-		val doc = webClient.httpGet(seed.url.toAbsoluteUrl(domain)).parseHtml()
-		val root = doc.body().selectFirstOrThrow(".row-gallery-small")
-		return root.select("a.card-gallery").mapNotNull { a ->
-			val href = a.attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				coverUrl = a.selectFirst("img.card-img-top")?.src().orEmpty(),
-				title = a.selectFirst(".title")?.text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = false,
-			)
-		}
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		return doc.select(".gallery-preview img").map { url ->
-			val img = url.src()?.toRelativeUrl(domain) ?: url.parseFailed("Image src not found")
-			val urlImage = img.replace("t.", ".")
-			MangaPage(
-				id = generateUid(urlImage),
-				url = urlImage,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,132 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.es
-
-import kotlinx.coroutines.coroutineScope
-import okhttp3.Headers
-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.*
-import org.koitharu.kotatsu.parsers.network.UserAgents
-import org.koitharu.kotatsu.parsers.util.*
-import java.util.*
-
-@MangaSourceParser("TEMPLESCANESP", "TempleScanEsp", "es", ContentType.HENTAI)
-internal class TempleScanEsp(context: MangaLoaderContext) :
-	PagedMangaParser(context, MangaSource.TEMPLESCANESP, pageSize = 15) {
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.NEWEST, SortOrder.UPDATED)
-
-	override val configKeyDomain = ConfigKey.Domain("templescanesp.net")
-
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_DESKTOP)
-		.build()
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val url = buildString {
-			append("https://")
-			append(domain)
-			if (sortOrder == SortOrder.NEWEST) {
-				append("/comics")
-				append("?page=")
-				append(page.toString())
-			} else {
-				if (page > 1) {
-					return emptyList()
-				}
-			}
-		}
-
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select("div.grid figure").ifEmpty {
-			doc.requireElementById("projectsDiv").select("figure")
-		}.map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(div.host ?: domain),
-				coverUrl = div.selectFirst("img")?.src().orEmpty(),
-				title = div.selectFirst("figcaption")?.text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> = emptySet()
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		val chaptersDeferred = getChapters(doc)
-		manga.copy(
-			description = doc.requireElementById("section-sinopsis").html(),
-			chapters = chaptersDeferred,
-		)
-	}
-
-	private fun getChapters(doc: Document): List<MangaChapter> {
-		return doc.body().select("div.grid-capitulos div.contenedor-capitulo-miniatura")
-			.mapChapters(reversed = true) { i, div ->
-				val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-				val date = parseUploadDate(div.selectFirstOrThrow("time").text())
-				MangaChapter(
-					id = generateUid(href),
-					name = div.requireElementById("name").text(),
-					number = i + 1,
-					url = href,
-					uploadDate = date,
-					source = source,
-					scanlator = null,
-					branch = null,
-				)
-			}
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		return doc.select("main.contenedor-imagen img").map { url ->
-			val img = url.src()?.toRelativeUrl(domain) ?: url.parseFailed("Image src not found")
-			MangaPage(
-				id = generateUid(img),
-				url = img,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-
-	private fun parseUploadDate(timeStr: String?): Long {
-		timeStr ?: return 0
-		val timeWords = timeStr.split(' ')
-		if (timeWords.size != 3) return 0
-		val timeWord = timeWords[1]
-		val timeAmount = timeWords[0].toIntOrNull() ?: return 0
-		val timeUnit = when (timeWord) {
-			"minute", "minutes" -> Calendar.MINUTE
-			"hour", "hours" -> Calendar.HOUR
-			"day", "days" -> Calendar.DAY_OF_YEAR
-			"week", "weeks" -> Calendar.WEEK_OF_YEAR
-			"month", "months" -> Calendar.MONTH
-			"year", "years" -> Calendar.YEAR
-			else -> return 0
-		}
-		val cal = Calendar.getInstance()
-		cal.add(timeUnit, -timeAmount)
-		return cal.time.time
-	}
-}

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

@@ -1,227 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.es
-
-import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.PagedMangaParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("TUMANGAONLINE", "TuMangaOnline", "es")
-class TuMangaOnlineParser(context: MangaLoaderContext) : PagedMangaParser(
-	context,
-	source = MangaSource.TUMANGAONLINE,
-	pageSize = 24,
-) {
-
-	override val configKeyDomain = ConfigKey.Domain("visortmo.com")
-
-	private val chapterDateFormat = SimpleDateFormat("yyyy-MM-dd", sourceLocale)
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.ALPHABETICAL,
-		SortOrder.UPDATED,
-		SortOrder.NEWEST,
-		SortOrder.POPULARITY,
-		SortOrder.RATING,
-	)
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-
-		val order =
-			when (sortOrder) {
-				SortOrder.POPULARITY -> "likes_count"
-				SortOrder.UPDATED -> "release_date"
-				SortOrder.NEWEST -> "creation"
-				SortOrder.ALPHABETICAL -> "alphabetically"
-				SortOrder.RATING -> "score"
-
-			}
-		val url = buildString {
-			append("/library")
-			if (query.isNullOrEmpty()) {
-				append("?order_item=")
-				append(order)
-				append("&order_dir=desc")
-				append("&filter_by=title")
-				if (tags != null) {
-					for (tag in tags) {
-						append("&genders[]=${tag.key}")
-					}
-				}
-			} else {
-				append("?title=$query")
-			}
-			append("&_pg=1")
-			append("&page=$page")
-		}.toAbsoluteUrl(domain)
-
-		val doc = webClient.httpGet(url, headers).parseHtml()
-		val items = doc.body().select("div.element")
-		return items.mapNotNull { item ->
-			val href =
-				item.selectFirst("a")?.attrAsRelativeUrlOrNull("href")?.substringAfter(' ') ?: return@mapNotNull null
-			Manga(
-				id = generateUid(href),
-				title = item.selectFirst("h4.text-truncate")?.text() ?: return@mapNotNull null,
-				coverUrl = item.select("style").toString().substringAfter("('").substringBeforeLast("')"),
-				altTitle = null,
-				author = null,
-				rating = item.selectFirst("span.score")?.text()?.toFloatOrNull()?.div(10F) ?: RATING_UNKNOWN,
-				url = href,
-				isNsfw = item.select("i").hasClass("fas fa-heartbeat fa-2x"),
-				tags = emptySet(),
-				state = null,
-				publicUrl = href.toAbsoluteUrl(doc.host ?: domain),
-				source = source,
-			)
-		}
-
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-		val contents = doc.body().selectFirstOrThrow("section.element-header-content")
-		return manga.copy(
-			description = contents.selectFirst("p.element-description")?.html(),
-			largeCoverUrl = contents.selectFirst(".book-thumbnail")?.attrAsAbsoluteUrlOrNull("src"),
-			state = parseStatus(contents.select("span.book-status").text().orEmpty()),
-			author = contents.selectFirst("h5.card-title")?.attr("title")?.substringAfter(", "),
-			chapters = if (doc.select("div.chapters").isEmpty()) {
-				doc.select(oneShotChapterListSelector).mapChapters(reversed = true) { _, item ->
-					oneShotChapterFromElement(item)
-				}
-			} else {
-				val chapters = ChaptersListBuilder(10)
-				doc.select(regularChapterListSelector).reversed().forEachIndexed { i, item ->
-					val chaptername = item.select("div.col-10.text-truncate").text().replace("&nbsp;", " ").trim()
-					val scanelement = item.select("ul.chapter-list > li")
-					scanelement.forEach { chapters.add(regularChapterFromElement(it, chaptername, i)) }
-				}
-				chapters.toList()
-			},
-		)
-	}
-
-	private val oneShotChapterListSelector = "div.chapter-list-element > ul.list-group li.list-group-item"
-
-	private fun oneShotChapterFromElement(element: Element): MangaChapter {
-		val href = element.selectFirstOrThrow("div.row > .text-right > a").attrAsRelativeUrl("href")
-		return MangaChapter(
-			id = generateUid(href),
-			name = "One Shot",
-			number = 1,
-			url = href,
-			scanlator = element.select("div.col-md-6.text-truncate").text(),
-			branch = null,
-			uploadDate = chapterDateFormat.tryParse(element.select("span.badge.badge-primary.p-2").first()?.text()),
-			source = source,
-		)
-	}
-
-	private val regularChapterListSelector = "div.chapters > ul.list-group li.p-0.list-group-item"
-
-	private fun regularChapterFromElement(element: Element, chName: String, number: Int): MangaChapter {
-		val href = element.selectFirstOrThrow("div.row > .text-right > a").attrAsRelativeUrl("href")
-		return MangaChapter(
-			id = generateUid(href),
-			name = chName,
-			number = number + 1,
-			url = href,
-			scanlator = element.select("div.col-md-6.text-truncate").text(),
-			branch = null,
-			uploadDate = chapterDateFormat.tryParse(element.select("span.badge.badge-primary.p-2").first()?.text()),
-			source = source,
-		)
-	}
-
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val redirectDoc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain), headers).parseHtml()
-		var doc = redirectToReadingPage(redirectDoc)
-		val currentUrl = doc.location()
-		val newUrl = if (!currentUrl.contains("cascade")) {
-			currentUrl.substringBefore("paginated") + "cascade"
-		} else {
-			currentUrl
-		}
-
-		if (currentUrl != newUrl) {
-			doc = webClient.httpGet(newUrl, headers).parseHtml()
-		}
-
-		return doc.select("div.viewer-container img:not(noscript img)").map {
-			val href = if (it.hasAttr("data-src")) {
-				it.attr("abs:data-src")
-			} else {
-				it.attr("abs:src")
-			}
-			MangaPage(
-				id = generateUid(href),
-				url = href,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-
-	private suspend fun redirectToReadingPage(document: Document): Document {
-		val script1 = document.selectFirst("script:containsData(uniqid)")
-		val script2 = document.selectFirst("script:containsData(window.location.replace)")
-
-		val redirectHeaders = Headers.Builder().set("Referer", document.baseUri()).build()
-
-		if (script1 != null) {
-			val data = script1.data()
-			val regexParams = """\{uniqid:'(.+)',cascade:(.+)\}""".toRegex()
-			val regexAction = """form\.action\s?=\s?'(.+)'""".toRegex()
-			val params = regexParams.find(data)!!
-			val action = regexAction.find(data)!!.groupValues[1].toHttpUrl()
-
-			val formBody = mapOf(
-				"uniqid" to params.groupValues[1],
-				"cascade" to params.groupValues[2],
-			)
-			return redirectToReadingPage(webClient.httpPost(action, formBody, redirectHeaders).parseHtml())
-		}
-
-		if (script2 != null) {
-			val data = script2.data()
-			val regexRedirect = """window\.location\.replace\('(.+)'\)""".toRegex()
-			val url = regexRedirect.find(data)!!.groupValues[1]
-
-			return redirectToReadingPage(webClient.httpGet(url, redirectHeaders).parseHtml())
-		}
-
-		return document
-	}
-
-	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")
-		return elements.mapNotNullToSet { element ->
-			MangaTag(
-				title = element.select("label").text(),
-				key = element.select("input").attr("value"),
-				source = source,
-			)
-		}
-	}
-
-	private fun parseStatus(status: String) = when {
-		status.contains("Publicándose") -> MangaState.ONGOING
-		status.contains("Finalizado") -> MangaState.FINISHED
-		else -> null
-	}
-}

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

@@ -1,294 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.fmreader
-
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import org.jsoup.nodes.Document
-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 FmreaderParser(
-	context: MangaLoaderContext,
-	source: MangaSource,
-	domain: String,
-	pageSize: Int = 20,
-) : PagedMangaParser(context, source, pageSize) {
-
-	override val configKeyDomain = ConfigKey.Domain(domain)
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.UPDATED,
-		SortOrder.POPULARITY,
-		SortOrder.ALPHABETICAL,
-	)
-
-	override val isMultipleTagsSupported = false
-
-	protected open val listUrl = "/manga-list.html"
-	protected open val datePattern = "MMMM d, yyyy"
-	protected open val tagPrefix = "manga-list-genre-"
-
-	init {
-		paginator.firstPage = 1
-		searchPaginator.firstPage = 1
-	}
-
-	@JvmField
-	protected val ongoing: Set<String> = setOf(
-		"On going",
-		"Incomplete",
-		"En curso",
-	)
-
-	@JvmField
-	protected val finished: Set<String> = setOf(
-		"Completed",
-		"Completado",
-	)
-
-	@JvmField
-	protected val abandoned: Set<String> = hashSetOf(
-		"Canceled",
-		"Cancelled",
-		"Drop",
-	)
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url = buildString {
-			append("https://")
-			append(domain)
-			append(listUrl)
-			append("?page=")
-			append(page.toString())
-			when {
-				!query.isNullOrEmpty() -> {
-
-					append("&name=")
-					append(query.urlEncoded())
-				}
-
-				!tags.isNullOrEmpty() -> {
-					append("&genre=")
-					append(tag?.key.orEmpty())
-				}
-			}
-			append("&sort=")
-			when (sortOrder) {
-				SortOrder.POPULARITY -> append("views")
-				SortOrder.UPDATED -> append("last_update")
-				SortOrder.ALPHABETICAL -> append("name")
-				else -> append("last_update")
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select("div.thumb-item-flow").map { div ->
-			val href = div.selectFirstOrThrow("div.series-title a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(div.host ?: domain),
-				coverUrl = div.selectFirstOrThrow("div.img-in-ratio").attr("data-bg")
-					?: div.selectFirstOrThrow("div.img-in-ratio").attr("style").substringAfter("('")
-						.substringBeforeLast("')"),
-				title = div.selectFirstOrThrow("div.series-title").text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	protected open val selectBodyTag = "ul.filter-type li a"
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val doc = webClient.httpGet("https://$domain/$listUrl").parseHtml()
-		return doc.select(selectBodyTag).mapNotNullToSet { a ->
-			val href = a.attr("href").substringAfter(tagPrefix).substringBeforeLast(".html")
-			MangaTag(
-				key = href,
-				title = a.text(),
-				source = source,
-			)
-		}
-	}
-
-	protected open val selectDesc = "div.summary-content"
-	protected open val selectState = "ul.manga-info li:contains(Status) a"
-	protected open val selectAlt = "ul.manga-info li:contains(Other names)"
-	protected open val selectAut = "ul.manga-info li:contains(Author(s)) a"
-	protected open val selectTag = "ul.manga-info li:contains(Genre(s)) a"
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		val chaptersDeferred = async { getChapters(doc) }
-		val desc = doc.selectFirst(selectDesc)?.html()
-		val stateDiv = doc.selectFirst(selectState)
-		val state = stateDiv?.let {
-			when (it.text()) {
-				in ongoing -> MangaState.ONGOING
-				in finished -> MangaState.FINISHED
-				in abandoned -> MangaState.ABANDONED
-				else -> null
-			}
-		}
-		val alt = doc.body().selectFirst(selectAlt)?.text()?.replace("Other names", "")
-		val auth = doc.body().selectFirst(selectAut)?.text()
-		manga.copy(
-			tags = doc.body().select(selectTag).mapNotNullToSet { a ->
-				MangaTag(
-					key = a.attr("href").substringAfter(tagPrefix).substringBeforeLast(".html"),
-					title = a.text().toTitleCase(),
-					source = source,
-				)
-			},
-			description = desc,
-			altTitle = alt,
-			author = auth,
-			state = state,
-			chapters = chaptersDeferred.await(),
-		)
-	}
-
-
-	protected open val selectDate = "div.chapter-time"
-	protected open val selectChapter = "ul.list-chapters a"
-
-	protected open suspend fun getChapters(doc: Document): List<MangaChapter> {
-		val dateFormat = SimpleDateFormat(datePattern, sourceLocale)
-		return doc.body().select(selectChapter).mapChapters(reversed = true) { i, a ->
-			val href = a.attrAsRelativeUrl("href")
-			val dateText = a.selectFirst(selectDate)?.text()
-			MangaChapter(
-				id = generateUid(href),
-				name = a.selectFirstOrThrow("div.chapter-name").text(),
-				number = i + 1,
-				url = href,
-				uploadDate = parseChapterDate(
-					dateFormat,
-					dateText,
-				),
-				source = source,
-				scanlator = null,
-				branch = null,
-			)
-		}
-	}
-
-	protected open val selectPage = "div.chapter-content 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 {
-		// Clean date (e.g. 5th December 2019 to 5 December 2019) before parsing it
-		val d = date?.lowercase() ?: return 0
-		return when {
-			d.endsWith(" ago") ||
-				d.endsWith(" atrás") ||
-				// short Hours
-				d.endsWith(" h") ||
-				// short Day
-				d.endsWith(" d") -> parseRelativeDate(date)
-
-			// Handle 'yesterday' and 'today', using midnight
-			d.startsWith("year") -> Calendar.getInstance().apply {
-				add(Calendar.DAY_OF_MONTH, -1) // yesterday
-				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)
-		}
-	}
-
-	// Parses dates in this form:
-	// 21 hours ago
-	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("min", "minute", "minutes", "minuto", "minutos").anyWordIn(date) -> cal.apply {
-				add(
-					Calendar.MINUTE,
-					-number,
-				)
-			}.timeInMillis
-
-			WordSet("hour", "hours", "hora", "horas", "h").anyWordIn(date) -> cal.apply {
-				add(
-					Calendar.HOUR,
-					-number,
-				)
-			}.timeInMillis
-
-			WordSet("day", "days", "día", "dia").anyWordIn(date) -> cal.apply {
-				add(
-					Calendar.DAY_OF_MONTH,
-					-number,
-				)
-			}.timeInMillis
-
-			WordSet("week", "weeks", "semana", "semanas").anyWordIn(date) -> cal.apply {
-				add(
-					Calendar.WEEK_OF_YEAR,
-					-number,
-				)
-			}.timeInMillis
-
-			WordSet("month", "months", "mes", "meses").anyWordIn(date) -> cal.apply {
-				add(
-					Calendar.MONTH,
-					-number,
-				)
-			}.timeInMillis
-
-			WordSet("year", "año", "años").anyWordIn(date) -> cal.apply { add(Calendar.YEAR, -number) }.timeInMillis
-			else -> 0
-		}
-	}
-}

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

@@ -1,152 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.fmreader.en
-
-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.model.*
-import org.koitharu.kotatsu.parsers.site.fmreader.FmreaderParser
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.SimpleDateFormat
-
-@MangaSourceParser("MANHWA18COM", "Manhwa18.com", "en", ContentType.HENTAI)
-internal class Manhwa18Com(context: MangaLoaderContext) :
-	FmreaderParser(context, MangaSource.MANHWA18COM, "manhwa18.com") {
-
-	override val listUrl = "/tim-kiem"
-	override val selectState = "div.info-item:contains(Status) span.info-value "
-	override val selectAlt = "div.info-item:contains(Other name) span.info-value "
-	override val selectTag = "div.info-item:contains(Genre) span.info-value a"
-	override val datePattern = "dd/MM/yyyy"
-	override val selectPage = "div#chapter-content img"
-	override val selectBodyTag = "div.genres-menu a"
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url = buildString {
-			append("https://")
-			append(domain)
-			if (!tags.isNullOrEmpty()) {
-				append("/genre/")
-				append(tag?.key.orEmpty())
-				append("?page=")
-				append(page.toString())
-				append("&sort=")
-				when (sortOrder) {
-					SortOrder.POPULARITY -> append("views")
-					SortOrder.UPDATED -> append("last_update")
-					SortOrder.ALPHABETICAL -> append("name")
-					else -> append("last_update")
-				}
-			} else {
-				append(listUrl)
-				append("?page=")
-				append(page.toString())
-				when {
-					!query.isNullOrEmpty() -> {
-						append("&q=")
-						append(query.urlEncoded())
-					}
-				}
-				append("&sort=")
-				when (sortOrder) {
-					SortOrder.POPULARITY -> append("views")
-					SortOrder.UPDATED -> append("last_update")
-					SortOrder.ALPHABETICAL -> append("name")
-					else -> append("last_update")
-				}
-
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select("div.thumb-item-flow").map { div ->
-			val href = div.selectFirstOrThrow("div.series-title a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(div.host ?: domain),
-				coverUrl = div.selectFirstOrThrow("div.img-in-ratio").attr("data-bg")
-					?: div.selectFirstOrThrow("div.img-in-ratio").attr("style").substringAfter("('")
-						.substringBeforeLast("')"),
-				title = div.selectFirstOrThrow("div.series-title").text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val doc = webClient.httpGet("https://$domain/$listUrl").parseHtml()
-		return doc.select(selectBodyTag).mapNotNullToSet { a ->
-			val href = a.attr("href").substringAfterLast("/")
-			MangaTag(
-				key = href,
-				title = a.text(),
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		val chaptersDeferred = async { getChapters(doc) }
-		val desc = doc.selectFirstOrThrow(selectDesc).html()
-		val stateDiv = doc.selectFirst(selectState)
-		val state = stateDiv?.let {
-			when (it.text()) {
-				in ongoing -> MangaState.ONGOING
-				in finished -> MangaState.FINISHED
-				else -> null
-			}
-		}
-		val alt = doc.body().selectFirst(selectAlt)?.text()?.replace("Other name", "")
-		val auth = doc.body().selectFirst(selectAut)?.text()
-		manga.copy(
-			tags = doc.body().select(selectTag).mapNotNullToSet { a ->
-				MangaTag(
-					key = a.attr("href").substringAfter("manga-list-genre-").substringBeforeLast(".html"),
-					title = a.text().toTitleCase(),
-					source = source,
-				)
-			},
-			description = desc,
-			altTitle = alt,
-			author = auth,
-			state = state,
-			chapters = chaptersDeferred.await(),
-		)
-	}
-
-	override suspend fun getChapters(doc: Document): List<MangaChapter> {
-		val dateFormat = SimpleDateFormat(datePattern, sourceLocale)
-		return doc.body().select(selectChapter).mapChapters(reversed = true) { i, a ->
-			val href = a.attrAsRelativeUrl("href")
-			val dateText = a.selectFirst(selectDate)?.text()?.substringAfter("- ")
-			MangaChapter(
-				id = generateUid(href),
-				name = a.selectFirstOrThrow("div.chapter-name").text(),
-				number = i + 1,
-				url = href,
-				uploadDate = parseChapterDate(
-					dateFormat,
-					dateText,
-				),
-				source = source,
-				scanlator = null,
-				branch = null,
-			)
-		}
-	}
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/es/OlimpoScans.kt

@@ -1,89 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.fmreader.es
-
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.site.fmreader.FmreaderParser
-import org.koitharu.kotatsu.parsers.util.*
-
-@MangaSourceParser("OLIMPOSCANS", "OlimpoScans", "es")
-internal class OlimpoScans(context: MangaLoaderContext) :
-	FmreaderParser(context, MangaSource.OLIMPOSCANS, "olimposcans.com") {
-
-	override val selectState = "ul.manga-info li:contains(Estado) a"
-	override val selectAlt = "ul.manga-info li:contains(Otros nombres)"
-	override val selectTag = "ul.manga-info li:contains(Género) a"
-	override val tagPrefix = "lista-de-comics-genero-"
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url = buildString {
-			append("https://")
-			append(domain)
-			append(listUrl)
-			append("?page=")
-			append(page.toString())
-			when {
-				!query.isNullOrEmpty() -> {
-					append("&name=")
-					append(query.urlEncoded())
-				}
-
-				!tags.isNullOrEmpty() -> {
-					append("&genre=")
-					append(tag?.key.orEmpty())
-				}
-			}
-			append("&sort=")
-			when (sortOrder) {
-				SortOrder.POPULARITY -> append("views")
-				SortOrder.UPDATED -> append("last_update")
-				SortOrder.ALPHABETICAL -> append("name")
-				else -> append("last_update")
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-		val lastPage =
-			doc.selectLast(".pagination a")?.attr("href")?.substringAfterLast("page=")?.substringBeforeLast("&artist")
-				?.toInt() ?: 1
-		if (lastPage < page) {
-			return emptyList()
-		}
-		return doc.select("div.thumb-item-flow").map { div ->
-			val href = "/" + div.selectFirstOrThrow("div.series-title a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(div.host ?: domain),
-				coverUrl = div.selectFirstOrThrow("div.img-in-ratio").attr("data-bg").toAbsoluteUrl(domain),
-				title = div.selectFirstOrThrow("div.series-title").text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	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 = ("/proxy.php?link=" + img.src()).toRelativeUrl(domain)
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,125 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.fmreader.ja
-
-import org.jsoup.nodes.Document
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.parsers.model.RATING_UNKNOWN
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.site.fmreader.FmreaderParser
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.SimpleDateFormat
-
-@MangaSourceParser("KLZ9", "Klz9", "ja")
-internal class Klz9(context: MangaLoaderContext) :
-	FmreaderParser(context, MangaSource.KLZ9, "klz9.com") {
-
-	override val selectDesc = "div.row:contains(Description)"
-	override val selectState = "ul.manga-info li:contains(Status) a"
-	override val selectAlt = "ul.manga-info li:contains(Other name (s))"
-	override val selectTag = "ul.manga-info li:contains(Genre(s)) a"
-	override val selectChapter = "tr"
-	override val selectDate = "td i"
-	override val selectPage = "img"
-	override val selectBodyTag = "div.panel-body a"
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val url = buildString {
-			append("https://")
-			append(domain)
-			append("/$listUrl")
-			append("?page=")
-			append(page.toString())
-			when {
-				!query.isNullOrEmpty() -> {
-
-					append("&name=")
-					append(query.urlEncoded())
-				}
-
-				!tags.isNullOrEmpty() -> {
-					append("&genre=")
-					append(tag?.key.orEmpty())
-				}
-			}
-			append("&sort=")
-			when (sortOrder) {
-				SortOrder.POPULARITY -> append("views")
-				SortOrder.UPDATED -> append("last_update")
-				SortOrder.ALPHABETICAL -> append("name")
-				else -> append("last_update")
-			}
-		}
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select("div.thumb-item-flow").map { div ->
-			val href = "/" + div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(div.host ?: domain),
-				coverUrl = div.selectFirstOrThrow("div.img-in-ratio").attr("style").substringAfter("('")
-					.substringBeforeLast("')"),
-				title = div.selectFirstOrThrow("div.series-title").text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	override suspend fun getChapters(doc: Document): List<MangaChapter> {
-		val slug = doc.selectFirstOrThrow("div.h0rating").attr("slug")
-		val docLoad =
-			webClient.httpGet("https://$domain/app/manga/controllers/cont.listChapter.php?slug=$slug").parseHtml()
-		val dateFormat = SimpleDateFormat(datePattern, sourceLocale)
-		return docLoad.body().select(selectChapter).mapChapters(reversed = true) { i, a ->
-			val href = "/" + a.selectFirstOrThrow("a.chapter").attrAsRelativeUrl("href")
-			val dateText = a.selectFirst(selectDate)?.text()
-			MangaChapter(
-				id = generateUid(href),
-				name = a.selectFirstOrThrow("a").text(),
-				number = i + 1,
-				url = href,
-				uploadDate = parseChapterDate(
-					dateFormat,
-					dateText,
-				),
-				source = source,
-				scanlator = null,
-				branch = null,
-			)
-		}
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		val cid = doc.selectFirstOrThrow("#chapter").attr("value")
-		val docLoad = webClient.httpGet("https://$domain/app/manga/controllers/cont.listImg.php?cid=$cid").parseHtml()
-		return docLoad.select(selectPage).map { img ->
-			val url = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found")
-
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-
-}

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

@@ -1,57 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.fmreader.ja
-
-import org.jsoup.nodes.Document
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.site.fmreader.FmreaderParser
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.SimpleDateFormat
-
-@MangaSourceParser("WELOVEMANGA", "WeLoveManga", "ja")
-internal class WeLoveManga(context: MangaLoaderContext) :
-	FmreaderParser(context, MangaSource.WELOVEMANGA, "welovemanga.one") {
-
-	override suspend fun getChapters(doc: Document): List<MangaChapter> {
-		val mid = doc.selectFirstOrThrow("div.cmt input").attr("value")
-		val docLoad =
-			webClient.httpGet("https://$domain/app/manga/controllers/cont.Listchapter.php?mid=$mid").parseHtml()
-		val dateFormat = SimpleDateFormat(datePattern, sourceLocale)
-		return docLoad.body().select(selectChapter).mapChapters(reversed = true) { i, a ->
-			val href = a.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			val dateText = a.selectFirst(selectDate)?.text()
-			MangaChapter(
-				id = generateUid(href),
-				name = a.selectFirstOrThrow("a").text(),
-				number = i + 1,
-				url = href,
-				uploadDate = parseChapterDate(
-					dateFormat,
-					dateText,
-				),
-				source = source,
-				scanlator = null,
-				branch = null,
-			)
-		}
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		val cid = doc.selectFirstOrThrow("#chapter").attr("value")
-		val docLoad = webClient.httpGet("https://$domain/app/manga/controllers/cont.listImg.php?cid=$cid").parseHtml()
-		return docLoad.select("img").map { img ->
-			val url = img.src()?.toRelativeUrl(domain) ?: img.parseFailed("Image src not found")
-
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/ja/Weloma.kt

@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.fmreader.ja
-
-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.fmreader.FmreaderParser
-
-@MangaSourceParser("WELOMA", "Weloma", "ja")
-internal class Weloma(context: MangaLoaderContext) :
-	FmreaderParser(context, MangaSource.WELOMA, "weloma.art")

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

@@ -1,163 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide
-
-import kotlinx.coroutines.coroutineScope
-import org.json.JSONArray
-import org.jsoup.nodes.Document
-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.SimpleDateFormat
-import java.util.*
-
-internal abstract class FoolSlideParser(
-	context: MangaLoaderContext,
-	source: MangaSource,
-	domain: String,
-	pageSize: Int = 25,
-) : PagedMangaParser(context, source, pageSize) {
-
-	override val configKeyDomain = ConfigKey.Domain(domain)
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.ALPHABETICAL)
-
-	protected open val listUrl = "directory/"
-	protected open val searchUrl = "search/"
-	protected open val pagination = true // false if the manga list has no pages
-	protected open val datePattern = "yyyy.MM.dd"
-
-	init {
-		paginator.firstPage = 1
-		searchPaginator.firstPage = 1
-	}
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val doc = if (!query.isNullOrEmpty()) {
-			val url = buildString {
-				append("https://$domain/$searchUrl")
-				if (page > 1) {
-					return emptyList()
-				}
-			}
-			val q = query.urlEncoded()
-			webClient.httpPost(url, "search=$q").parseHtml()
-		} else {
-			val url = buildString {
-				append("https://$domain/$listUrl")
-				// For some sites that don't have enough manga and page 2 links to page 1
-				if (!pagination) {
-					if (page > 1) {
-						return emptyList()
-					}
-				} else {
-					append(page.toString())
-				}
-			}
-			webClient.httpGet(url).parseHtml()
-		}
-		return doc.select("div.list div.group").map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(div.host ?: domain),
-				coverUrl = div.selectFirst("img")?.src().orEmpty(),// in search no img
-				title = div.selectFirstOrThrow(".title a").text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> = emptySet()
-
-	protected open val selectInfo = "div.info"
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val testAdultPage = webClient.httpGet(fullUrl).parseHtml()
-		val doc = if (testAdultPage.selectFirst("div.info form") != null) {
-			webClient.httpPost(fullUrl, "adult=true").parseHtml()
-		} else {
-			testAdultPage
-		}
-		val chapters = getChapters(doc)
-		val desc = if (doc.selectFirstOrThrow(selectInfo).html().contains("</b>")) {
-			doc.selectFirstOrThrow(selectInfo).text().substringAfterLast(": ")
-		} else {
-			doc.selectFirstOrThrow(selectInfo).text()
-		}
-		val author = if (doc.selectFirstOrThrow(selectInfo).html().contains("</b>")) {
-			doc.selectFirstOrThrow(selectInfo).text().substringAfter(": ").substringBefore("Art")
-		} else {
-			null
-		}
-		manga.copy(
-			coverUrl = doc.selectFirst(".thumbnail img")?.src() ?: manga.coverUrl,
-			description = desc,
-			altTitle = null,
-			author = author,
-			state = null,
-			chapters = chapters,
-		)
-	}
-
-
-	protected open val selectDate = ".meta_r"
-	protected open val selectChapter = "div.list div.element"
-
-	protected open suspend fun getChapters(doc: Document): List<MangaChapter> {
-		val dateFormat = SimpleDateFormat(datePattern, sourceLocale)
-		return doc.body().select(selectChapter).mapChapters(reversed = true) { i, div ->
-			val a = div.selectFirstOrThrow(".title a")
-			val href = a.attrAsRelativeUrl("href")
-			val dateText = div.selectFirstOrThrow(selectDate).text().substringAfter(", ")
-			MangaChapter(
-				id = generateUid(href),
-				name = a.text(),
-				number = i + 1,
-				url = href,
-				uploadDate = if (div.selectFirstOrThrow(selectDate).text().contains(", ")) {
-					dateFormat.tryParse(dateText)
-				} else {
-					0
-				},
-				source = source,
-				scanlator = null,
-				branch = null,
-			)
-		}
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		val script = doc.selectFirstOrThrow("script:containsData(var pages = )")
-		val images = JSONArray(script.data().substringAfterLast("var pages = ").substringBefore(';'))
-		val pages = ArrayList<MangaPage>(images.length())
-		for (i in 0 until images.length()) {
-			val pageTake = images.getJSONObject(i)
-			pages.add(
-				MangaPage(
-					id = generateUid(pageTake.getString("url")),
-					url = pageTake.getString("url"),
-					preview = null,
-					source = source,
-				),
-			)
-		}
-		return pages
-	}
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/AssortedScans.kt

@@ -1,135 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide.en
-
-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.model.*
-import org.koitharu.kotatsu.parsers.site.foolslide.FoolSlideParser
-import org.koitharu.kotatsu.parsers.util.*
-
-@MangaSourceParser("ASSORTEDSCANS", "AssortedScans", "en")
-internal class AssortedScans(context: MangaLoaderContext) :
-	FoolSlideParser(context, MangaSource.ASSORTEDSCANS, "assortedscans.com", 56) {
-
-	override val listUrl = "reader/"
-	override val pagination = false
-	override val selectInfo = "div.#series-info"
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-
-		val doc = if (!query.isNullOrEmpty()) {
-			if (page > 1) {
-				return emptyList()
-			}
-			val url = buildString {
-				append("https://")
-				append(domain)
-				append('/')
-				append(searchUrl)
-				append("?q=")
-				append(query.urlEncoded())
-			}
-			webClient.httpGet(url).parseHtml()
-		} else {
-			val url = buildString {
-				append("https://$domain/$listUrl")
-				// For some sites that don't have enough manga and page 2 links to page 1
-				if (!pagination) {
-					if (page > 1) {
-						return emptyList()
-					}
-				} else {
-					append(page.toString())
-				}
-			}
-			webClient.httpGet(url).parseHtml()
-		}
-		return doc.select("section.series, tr.result").map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(div.host ?: domain),
-				coverUrl = div.selectFirst("img")?.src().orEmpty(),// in search no img
-				title = div.selectFirstOrThrow("a").text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = isNsfwSource,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val testAdultPage = webClient.httpGet(fullUrl).parseHtml()
-		val doc = if (testAdultPage.selectFirst("div.info form") != null) {
-			webClient.httpPost(fullUrl, "adult=true").parseHtml()
-		} else {
-			testAdultPage
-		}
-		val chapters = getChapters(doc)
-		val desc = doc.getElementById("series-desc")?.selectFirst("div")?.html()
-		val alt = doc.getElementById("series-aliases")?.selectFirst("div.alias")?.text()
-		val author = doc.getElementById("series-authors")?.selectFirst("div.author")?.text()
-		val state = doc.getElementById("series-status")?.selectFirst("span")?.text()
-		manga.copy(
-			coverUrl = doc.selectFirst(".cover")?.src() ?: manga.coverUrl,
-			description = desc,
-			altTitle = alt,
-			author = author,
-			state = when (state) {
-				"Ongoing" -> MangaState.ONGOING
-				"Completed" -> MangaState.FINISHED
-				"Canceled" -> MangaState.ABANDONED
-				else -> null
-			},
-			chapters = chapters,
-		)
-	}
-
-	override suspend fun getChapters(doc: Document): List<MangaChapter> {
-		return doc.body().select("div.chapter").mapChapters(reversed = true) { i, div ->
-			val a = div.selectFirstOrThrow("a")
-			val href = a.attrAsRelativeUrl("href")
-			MangaChapter(
-				id = generateUid(href),
-				name = a.text(),
-				number = i + 1,
-				url = href,
-				uploadDate = 0,
-				source = source,
-				scanlator = null,
-				branch = null,
-			)
-		}
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml()
-		return doc.body().select(".page-list .dropdown-list li a").map { a ->
-			val url = a.attr("href").toRelativeUrl(domain)
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getPageUrl(page: MangaPage): String {
-		val doc = webClient.httpGet(page.url.toAbsoluteUrl(domain)).parseHtml()
-		val root = doc.body()
-		return root.requireElementById("page-image").attr("src") ?: doc.parseFailed("Page image not found")
-	}
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/Deathtollscans.kt

@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide.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.foolslide.FoolSlideParser
-
-@MangaSourceParser("DEATHTOLLSCANS", "DeathTollScans", "en")
-internal class Deathtollscans(context: MangaLoaderContext) :
-	FoolSlideParser(context, MangaSource.DEATHTOLLSCANS, "reader.deathtollscans.net", 26)

src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/Mangatellers.kt

@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide.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.foolslide.FoolSlideParser
-
-@MangaSourceParser("MANGATELLERS", "Mangatellers", "en")
-internal class Mangatellers(context: MangaLoaderContext) :
-	FoolSlideParser(context, MangaSource.MANGATELLERS, "reader.mangatellers.gr") {
-	override val pagination = false
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/ReaderEvilflowers.kt

@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide.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.foolslide.FoolSlideParser
-
-@MangaSourceParser("READER_EVILFLOWERS", "Evil Flowers", "en")
-internal class ReaderEvilflowers(context: MangaLoaderContext) :
-	FoolSlideParser(context, MangaSource.READER_EVILFLOWERS, "reader.evilflowers.com")

src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/en/Seinagi.kt

@@ -1,44 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide.en
-
-import kotlinx.coroutines.coroutineScope
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.site.foolslide.FoolSlideParser
-import org.koitharu.kotatsu.parsers.util.*
-
-@MangaSourceParser("SEINAGI", "Seinagi", "en")
-internal class Seinagi(context: MangaLoaderContext) :
-	FoolSlideParser(context, MangaSource.SEINAGI, "reader.seinagi.org.es") {
-
-	override val pagination = false
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val testAdultPage = webClient.httpGet(fullUrl).parseHtml()
-		val doc = if (testAdultPage.selectFirst("div.info form") != null) {
-			webClient.httpPost(fullUrl, "adult=true").parseHtml()
-		} else {
-			testAdultPage
-		}
-		val chapters = getChapters(doc)
-		val desc = if (doc.selectFirstOrThrow(selectInfo).html().contains("Description")) {
-			doc.selectFirstOrThrow(selectInfo).text().substringAfter("Description: ").substringBefore("Readings")
-		} else {
-			doc.selectFirstOrThrow(selectInfo).text()
-		}
-		val author = if (doc.selectFirstOrThrow(selectInfo).html().contains("Author")) {
-			doc.selectFirstOrThrow(selectInfo).text().substringAfter("Author: ").substringBefore("Art")
-		} else {
-			null
-		}
-		manga.copy(
-			coverUrl = doc.selectFirst(".thumbnail img")?.src() ?: manga.coverUrl,
-			description = desc,
-			altTitle = null,
-			author = author,
-			state = null,
-			chapters = chapters,
-		)
-	}
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/es/MenudoFansub.kt

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide.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.foolslide.FoolSlideParser
-
-@MangaSourceParser("MENUDO_FANSUB", "Menudo Fansub", "es")
-internal class MenudoFansub(context: MangaLoaderContext) :
-	FoolSlideParser(context, MangaSource.MENUDO_FANSUB, "www.menudo-fansub.com", 25) {
-	override val searchUrl = "slide/search/"
-	override val listUrl = "slide/directory/"
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/es/Pzykosis666hFansub.kt

@@ -1,42 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide.es
-
-import kotlinx.coroutines.coroutineScope
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.site.foolslide.FoolSlideParser
-import org.koitharu.kotatsu.parsers.util.*
-
-@MangaSourceParser("PZYKOSIS666HFANSUB", "Pzykosis666h Fansub", "es", ContentType.HENTAI)
-internal class Pzykosis666hFansub(context: MangaLoaderContext) :
-	FoolSlideParser(context, MangaSource.PZYKOSIS666HFANSUB, "lector.pzykosis666hfansub.com") {
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val testAdultPage = webClient.httpGet(fullUrl).parseHtml()
-		val doc = if (testAdultPage.selectFirst("div.info form") != null) {
-			webClient.httpPost(fullUrl, "adult=true").parseHtml()
-		} else {
-			testAdultPage
-		}
-		val chapters = getChapters(doc)
-		val desc = if (doc.selectFirstOrThrow(selectInfo).html().contains("Descripción")) {
-			doc.selectFirstOrThrow(selectInfo).text().substringAfter("Descripción: ").substringBefore("Lecturas")
-		} else {
-			doc.selectFirstOrThrow(selectInfo).text()
-		}
-		val author = if (doc.selectFirstOrThrow(selectInfo).html().contains("Author")) {
-			doc.selectFirstOrThrow(selectInfo).text().substringAfter("Author: ").substringBefore("Art")
-		} else {
-			null
-		}
-		manga.copy(
-			coverUrl = doc.selectFirst(".thumbnail img")?.src() ?: manga.coverUrl,
-			description = desc,
-			altTitle = null,
-			author = author,
-			state = null,
-			chapters = chapters,
-		)
-	}
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/es/SeinagiAdulto.kt

@@ -1,48 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide.es
-
-import kotlinx.coroutines.coroutineScope
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.model.ContentType
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.site.foolslide.FoolSlideParser
-import org.koitharu.kotatsu.parsers.util.domain
-import org.koitharu.kotatsu.parsers.util.parseHtml
-import org.koitharu.kotatsu.parsers.util.selectFirstOrThrow
-import org.koitharu.kotatsu.parsers.util.src
-import org.koitharu.kotatsu.parsers.util.toAbsoluteUrl
-
-@MangaSourceParser("SEINAGIADULTO", "Seinagi Adulto", "es", ContentType.HENTAI)
-internal class SeinagiAdulto(context: MangaLoaderContext) :
-	FoolSlideParser(context, MangaSource.SEINAGIADULTO, "adulto.seinagi.org.es") {
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val testAdultPage = webClient.httpGet(fullUrl).parseHtml()
-		val doc = if (testAdultPage.selectFirst("div.info form") != null) {
-			webClient.httpPost(fullUrl, "adult=true").parseHtml()
-		} else {
-			testAdultPage
-		}
-		val chapters = getChapters(doc)
-		val desc = if (doc.selectFirstOrThrow(selectInfo).html().contains("Descripción")) {
-			doc.selectFirstOrThrow(selectInfo).text().substringAfter("Descripción: ").substringBefore("Lecturas")
-		} else {
-			doc.selectFirstOrThrow(selectInfo).text()
-		}
-		val author = if (doc.selectFirstOrThrow(selectInfo).html().contains("Author")) {
-			doc.selectFirstOrThrow(selectInfo).text().substringAfter("Author: ").substringBefore("Art")
-		} else {
-			null
-		}
-		manga.copy(
-			coverUrl = doc.selectFirst(".thumbnail img")?.src().orEmpty(),// for manga result on search
-			description = desc,
-			altTitle = null,
-			author = author,
-			state = null,
-			chapters = chapters,
-		)
-	}
-}

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

@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide.fr
-
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.site.foolslide.FoolSlideParser
-
-@MangaSourceParser("HNISCANTRAD", "Hni Scantrad", "fr")
-internal class HniScantrad(context: MangaLoaderContext) :
-	FoolSlideParser(context, MangaSource.HNISCANTRAD, "hni-scantrad.com") {
-	override val pagination = false
-	override val searchUrl = "lel/search/"
-	override val listUrl = "lel/directory/"
-}

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

@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide.it
-
-
-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.foolslide.FoolSlideParser
-
-
-@MangaSourceParser("POWERMANGA", "PowerManga", "it")
-internal class PowerManga(context: MangaLoaderContext) :
-	FoolSlideParser(context, MangaSource.POWERMANGA, "reader.powermanga.org") {
-	override val pagination = false
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/it/Ramareader.kt

@@ -1,15 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide.it
-
-
-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.foolslide.FoolSlideParser
-
-
-@MangaSourceParser("RAMAREADER", "RamaReader", "it")
-internal class Ramareader(context: MangaLoaderContext) :
-	FoolSlideParser(context, MangaSource.RAMAREADER, "www.ramareader.it") {
-	override val searchUrl = "read/search/"
-	override val listUrl = "read/directory/"
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/it/ReadNifteam.kt

@@ -1,15 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.foolslide.it
-
-
-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.foolslide.FoolSlideParser
-
-
-@MangaSourceParser("READNIFTEAM", "ReadNifTeam", "it")
-internal class ReadNifteam(context: MangaLoaderContext) :
-	FoolSlideParser(context, MangaSource.READNIFTEAM, "read-nifteam.info") {
-	override val searchUrl = "slide/search/"
-	override val listUrl = "slide/directory/"
-}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/FmTeam.kt

@@ -1,148 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.fr
-
-import kotlinx.coroutines.coroutineScope
-import org.json.JSONArray
-import org.json.JSONObject
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.PagedMangaParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.util.*
-import org.koitharu.kotatsu.parsers.util.json.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("FMTEAM", "FmTeam", "fr")
-internal class FmTeam(context: MangaLoaderContext) :
-	PagedMangaParser(context, MangaSource.FMTEAM, 0) {
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.ALPHABETICAL)
-	override val configKeyDomain = ConfigKey.Domain("fmteam.fr")
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		if (page > 1) {
-			return emptyList()
-		}
-		val jsonManga = if (!query.isNullOrEmpty()) {
-			//3 letters minimum
-			webClient.httpGet("https://$domain/api/search/${query.urlEncoded()}").parseJson().getJSONArray("comics")
-		} else {
-			webClient.httpGet("https://$domain/api/comics").parseJson().getJSONArray("comics")
-		}
-
-		val manga = ArrayList<Manga>(jsonManga.length())
-		for (i in 0 until jsonManga.length()) {
-			val j = jsonManga.getJSONObject(i)
-			val href = "/api" + j.getString("url")
-			when {
-				!tags.isNullOrEmpty() -> {
-					val a = j.getJSONArray("genres").toString()
-					var found = true
-					tags.forEach {
-						if (!a.contains(it.key, ignoreCase = true)) {
-							found = false
-						}
-					}
-					if (found) {
-						manga.add(
-							addManga(href, j),
-						)
-					}
-				}
-
-				else -> {
-					manga.add(
-						addManga(href, j),
-					)
-				}
-			}
-		}
-		return manga
-	}
-
-	private fun addManga(href: String, j: JSONObject): Manga {
-		return Manga(
-			id = generateUid(href),
-			url = href,
-			publicUrl = href.toAbsoluteUrl(domain),
-			coverUrl = j.getString("thumbnail"),
-			title = j.getString("title"),
-			description = j.getString("description"),
-			altTitle = j.getJSONArray("alt_titles").toString()
-				.replace("[\"", "")
-				.replace("\"]", "")
-				.replace("\",\"", " , "),
-			rating = j.getString("rating").toFloatOrNull()?.div(10f)
-				?: RATING_UNKNOWN,
-			tags = emptySet(),
-			author = j.getString("author"),
-			state = when (j.getString("status").lowercase()) {
-				"en cours" -> MangaState.ONGOING
-				"terminé" -> MangaState.FINISHED
-				else -> null
-			},
-			source = source,
-			isNsfw = when (j.getString("adult").toInt()) {
-				0 -> false
-				1 -> true
-				else -> true
-			},
-		)
-	}
-
-
-	override suspend fun getAvailableTags(): Set<MangaTag> = emptySet()
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val json = webClient.httpGet(fullUrl).parseJson().getJSONObject("comic")
-		val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
-		val chapters = JSONArray(json.getJSONArray("chapters").toJSONList().reversed())
-
-		manga.copy(
-			tags = json.getJSONArray("genres").toJSONList().mapNotNullToSet {
-				MangaTag(
-					key = it.getString("slug"),
-					title = it.getString("name"),
-					source = source,
-				)
-			},
-			chapters = chapters.mapJSONIndexed { i, j ->
-				val url = "/api" + j.getString("url").toRelativeUrl(domain)
-				val name = j.getString("full_title")
-				val date = j.getStringOrNull("updated_at")
-				MangaChapter(
-					id = generateUid(url),
-					name = name,
-					number = i + 1,
-					url = url,
-					scanlator = null,
-					uploadDate = dateFormat.tryParse(date),
-					branch = null,
-					source = source,
-				)
-			},
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val jsonPages = webClient.httpGet(fullUrl).parseJson().getJSONObject("chapter").getJSONArray("pages").toString()
-		val pages = jsonPages.replace("[", "").replace("]", "")
-			.replace("\\", "").split("\",\"").drop(1)
-		return pages.map { url ->
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,158 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.fr
-
-import kotlinx.coroutines.coroutineScope
-import okhttp3.Headers
-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.*
-import org.koitharu.kotatsu.parsers.network.UserAgents
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("FURYOSOCIETY", "FuryoSociety", "fr")
-internal class FuryoSociety(context: MangaLoaderContext) :
-	PagedMangaParser(context, MangaSource.FURYOSOCIETY, 0) {
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.ALPHABETICAL, SortOrder.UPDATED)
-
-	override val configKeyDomain = ConfigKey.Domain("furyosociety.com")
-
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_DESKTOP)
-		.build()
-
-	override suspend fun getFavicons(): Favicons {
-		return Favicons(
-			listOf(
-				Favicon("https://$domain/fs_favicon/favicon-32x32.png", 32, null),
-			),
-			domain,
-		)
-	}
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val url = buildString {
-			append("https://")
-			append(domain)
-			if (page == 1) {
-				if (sortOrder == SortOrder.ALPHABETICAL) {
-					append("/mangas")
-				}
-			} else {
-				return emptyList()
-			}
-		}
-
-		val doc = webClient.httpGet(url).parseHtml()
-		return doc.select("div.fs-card-container div.grid-item-container").ifEmpty {
-			doc.select("div.container-tight.latest table tr")
-		}.map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				url = href,
-				publicUrl = href.toAbsoluteUrl(div.host ?: domain),
-				coverUrl = div.selectFirst("img")?.src().orEmpty(),
-				title = (div.selectFirst("div.media-body") ?: div.selectFirst("a"))?.text().orEmpty(),
-				altTitle = null,
-				rating = RATING_UNKNOWN,
-				tags = emptySet(),
-				author = null,
-				state = null,
-				source = source,
-				isNsfw = false,
-			)
-		}
-	}
-
-
-	override suspend fun getAvailableTags(): Set<MangaTag> = emptySet()
-
-
-	override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
-		val fullUrl = manga.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		val chaptersDeferred = getChapters(doc)
-		manga.copy(
-			description = doc.selectFirstOrThrow("div.fs-comic-description").html(),
-			chapters = chaptersDeferred,
-			isNsfw = doc.selectFirst(".adult-text") != null,
-		)
-	}
-
-
-	private fun getChapters(doc: Document): List<MangaChapter> {
-		return doc.body().select("div.list.fs-chapter-list div.element").mapChapters(reversed = true) { i, div ->
-			val a = div.selectFirstOrThrow("div.title a")
-			val href = a.attrAsRelativeUrl("href")
-			val dateFormat = SimpleDateFormat("dd/MM/yyyy", sourceLocale)
-			val dateText = div.selectFirstOrThrow("div.meta_r").text().replace("Hier", "1 jour")
-			MangaChapter(
-				id = generateUid(href),
-				name = div.selectFirstOrThrow("div.title").text() + " : " + div.selectFirstOrThrow("div.name").text(),
-				number = i + 1,
-				url = href,
-				uploadDate = parseChapterDate(
-					dateFormat,
-					dateText,
-				),
-				source = source,
-				scanlator = null,
-				branch = null,
-			)
-		}
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		return doc.select("div.main-img img").map { url ->
-			val img = url.src()?.toRelativeUrl(domain) ?: url.parseFailed("Image src not found")
-			MangaPage(
-				id = generateUid(img),
-				url = img,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-
-	private fun parseChapterDate(dateFormat: DateFormat, date: String?): Long {
-		val d = date?.lowercase() ?: return 0
-		return when {
-			d.startsWith("il y a") || // Handle translated 'ago' in French.
-				d.endsWith(" an") || d.endsWith(" ans") ||
-				d.endsWith(" mois") ||
-				d.endsWith(" jour") || d.endsWith(" jours") ||
-				d.endsWith(" heure") || d.endsWith(" heures") ||
-				d.endsWith(" seconde") || d.endsWith(" secondes") ||
-				d.endsWith(" minute") || d.endsWith(" minutes") -> parseRelativeDate(date)
-
-			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("seconde", "secondes").anyWordIn(date) -> cal.apply { add(Calendar.SECOND, -number) }.timeInMillis
-			WordSet("minute", "minutes").anyWordIn(date) -> cal.apply { add(Calendar.MINUTE, -number) }.timeInMillis
-			WordSet("heure", "heures").anyWordIn(date) -> cal.apply { add(Calendar.HOUR, -number) }.timeInMillis
-			WordSet("jour", "jours").anyWordIn(date) -> cal.apply { add(Calendar.DAY_OF_MONTH, -number) }.timeInMillis
-			WordSet("mois").anyWordIn(date) -> cal.apply { add(Calendar.MONTH, -number) }.timeInMillis
-			WordSet("an", "ans").anyWordIn(date) -> cal.apply { add(Calendar.YEAR, -number) }.timeInMillis
-			else -> 0
-		}
-	}
-}

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

@@ -1,168 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.fr
-
-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 org.koitharu.kotatsu.parsers.util.json.mapJSON
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("LEGACY_SCANS", "LegacyScans", "fr")
-internal class LegacyScansParser(context: MangaLoaderContext) :
-	PagedMangaParser(context, MangaSource.LEGACY_SCANS, 18) {
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.POPULARITY,
-	)
-
-	override val configKeyDomain = ConfigKey.Domain("legacy-scans.com")
-
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_MOBILE)
-		.build()
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-
-		val end = page * pageSize
-		val start = end - (pageSize - 1)
-		val url = if (!query.isNullOrEmpty()) {
-			if (page > 1) {
-				return emptyList()
-			}
-			buildString {
-				append("https://api.$domain/misc/home/search?title=")
-				append(query.urlEncoded())
-			}
-		} else {
-			buildString {
-				append("https://api.$domain/misc/comic/search/query?status=&order=&genreNames=")
-				if (!tags.isNullOrEmpty()) {
-					for (tag in tags) {
-						append(tag.key)
-						append(',')
-					}
-				}
-				append("&type=&start=")
-				append(start)
-				append("&end=")
-				append(end)
-			}
-
-		}
-		val json = webClient.httpGet(url).parseJson()
-		return if (!query.isNullOrEmpty()) {
-			json.getJSONArray("results").mapJSON { j ->
-				val slug = j.getString("slug")
-				val urlManga = "https://$domain/comics/$slug"
-				Manga(
-					id = generateUid(urlManga),
-					title = j.getString("title"),
-					altTitle = null,
-					url = urlManga,
-					publicUrl = urlManga,
-					rating = RATING_UNKNOWN,
-					isNsfw = false,
-					coverUrl = "",
-					tags = setOf(),
-					state = null,
-					author = null,
-					source = source,
-				)
-			}
-		} else {
-			json.getJSONArray("comics").mapJSON { j ->
-				val slug = j.getString("slug")
-				val urlManga = "https://$domain/comics/$slug"
-				Manga(
-					id = generateUid(urlManga),
-					title = j.getString("title"),
-					altTitle = null,
-					url = urlManga,
-					publicUrl = urlManga,
-					rating = RATING_UNKNOWN,
-					isNsfw = false,
-					coverUrl = "https://api.$domain/" + j.getString("cover"),
-					tags = setOf(),
-					state = null,
-					author = null,
-					source = source,
-				)
-			}
-		}
-
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val root = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-		val dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.FRENCH)
-
-		return manga.copy(
-			altTitle = null,
-			tags = root.select("div.serieGenre span").mapNotNullToSet { span ->
-				MangaTag(
-					key = span.text(),
-					title = span.text(),
-					source = source,
-				)
-			},
-			coverUrl = root.selectFirstOrThrow("div.serieImg img").attr("src"),
-			author = root.select("div.serieAdd p:contains(Auteur:) strong").text(),
-			description = root.selectFirst("div.serieDescription div")?.html(),
-			chapters = root.select("div.chapterList a")
-				.mapChapters(reversed = true) { i, a ->
-					val href = a.attrAsRelativeUrl("href")
-					val name = a.selectFirstOrThrow("span").text()
-					val dateText = a.selectLast("span")?.text() ?: "0"
-					MangaChapter(
-						id = generateUid(href),
-						name = name,
-						number = i + 1,
-						url = href,
-						scanlator = null,
-						uploadDate = dateFormat.tryParse(dateText),
-						branch = null,
-						source = source,
-					)
-				},
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		return doc.select("div.readerComics img").map { img ->
-			val url = img.src() ?: img.parseFailed("Image src not found")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val doc = webClient.httpGet("https://$domain/comics").parseHtml()
-		val script = doc.requireElementById("__NUXT_DATA__").data()
-			.substringAfterLast("\"genres\"").substringBeforeLast("\"comics\"")
-			.split("\",\"").drop(1)
-
-		return script.mapNotNullToSet { tag ->
-			MangaTag(
-				key = tag.substringBeforeLast("\",{"),
-				title = tag.substringBeforeLast("\",{"),
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,146 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.fr
-
-import okhttp3.Headers
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.PagedMangaParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.network.UserAgents
-import org.koitharu.kotatsu.parsers.util.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("LIRESCAN", "LireScan", "fr")
-internal class LireScan(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.LIRESCAN, 20) {
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.UPDATED)
-
-	override val configKeyDomain = ConfigKey.Domain("lire-scan.me")
-
-	override val isMultipleTagsSupported = false
-
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_MOBILE)
-		.build()
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		val tag = tags.oneOrThrowIfMany()
-		val doc =
-			if (!query.isNullOrEmpty()) { // search only works with 4 or more letters
-				if (page > 1) {
-					return emptyList()
-				}
-				val q = query.urlEncoded().replace("%20", "+")
-				val post = "do=search&subaction=search&search_start=0&full_search=0&result_from=1&story=$q"
-				webClient.httpPost("https://$domain/index.php?do=search", post).parseHtml()
-			} else {
-				val url = buildString {
-					append("https://")
-					append(domain)
-					if (!tags.isNullOrEmpty()) {
-						append("/manga/")
-						append(tag?.key.orEmpty())
-					}
-					if (page > 1) {
-						append("/page/")
-						append(page)
-						append('/')
-					}
-				}
-				webClient.httpGet(url).parseHtml()
-			}
-
-		return doc.select("div.sect__content.grid-items div.item-poster").map { div ->
-			val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
-			Manga(
-				id = generateUid(href),
-				title = div.select(".item-poster__title").text(),
-				altTitle = null,
-				url = href,
-				publicUrl = href.toAbsoluteUrl(domain),
-				rating = div.selectFirstOrThrow(".item__rating").ownText().toFloatOrNull()?.div(10f) ?: RATING_UNKNOWN,
-				isNsfw = false,
-				coverUrl = div.selectFirstOrThrow("img").attrAsAbsoluteUrl("src"),
-				tags = setOf(),
-				state = null,
-				author = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val root = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
-		val dateFormat = SimpleDateFormat("dd-MM-yyyy", Locale.FRANCE)
-		return manga.copy(
-			altTitle = root.select("ul.pmovie__list li:contains(Nom Alternatif:)").text()
-				.replace("Nom Alternatif:", ""),
-			state = when (root.select("ul.pmovie__list li:contains(Status:)").text()) {
-				"Status: OnGoing", "Status: En cours" -> MangaState.ONGOING
-				"Status: Fini" -> MangaState.FINISHED
-				else -> null
-			},
-			tags = root.select("ul.pmovie__list li:contains(Genre:)").text()
-				.replace("Genre:", "").split(" / ").mapNotNullToSet { tag ->
-					MangaTag(
-						key = tag.lowercase(),
-						title = tag,
-						source = source,
-					)
-				},
-			author = root.select("ul.pmovie__list li:contains(Artist(s):)").text().replace("Artist(s):", ""),
-			description = root.selectFirst("div.pmovie__text")?.html(),
-			chapters = root.select("ul li div.chapter")
-				.mapChapters(reversed = true) { i, div ->
-					val a = div.selectFirstOrThrow("a")
-					val href = a.attrAsRelativeUrl("href")
-					val name = a.text()
-					val dateText = div.select("p").last()?.text()
-					MangaChapter(
-						id = generateUid(href),
-						name = name,
-						number = i,
-						url = href,
-						scanlator = null,
-						uploadDate = dateFormat.tryParse(dateText),
-						branch = null,
-						source = source,
-					)
-				},
-		)
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val doc = webClient.httpGet(fullUrl).parseHtml()
-		val pages = doc.selectFirstOrThrow("script:containsData(const manga = )").data()
-			.substringAfter("chapter1: [\"").substringBefore("\"]")
-			.split("\",\"")
-		return pages.map { img ->
-			MangaPage(
-				id = generateUid(img),
-				url = img,
-				preview = null,
-				source = source,
-			)
-		}
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> {
-		val doc = webClient.httpGet("https://$domain/").parseHtml()
-		return doc.select(".nav-menu li a").mapNotNullToSet { a ->
-			val key = a.attr("href").removeSuffix('/').substringAfterLast("manga/", "")
-			MangaTag(
-				key = key,
-				title = a.text(),
-				source = source,
-			)
-		}
-	}
-}

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

@@ -1,181 +0,0 @@
-package org.koitharu.kotatsu.parsers.site.fr
-
-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 org.koitharu.kotatsu.parsers.util.json.mapJSON
-import java.lang.IllegalArgumentException
-import java.text.SimpleDateFormat
-import java.util.*
-
-@MangaSourceParser("LUGNICASCANS", "LugnicaScans", "fr")
-internal class LugnicaScans(context: MangaLoaderContext) : PagedMangaParser(context, MangaSource.LUGNICASCANS, 10) {
-
-	override val availableSortOrders: Set<SortOrder> = EnumSet.of(
-		SortOrder.ALPHABETICAL,
-		SortOrder.UPDATED,
-	)
-
-	override val configKeyDomain = ConfigKey.Domain("lugnica-scans.com")
-
-	override val headers: Headers = Headers.Builder()
-		.add("User-Agent", UserAgents.CHROME_DESKTOP)
-		.build()
-
-	init {
-		context.cookieJar.insertCookies(
-			domain,
-			"reader_render=continue;",
-		)
-	}
-
-	override suspend fun getFavicons(): Favicons {
-		return Favicons(
-			listOf(
-				Favicon("https://$domain/favicon/favicon-32x32.png", 32, null),
-			),
-			domain,
-		)
-	}
-
-	override suspend fun getListPage(
-		page: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		if (!query.isNullOrEmpty()) {
-			throw IllegalArgumentException("Search is not supported by this source")
-		}
-		if (sortOrder == SortOrder.ALPHABETICAL) {
-			if (page > 1) {
-				return emptyList()
-			}
-			val url = buildString {
-				append("https://")
-				append(domain)
-				append("/api/get/catalog?page=0&filter=all")
-			}
-			val json = webClient.httpGet(url).parseJsonArray()
-			return json.mapJSON { j ->
-				val urlManga = "https://$domain/api/get/card/${j.getString("slug")}"
-				val img = "https://$domain/upload/min_cover/${j.getString("image")}"
-				Manga(
-					id = generateUid(urlManga),
-					title = j.getString("title"),
-					altTitle = null,
-					url = urlManga,
-					publicUrl = urlManga.toAbsoluteUrl(domain),
-					rating = j.getString("rate").toFloatOrNull()?.div(5f) ?: RATING_UNKNOWN,
-					isNsfw = false,
-					coverUrl = img,
-					tags = setOf(),
-					state = when (j.getString("status")) {
-						"0" -> MangaState.ONGOING
-						"1" -> MangaState.FINISHED
-						"3" -> MangaState.ABANDONED
-						else -> null
-					},
-					author = null,
-					source = source,
-				)
-			}
-		} else {
-			val url = buildString {
-				append("https://")
-				append(domain)
-				append("/api/get/homegrid/")
-				append(page)
-			}
-			val json = webClient.httpGet(url).parseJsonArray()
-			return json.mapJSON { j ->
-				val urlManga = "https://$domain/api/get/card/${j.getString("manga_slug")}"
-				val img = "https://$domain/upload/min_cover/${j.getString("manga_image")}"
-				Manga(
-					id = generateUid(urlManga),
-					title = j.getString("manga_title"),
-					altTitle = null,
-					url = urlManga,
-					publicUrl = urlManga.toAbsoluteUrl(domain),
-					rating = j.getString("manga_rate").toFloatOrNull()?.div(5f) ?: RATING_UNKNOWN,
-					isNsfw = false,
-					coverUrl = img,
-					tags = setOf(),
-					state = null,
-					author = null,
-					source = source,
-				)
-			}
-
-		}
-
-	}
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		val json = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseJson()
-		val jsonManga = json.getJSONObject("manga")
-		val chapters = json.getJSONObject("chapters").toString().split("{\"id\":").drop(1)
-		val slug = manga.url.substringAfterLast("/")
-		val dateFormat = SimpleDateFormat("dd-MM-yyyy", Locale.FRANCE)
-		return manga.copy(
-			altTitle = null,
-			state = when (jsonManga.getString("status")) {
-				"0" -> MangaState.ONGOING
-				"1" -> MangaState.FINISHED
-				"3" -> MangaState.ABANDONED
-				else -> null
-			},
-			author = jsonManga.getString("author"),
-			description = jsonManga.getString("description"),
-			chapters = chapters.mapChapters(reversed = true) { i, it ->
-				val id = it.substringAfter("\"chapter\":").substringBefore(",")
-				val url = "https://$domain/api/get/chapter/$slug/$id"
-				val date = getDateString(
-					it.substringAfter("\"date\":\"").substringBefore("\",").toLong(),
-				)
-				MangaChapter(
-					id = generateUid(url),
-					name = "Chapitre : $id",
-					number = i,
-					url = url,
-					scanlator = null,
-					uploadDate = dateFormat.tryParse(date),
-					branch = null,
-					source = source,
-				)
-			},
-		)
-	}
-
-	private val simpleDateFormat = SimpleDateFormat("dd-MM-yyyy", Locale.FRANCE)
-	private fun getDateString(time: Long): String = simpleDateFormat.format(time * 1000L)
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val fullUrl = chapter.url.toAbsoluteUrl(domain)
-		val jsonPage = webClient.httpGet(fullUrl).parseJson()
-		val idManga = jsonPage.getJSONObject("manga").getInt("id")
-		val slug = jsonPage.getJSONObject("chapter").getInt("chapter")
-		val jsonPages = jsonPage.getJSONObject("chapter").getJSONArray("files")
-		val pages = ArrayList<MangaPage>(jsonPages.length())
-		for (i in 0 until jsonPages.length()) {
-			val url = "https://$domain/upload/chapters/$idManga/$slug/${jsonPages.getString(i)}"
-			pages.add(
-				MangaPage(
-					id = generateUid(url),
-					url = url,
-					preview = null,
-					source = source,
-				),
-			)
-		}
-		return pages
-	}
-
-	override suspend fun getAvailableTags(): Set<MangaTag> = emptySet()
-
-}