Refactor extra source headers

Update Madara5Parser.kt

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: ⚠️Application issue
-    url: https://github.com/nv95/Kotatsu/issues/new/choose
+  - name: ⚠️ Application issue
+    url: https://github.com/KotatsuApp/Kotatsu/issues/new/choose
     about: Issues and requests about the app itself should be opened in the Kotatsu repository instead

.github/ISSUE_TEMPLATE/report_issue.yml

@@ -54,7 +54,7 @@ body:
       description: |
         You can find your Kotatsu version in **Settings → About**.
       placeholder: |
-        Example: "3.3"
+        Example: "3.3.1"
     validations:
       required: true
 
@@ -86,9 +86,9 @@ body:
           required: true
         - label: I have written a short but informative title.
           required: true
-        - label: I have updated the app to version **[3.3](https://github.com/nv95/Kotatsu/releases/latest)**.
+        - label: I have updated the app to version **[3.3.1](https://github.com/KotatsuApp/Kotatsu/releases/latest)**.
           required: true
-        - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/nv95/Kotatsu/issues/new/choose).
+        - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/KotatsuApp/Kotatsu/issues/new/choose).
           required: true
         - label: I will fill out all of the requested information in this form.
           required: true

.github/ISSUE_TEMPLATE/request_feature.yml

@@ -31,9 +31,9 @@ body:
           required: true
         - label: I have written a short but informative title.
           required: true
-        - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/nv95/Kotatsu/issues/new/choose).
+        - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/KotatsuApp/Kotatsu/issues/new/choose).
           required: true
-        - label: I have updated the app to version **[3.3](https://github.com/nv95/Kotatsu/releases/latest)**.
+        - label: I have updated the app to version **[3.3.1](https://github.com/KotatsuApp/Kotatsu/releases/latest)**.
           required: true
         - label: I will fill out all of the requested information in this form.
           required: true

.github/ISSUE_TEMPLATE/request_source.yml

@@ -47,9 +47,11 @@ body:
           required: true
         - label: I have written a title with source name.
           required: true
+        - label: I have updated the app to version **[3.3.1](https://github.com/KotatsuApp/Kotatsu/releases/latest)**.
+          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/nv95/kotatsu-parsers) and verified it does not appear in the code base.
+        - 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
         - label: I will fill out all of the requested information in this form.
           required: true

.github/workflows/test-parsers.yml

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

.idea/kotlinc.xml

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

.idea/runConfigurations/TestsAndReport.xml

@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="TestsAndReport" type="CompoundRunConfigurationType">
+    <toRun name="MangaParserTest" type="GradleRunConfiguration" />
+    <toRun name="kotatsu-parsers [generateTestsReport]" type="GradleRunConfiguration" />
+    <method v="2" />
+  </configuration>
+</component>

build.gradle

@@ -1,3 +1,5 @@
+import tasks.ReportGenerateTask
+
 plugins {
 	id 'java-library'
 	id 'org.jetbrains.kotlin.jvm'
@@ -51,9 +53,9 @@ afterEvaluate {
 }
 
 dependencies {
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3'
 	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
-	implementation 'com.squareup.okio:okio:3.1.0'
+	implementation 'com.squareup.okio:okio:3.2.0'
 	implementation 'org.jsoup:jsoup:1.15.1'
 	implementation 'org.json:json:20220320'
 	implementation 'androidx.collection:collection-ktx:1.2.0'
@@ -63,6 +65,8 @@ dependencies {
 	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
 	testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 	testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.2'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3'
 	testImplementation 'io.webfolder:quickjs:1.1.0'
-}
+}
+
+task generateTestsReport(type: ReportGenerateTask)

buildSrc/build.gradle

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

buildSrc/gradle/wrapper/gradle-wrapper.properties

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

buildSrc/gradlew

@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

buildSrc/gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

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

@@ -0,0 +1,68 @@
+package tasks
+
+import com.soywiz.korte.Template
+import kotlinx.coroutines.runBlocking
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.TaskAction
+import org.simpleframework.xml.Serializer
+import org.simpleframework.xml.core.Persister
+import tasks.model.TestCase
+import tasks.model.TestSuite
+import java.io.File
+import kotlin.math.roundToInt
+
+open class ReportGenerateTask : DefaultTask() {
+
+	@TaskAction
+	fun execute() {
+		val reportsRoot = File(project.rootDir, "build/test-results/test")
+		val outputRoot = File(project.rootDir, "build/test-results-html")
+		outputRoot.deleteRecursively()
+		outputRoot.mkdir()
+		for (file in checkNotNull(reportsRoot.listFiles()) {
+			"No files found in $reportsRoot"
+		}) {
+			if (file.isDirectory) {
+				continue
+			}
+			val report = makeReport(file)
+			val output = File(outputRoot, file.nameWithoutExtension + ".htm")
+			output.writeText(report)
+			println("Report generated: ${output.absolutePath}")
+		}
+	}
+
+	private fun makeReport(file: File): String {
+		val serializer: Serializer = Persister()
+		val testSuite = serializer.read(TestSuite::class.java, file)
+		val templateText = javaClass.classLoader.getResourceAsStream("report.html")?.use {
+			it.bufferedReader().readText()
+		}
+
+		val results = LinkedHashMap<String, LinkedHashMap<String, TestCase>>()
+		val tests = LinkedHashSet<String>()
+		for (case in testSuite.testCases) {
+			tests.add(case.testName)
+			val map = results.getOrPut(case.source) { LinkedHashMap() }
+			val oldValue = map.put(case.testName, case)
+			check(oldValue == null)
+		}
+
+		val failPercent = (testSuite.failures.toDouble() / testSuite.tests * 100.0).roundToInt()
+		val errorPercent = (testSuite.errors.toDouble() / testSuite.tests * 100.0).roundToInt()
+		return runBlocking {
+			val template = Template(requireNotNull(templateText))
+			template(
+				mapOf(
+					"testSuite" to testSuite,
+					"tests" to tests,
+					"results" to results,
+					"success_percent" to 100 - (failPercent + errorPercent),
+					"error_percent" to errorPercent,
+					"fail_percent" to failPercent,
+					"success" to testSuite.tests - (testSuite.failures + testSuite.errors),
+				),
+			)
+		}
+	}
+}

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

@@ -0,0 +1,24 @@
+package tasks.model
+
+import org.simpleframework.xml.Attribute
+import org.simpleframework.xml.Root
+import org.simpleframework.xml.Text
+
+@Root(name = "failure", strict = false)
+class Failure {
+	@JvmField
+	@field:Attribute(name = "message")
+	var message: String = ""
+
+	@JvmField
+	@field:Attribute(name = "type")
+	var type: String = ""
+
+	@JvmField
+	@field:Text
+	var text: String = ""
+
+	fun textHtml(): String {
+		return text.replace("\n", "<br>")
+	}
+}

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

@@ -0,0 +1,32 @@
+package tasks.model
+
+import org.simpleframework.xml.Attribute
+import org.simpleframework.xml.Element
+import org.simpleframework.xml.Root
+
+@Root(name = "testcase", strict = false)
+class TestCase {
+	@JvmField
+	@field:Attribute(name = "name")
+	var name: String = ""
+
+	@JvmField
+	@field:Attribute(name = "time")
+	var time: Float = 0f
+
+	@JvmField
+	@field:Element(name = "failure", required = false)
+	var failure: Failure? = null
+
+	val index by lazy {
+		name.split('|')[0].toInt()
+	}
+
+	val testName by lazy {
+		name.split('|')[1]
+	}
+
+	val source by lazy {
+		name.split('|')[2]
+	}
+}

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

@@ -0,0 +1,27 @@
+package tasks.model
+
+import org.simpleframework.xml.Attribute
+import org.simpleframework.xml.ElementList
+import org.simpleframework.xml.Root
+
+@Root(name = "testsuite", strict = false)
+class TestSuite {
+	@JvmField
+	@field:Attribute(name = "name")
+	var name: String = ""
+
+	@JvmField
+	@field:Attribute(name = "tests")
+	var tests: Int = 0
+
+	@JvmField
+	@field:Attribute(name = "failures")
+	var failures: Int = 0
+
+	@JvmField
+	@field:Attribute(name = "errors")
+	var errors: Int = 0
+
+	@field:ElementList(entry = "testcase", inline = true)
+	lateinit var testCases: List<TestCase>
+}

buildSrc/src/main/resources/report.html

@@ -0,0 +1,91 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<title>{{ testSuite.name }}</title>
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet"
+		  integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0-beta1/dist/js/bootstrap.bundle.min.js"
+			integrity="sha384-pprn3073KE6tl6bjs2QrFaJGz5/SUsLqktiwsUTF55Jfv3qYSDhgCecCxMW52nD2"
+			crossorigin="anonymous"></script>
+	<script src="https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js"></script>
+</head>
+<body class="py-4">
+<div class="container">
+	<h1 class="h2">{{ testSuite.name }}</h1>
+	<div class="progress mt-4">
+		<div class="progress-bar bg-success" role="progressbar" style="width: {{ success_percent }}%">
+			{{ success }} ({{ success_percent }}%)
+		</div>
+		<div class="progress-bar bg-danger" role="progressbar" style="width: {{ fail_percent }}%">
+			{{ testSuite.failures }} ({{ fail_percent }}%)
+		</div>
+		<div class="progress-bar bg-danger" role="progressbar" style="width: {{ error_percent }}%">
+			{{ testSuite.errors }} ({{ error_percent }}%)
+		</div>
+	</div>
+	<div class="table-responsive mt-4">
+		<table class="table table-hover">
+			<thead>
+			<tr>
+				<th scope="col">Source</th>
+				{% for test in tests %}
+				<th scope="col" style="min-width: 5em;">{{ test }}</th>
+				{% endfor %}
+			</tr>
+			</thead>
+			{% for name, cases in results %}
+			<tr>
+				<th scope="row">{{ name }}</th>
+				{% for test in tests %}
+				{% set case = cases[test] %}
+				{% if case.failure == null %}
+				<td class="table-success text-center">
+					<i data-feather="check"></i>
+				</td>
+				{% else %}
+					{% if case.failure.type == 'java.lang.AssertionError' %}
+					<td class="table-warning text-center" style="cursor: pointer;"
+						data-bs-toggle="modal" data-bs-target="#failure_{{ case.hashCode }}">
+						<i data-feather="alert-triangle"></i>
+					</td>
+					{% else %}
+					<td class="table-danger text-center" style="cursor: pointer;"
+						data-bs-toggle="modal" data-bs-target="#failure_{{ case.hashCode }}">
+						<i data-feather="x"></i>
+					</td>
+					{% endif %}
+				<!--suppress HtmlUnknownTag -->
+				<div class="modal fade" id="failure_{{ case.hashCode }}" tabindex="-1">
+					<div class="modal-dialog modal-lg modal-dialog-scrollable">
+						<div class="modal-content">
+							<div class="modal-header">
+								<h5 class="modal-title">{{ case.testName }} failed</h5>
+								<button type="button" class="btn-close" data-bs-dismiss="modal"
+										aria-label="Close"></button>
+							</div>
+							<div class="modal-body font-monospace lh-sm bg-light" style="font-size: 0.7em;">
+								{{ case.failure.textHtml()|raw }}
+							</div>
+							<div class="modal-footer">
+								<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+							</div>
+						</div>
+					</div>
+				</div>
+				{% endif %}
+				{% endfor %}
+			</tr>
+			{% endfor %}
+		</table>
+	</div>
+</div>
+<script>
+	feather.replace()
+
+
+
+</script>
+</body>
+</html>

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

@@ -142,7 +142,10 @@ abstract class MangaLoaderContext {
 
 	private fun Response.ensureSuccess() = apply {
 		val exception: Exception? = when (code) { // Catch some error codes, not all
-			in 500..599 -> HttpStatusException(message, code, request.url.toString())
+			404,
+			in 500..599,
+			-> HttpStatusException(message, code, request.url.toString())
+
 			else -> null
 		}
 		if (exception != null) {

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

@@ -1,9 +1,12 @@
 package org.koitharu.kotatsu.parsers
 
 import androidx.annotation.CallSuper
+import androidx.annotation.VisibleForTesting
+import okhttp3.Headers
 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.FaviconParser
 import org.koitharu.kotatsu.parsers.util.toAbsoluteUrl
 import java.util.*
 
@@ -20,6 +23,9 @@ abstract class MangaParser @InternalParsersApi constructor(val source: MangaSour
 
 	val config by lazy { context.getConfig(source) }
 
+	val sourceLocale: Locale?
+		get() = source.locale?.let { Locale(it) }
+
 	/**
 	 * Provide default domain and available alternatives, if any.
 	 *
@@ -27,6 +33,9 @@ abstract class MangaParser @InternalParsersApi constructor(val source: MangaSour
 	 */
 	protected abstract val configKeyDomain: ConfigKey.Domain
 
+	@VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
+	internal open val headers: Headers? = null
+
 	/**
 	 * Used as fallback if value of `sortOrder` passed to [getList] is null
 	 */
@@ -102,8 +111,16 @@ abstract class MangaParser @InternalParsersApi constructor(val source: MangaSour
 	/**
 	 * Returns direct link to the website favicon
 	 */
+	@Deprecated(
+		message = "Use parseFavicons() to get multiple favicons with different size",
+		replaceWith = ReplaceWith("parseFavicons()"),
+	)
 	open fun getFaviconUrl() = "https://${getDomain()}/favicon.ico"
 
+	open suspend fun parseFavicons(): Favicons {
+		return FaviconParser(context, getDomain(), headers).parseFavicons()
+	}
+
 	@CallSuper
 	open fun onCreateConfig(keys: MutableCollection<ConfigKey<*>>) {
 		keys.add(configKeyDomain)
@@ -160,4 +177,13 @@ abstract class MangaParser @InternalParsersApi constructor(val source: MangaSour
 	protected fun parseFailed(message: String? = null): Nothing {
 		throw ParseException(message, null)
 	}
+
+	@InternalParsersApi
+	protected fun Set<MangaTag>?.oneOrThrowIfMany(): MangaTag? {
+		return when {
+			isNullOrEmpty() -> null
+			size == 1 -> first()
+			else -> throw IllegalArgumentException("Multiple genres are not supported by this source")
+		}
+	}
 }

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

@@ -0,0 +1,51 @@
+package org.koitharu.kotatsu.parsers.model
+
+import okhttp3.HttpUrl.Companion.toHttpUrl
+
+class Favicon internal constructor(
+	val url: String,
+	val size: Int,
+	internal val rel: String?,
+) : Comparable<Favicon> {
+
+	val type: String = url.toHttpUrl().pathSegments.last()
+		.substringAfterLast('.', "").lowercase()
+
+	override fun compareTo(other: Favicon): Int {
+		val res = size.compareTo(other.size)
+		if (res != 0) {
+			return res
+		}
+		return relWeightOf(rel).compareTo(relWeightOf(other.rel))
+	}
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as Favicon
+
+		if (url != other.url) return false
+		if (size != other.size) return false
+		if (rel != other.rel) return false
+
+		return true
+	}
+
+	override fun hashCode(): Int {
+		var result = url.hashCode()
+		result = 31 * result + size
+		result = 31 * result + rel.hashCode()
+		return result
+	}
+
+	override fun toString(): String {
+		return "Favicon(size=$size, type='$type', rel='$rel', url='$url')"
+	}
+
+	private fun relWeightOf(rel: String?) = when (rel) {
+		"apple-touch-icon" -> 1 // Prefer apple-touch-icon because it has a better quality
+		"mask-icon" -> -1
+		else -> 0
+	}
+}

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

@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.parsers.model
+
+class Favicons internal constructor(
+	favicons: Collection<Favicon>,
+	val referer: String,
+) : Collection<Favicon> {
+
+	private val icons = favicons.sortedDescending()
+
+	override val size: Int
+		get() = icons.size
+
+	override fun contains(element: Favicon): Boolean = icons.contains(element)
+
+	override fun containsAll(elements: Collection<Favicon>): Boolean = icons.containsAll(elements)
+
+	override fun isEmpty(): Boolean = icons.isEmpty()
+
+	override fun iterator(): Iterator<Favicon> = icons.iterator()
+
+	/**
+	 * 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
+	 * @param size in pixels
+	 * @param types supported file types, e.g. png, svg, ico. May be null but not empty
+	 */
+	@JvmOverloads
+	fun find(size: Int, types: Set<String>? = null): Favicon? {
+		if (icons.isEmpty()) {
+			return null
+		}
+		var result: Favicon? = null
+		for (icon in icons) {
+			if (types != null && icon.type !in types) {
+				continue
+			}
+			if (result == null || icon.size >= size) {
+				result = icon
+			} else {
+				break
+			}
+		}
+		return result
+	}
+}

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

@@ -74,7 +74,7 @@ class Manga(
 	 * @see rating
 	 */
 	val hasRating: Boolean
-		get() = rating in 0f..1f
+		get() = rating > 0f && rating <= 1f
 
 	fun getChapters(branch: String?): List<MangaChapter>? {
 		return chapters?.filter { x -> x.branch == branch }

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

@@ -54,6 +54,7 @@ internal class BatoToParser(override val context: MangaLoaderContext) : MangaPar
 			when (sortOrder) {
 				SortOrder.UPDATED,
 				-> append("update.za")
+
 				SortOrder.POPULARITY -> append("views_a.za")
 				SortOrder.NEWEST -> append("create.za")
 				SortOrder.ALPHABETICAL -> append("title.az")
@@ -93,7 +94,7 @@ internal class BatoToParser(override val context: MangaLoaderContext) : MangaPar
 				?.selectFirst(".main")
 				?.children()
 				?.reversed()
-				?.mapIndexedNotNull { i, div ->
+				?.mapChapters { i, div ->
 					div.parseChapter(i)
 				}.orEmpty(),
 		)

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

@@ -158,7 +158,7 @@ internal class ExHentaiParser(
 				a.text().toIntOrNull() != null
 			}?.let { a ->
 				val count = a.text().toInt()
-				val chapters = ArrayList<MangaChapter>(count)
+				val chapters = ChaptersListBuilder(count)
 				for (i in 1..count) {
 					val url = "${manga.url}?p=${i - 1}"
 					chapters += MangaChapter(
@@ -172,7 +172,7 @@ internal class ExHentaiParser(
 						branch = null,
 					)
 				}
-				chapters
+				chapters.toList()
 			},
 		)
 	}

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

@@ -29,13 +29,14 @@ class MangaInUaParser(override val context: MangaLoaderContext) : MangaParser(Ma
 		val searchPage = (offset / 10f).toIntUp().inc()
 		val url = when {
 			!query.isNullOrEmpty() -> (
-				"/index.php?do=search" +
-					"&subaction=search" +
-					"&search_start=$searchPage" +
-					"&full_search=1" +
-					"&story=$query" +
-					"&titleonly=3"
-				).toAbsoluteUrl(getDomain())
+					"/index.php?do=search" +
+							"&subaction=search" +
+							"&search_start=$searchPage" +
+							"&full_search=1" +
+							"&story=$query" +
+							"&titleonly=3"
+					).toAbsoluteUrl(getDomain())
+
 			tags.isNullOrEmpty() -> "/mangas/page/$page".toAbsoluteUrl(getDomain())
 			tags.size == 1 -> "${tags.first().key}/page/$page"
 			tags.size > 1 -> throw IllegalArgumentException("This source supports only 1 genre")
@@ -90,16 +91,16 @@ class MangaInUaParser(override val context: MangaLoaderContext) : MangaParser(Ma
 			description = root.selectFirst("div.item__full-description")?.text(),
 			largeCoverUrl = root.selectFirst("div.item__full-sidebar--poster")?.selectFirst("img")
 				?.attrAsAbsoluteUrlOrNull("src"),
-			chapters = chapterNodes.mapNotNull { item ->
+			chapters = chapterNodes.mapChapters { _, item ->
 				val href = item?.selectFirst("a")?.attrAsRelativeUrlOrNull("href")
-					?: return@mapNotNull null
+					?: return@mapChapters null
 				val isAlternative = item.styleValueOrNull("background") != null
 				val name = item.selectFirst("a")?.text().orEmpty()
 				if (!isAlternative) i++
 				MangaChapter(
 					id = generateUid(href),
 					name = if (isAlternative) {
-						prevChapterName ?: return@mapNotNull null
+						prevChapterName ?: return@mapChapters null
 					} else {
 						prevChapterName = name
 						name

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

@@ -38,12 +38,14 @@ internal class MangaOwlParser(override val context: MangaLoaderContext) : MangaP
 					append("/search/$page?search=")
 					append(query.urlEncoded())
 				}
+
 				!tags.isNullOrEmpty() -> {
 					for (tag in tags) {
 						append(tag.key)
 					}
 					append("/$page?type=${getAlternativeSortKey(sortOrder)}")
 				}
+
 				else -> {
 					append("/${getSortKey(sortOrder)}/$page")
 				}
@@ -110,7 +112,7 @@ internal class MangaOwlParser(override val context: MangaLoaderContext) : MangaP
 			state = parseStatus(info.select("p.fexi_header_para:contains(status)").first()?.ownText()),
 			tags = manga.tags + parsedTags,
 			chapters = table.select("div.table.table-chapter-list").select("li.list-group-item.chapter_list")
-				.asReversed().mapIndexed { i, li ->
+				.asReversed().mapChapters { i, li ->
 					val a = li.select("a")
 					val href = a.attr("data-href").ifEmpty {
 						parseFailed("Link is missing")

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

@@ -45,6 +45,7 @@ internal class MangaTownParser(override val context: MangaLoaderContext) : Manga
 				}
 				"/search?name=${query.urlEncoded()}".toAbsoluteUrl(getDomain())
 			}
+
 			tags.isNullOrEmpty() -> "/directory/$page.htm$sortKey".toAbsoluteUrl(getDomain())
 			tags.size == 1 -> "/directory/${tags.first().key}/$page.htm$sortKey".toAbsoluteUrl(getDomain())
 			else -> tags.joinToString(
@@ -112,9 +113,9 @@ internal class MangaTownParser(override val context: MangaLoaderContext) : Manga
 				)
 			}.orEmpty(),
 			description = info?.getElementById("show")?.ownText(),
-			chapters = chaptersList?.mapIndexedNotNull { i, li ->
+			chapters = chaptersList?.mapChapters { i, li ->
 				val href = li.selectFirst("a")?.attrAsRelativeUrlOrNull("href")
-					?: return@mapIndexedNotNull null
+					?: return@mapChapters null
 				val name = li.select("span")
 					.filter { x -> x.className().isEmpty() }
 					.joinToString(" - ") { it.text() }.trim()

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

@@ -47,7 +47,9 @@ class NicovideoSeigaParser(override val context: MangaLoaderContext) :
 		val url = when {
 			!query.isNullOrEmpty() -> return if (offset == 0) getSearchList(query, page) else emptyList()
 			tags.isNullOrEmpty() -> "https://$domain/manga/list?page=$page&sort=${getSortKey(sortOrder)}"
-			tags.size == 1 -> "https://$domain/manga/list?category=${tags.first().key}&page=$page&sort=${getSortKey(sortOrder)}"
+			tags.size == 1 -> "https://$domain/manga/list?category=${tags.first().key}&page=$page" +
+					"&sort=${getSortKey(sortOrder)}"
+
 			tags.size > 1 -> throw IllegalArgumentException("This source supports only 1 category")
 			else -> "https://$domain/manga/list?page=$page&sort=${getSortKey(sortOrder)}"
 		}
@@ -55,7 +57,8 @@ class NicovideoSeigaParser(override val context: MangaLoaderContext) :
 		val comicList = doc.body().select("#comic_list > ul > li") ?: parseFailed("Container not found")
 		val items = comicList.select("div > .description > div > div")
 		return items.mapNotNull { item ->
-			val href = item.selectFirst(".comic_icon > div > a")?.attrAsRelativeUrlOrNull("href") ?: return@mapNotNull null
+			val href =
+				item.selectFirst(".comic_icon > div > a")?.attrAsRelativeUrlOrNull("href") ?: return@mapNotNull null
 			val statusText = item.selectFirst(".mg_description_header > .mg_icon > .content_status > span")?.text()
 			Manga(
 				id = generateUid(href),
@@ -92,15 +95,17 @@ class NicovideoSeigaParser(override val context: MangaLoaderContext) :
 			.text()
 		return manga.copy(
 			description = contents.selectFirst("div.mg_work_detail > div > div.row > div.description_text")?.html(),
-			largeCoverUrl = contents.selectFirst("div.primaries > div.main_visual > a > img")?.attrAsAbsoluteUrlOrNull("src"),
+			largeCoverUrl = contents.selectFirst("div.primaries > div.main_visual > a > img")
+				?.attrAsAbsoluteUrlOrNull("src"),
 			state = when (statusText) {
 				STATUS_ONGOING -> MangaState.ONGOING
 				STATUS_FINISHED -> MangaState.FINISHED
 				else -> null
 			},
 			isNsfw = contents.select(".icon_adult").isNotEmpty(),
-			chapters = contents.select("#episode_list > ul > li").mapIndexedNotNull { i, li ->
-				val href = li.selectFirst("div > div.description > div.title > a")?.attrAsRelativeUrl("href") ?: parseFailed()
+			chapters = contents.select("#episode_list > ul > li").mapChapters { i, li ->
+				val href = li.selectFirst("div > div.description > div.title > a")
+					?.attrAsRelativeUrl("href") ?: parseFailed()
 				MangaChapter(
 					id = generateUid(href),
 					name = li.select("div > div.description > div.title > a").text(),
@@ -151,7 +156,8 @@ class NicovideoSeigaParser(override val context: MangaLoaderContext) :
 		val doc = context.httpGet("https://$domain/manga/search/?q=$query&page=$page&sort=score").parseHtml()
 		val root = doc.body().select(".search_result__item")
 		return root.mapNotNull { item ->
-			val href = item.selectFirst(".search_result__item__thumbnail > a")?.attrAsRelativeUrl("href") ?: parseFailed()
+			val href = item.selectFirst(".search_result__item__thumbnail > a")
+				?.attrAsRelativeUrl("href") ?: parseFailed()
 			Manga(
 				id = generateUid(href),
 				url = href,

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

@@ -26,7 +26,7 @@ internal abstract class NineMangaParser(
 		context.cookieJar.insertCookies(getDomain(), "ninemanga_template_desk=yes")
 	}
 
-	private val headers = Headers.Builder()
+	override val headers = Headers.Builder()
 		.add("Accept-Language", "en-US;q=0.7,en;q=0.3")
 		.build()
 
@@ -50,6 +50,7 @@ internal abstract class NineMangaParser(
 					append(query.urlEncoded())
 					append("&page=")
 				}
+
 				!tags.isNullOrEmpty() -> {
 					append("/search/?category_id=")
 					for (tag in tags) {
@@ -58,6 +59,7 @@ internal abstract class NineMangaParser(
 					}
 					append("&page=")
 				}
+
 				else -> {
 					append("/category/index_")
 				}
@@ -115,7 +117,7 @@ internal abstract class NineMangaParser(
 			description = infoRoot.getElementsByAttributeValue("itemprop", "description").first()
 				?.html()?.substringAfter("</b>"),
 			chapters = root.selectFirst("div.chapterbox")?.select("ul.sub_vol_ul > li")
-				?.asReversed()?.mapIndexed { i, li ->
+				?.asReversed()?.mapChapters { i, li ->
 					val a = li.selectFirst("a.chapter_list_a")
 					val href = a?.attrAsRelativeUrlOrNull("href")
 						?.replace("%20", " ") ?: parseFailed("Link not found")

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

@@ -141,7 +141,7 @@ internal class RemangaParser(
 					source = MangaSource.REMANGA,
 				)
 			},
-			chapters = chapters.mapIndexed { i, jo ->
+			chapters = chapters.mapChapters { i, jo ->
 				val id = jo.getLong("id")
 				val name = jo.getString("name").toTitleCase(Locale.ROOT)
 				val publishers = jo.optJSONArray("publishers")

src/main/kotlin/org/koitharu/kotatsu/parsers/site/grouple/GroupleParser.kt

@@ -1,10 +1,12 @@
-package org.koitharu.kotatsu.parsers.site
+package org.koitharu.kotatsu.parsers.site.grouple
 
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Response
 import org.json.JSONArray
 import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
+import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.util.*
 import org.koitharu.kotatsu.parsers.util.json.mapJSON
@@ -16,9 +18,13 @@ private const val PAGE_SIZE_SEARCH = 50
 private const val NSFW_ALERT = "сексуальные сцены"
 private const val NOTHING_FOUND = "Ничего не найдено"
 
-internal abstract class GroupleParser(source: MangaSource, userAgent: String) : MangaParser(source) {
+internal abstract class GroupleParser(
+	source: MangaSource,
+	userAgent: String,
+	private val siteId: Int,
+) : MangaParser(source), MangaParserAuthProvider {
 
-	private val headers = Headers.Builder()
+	override val headers = Headers.Builder()
 		.add("User-Agent", userAgent)
 		.build()
 
@@ -29,6 +35,15 @@ internal abstract class GroupleParser(source: MangaSource, userAgent: String) :
 		SortOrder.RATING,
 	)
 
+	override val authUrl: String
+		get() {
+			val targetUri = "https://${getDomain()}/".urlEncoded()
+			return "https://grouple.co/internal/auth/sso?siteId=$siteId&=targetUri=$targetUri"
+		}
+
+	override val isAuthorized: Boolean
+		get() = context.cookieJar.getCookies(getDomain()).any { it.name == "gwt" }
+
 	override suspend fun getList(
 		offset: Int,
 		query: String?,
@@ -45,18 +60,21 @@ internal abstract class GroupleParser(source: MangaSource, userAgent: String) :
 				),
 				headers,
 			)
+
 			tags.isNullOrEmpty() -> context.httpGet(
 				"https://$domain/list?sortType=${
-				getSortKey(sortOrder)
+					getSortKey(sortOrder)
 				}&offset=${offset upBy PAGE_SIZE}",
 				headers,
 			)
+
 			tags.size == 1 -> context.httpGet(
 				"https://$domain/list/genre/${tags.first().key}?sortType=${
-				getSortKey(sortOrder)
+					getSortKey(sortOrder)
 				}&offset=${offset upBy PAGE_SIZE}",
 				headers,
 			)
+
 			offset > 0 -> return emptyList()
 			else -> advancedSearch(domain, tags)
 		}.parseHtml().body()
@@ -113,6 +131,7 @@ internal abstract class GroupleParser(source: MangaSource, userAgent: String) :
 				state = when {
 					node.selectFirst("div.tags")
 						?.selectFirst("span.mangaCompleted") != null -> MangaState.FINISHED
+
 					else -> null
 				},
 				source = source,
@@ -139,10 +158,11 @@ internal abstract class GroupleParser(source: MangaSource, userAgent: String) :
 						source = source,
 					)
 				},
+			author = root.selectFirst("a.person-link")?.text() ?: manga.author,
 			isNsfw = root.select(".alert-warning").any { it.ownText().contains(NSFW_ALERT) },
 			chapters = root.selectFirst("div.chapters-link")?.selectFirst("table")
-				?.select("tr:has(td > a)")?.asReversed()?.mapIndexedNotNull { i, tr ->
-					val a = tr.selectFirst("a") ?: return@mapIndexedNotNull null
+				?.select("tr:has(td > a)")?.asReversed()?.mapChapters { i, tr ->
+					val a = tr.selectFirst("a") ?: return@mapChapters null
 					val href = a.attrAsRelativeUrl("href")
 					var translators = ""
 					val translatorElement = a.attr("title")
@@ -229,6 +249,15 @@ internal abstract class GroupleParser(source: MangaSource, userAgent: String) :
 		}
 	}
 
+	override suspend fun getUsername(): String {
+		val root = context.httpGet("https://grouple.co/").parseHtml().body()
+		val element = root.selectFirst("img.user-avatar") ?: throw AuthRequiredException(source)
+		val res = element.parent()?.text()
+		return if (res.isNullOrEmpty()) {
+			parseFailed("Cannot find username")
+		} else res
+	}
+
 	private fun getSortKey(sortOrder: SortOrder) =
 		when (sortOrder) {
 			SortOrder.ALPHABETICAL -> "name"

src/main/kotlin/org/koitharu/kotatsu/parsers/site/grouple/MintMangaParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site
+package org.koitharu.kotatsu.parsers.site.grouple
 
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaSourceParser
@@ -8,10 +8,14 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 @MangaSourceParser("MINTMANGA", "MintManga", "ru")
 internal class MintMangaParser(
 	override val context: MangaLoaderContext,
-) : GroupleParser(MangaSource.MINTMANGA, "mintmangafun") {
+) : GroupleParser(MangaSource.MINTMANGA, "mintmangafun", 2) {
 
 	override val configKeyDomain = ConfigKey.Domain(
 		"mintmanga.live",
 		arrayOf("mintmanga.live", "mintmanga.com"),
 	)
+
+	override fun getFaviconUrl(): String {
+		return "https://resmm.rmr.rocks/static/apple-touch-icon-8fff291039c140493adb0c7ba81065ad.png"
+	}
 }

src/main/kotlin/org/koitharu/kotatsu/parsers/site/grouple/ReadmangaParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site
+package org.koitharu.kotatsu.parsers.site.grouple
 
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaSourceParser
@@ -8,10 +8,14 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 @MangaSourceParser("READMANGA_RU", "ReadManga", "ru")
 internal class ReadmangaParser(
 	override val context: MangaLoaderContext,
-) : GroupleParser(MangaSource.READMANGA_RU, "readmangafun") {
+) : GroupleParser(MangaSource.READMANGA_RU, "readmangafun", 1) {
 
 	override val configKeyDomain = ConfigKey.Domain(
 		"readmanga.io",
 		arrayOf("readmanga.io", "readmanga.live", "readmanga.me"),
 	)
+
+	override fun getFaviconUrl(): String {
+		return "https://resrm.rmr.rocks/static/apple-touch-icon-3162037c9df9f28dca0f9a4092cb0f65.png"
+	}
 }

src/main/kotlin/org/koitharu/kotatsu/parsers/site/grouple/SelfMangaParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site
+package org.koitharu.kotatsu.parsers.site.grouple
 
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaSourceParser
@@ -8,7 +8,11 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 @MangaSourceParser("SELFMANGA", "SelfManga", "ru")
 internal class SelfMangaParser(
 	override val context: MangaLoaderContext,
-) : GroupleParser(MangaSource.SELFMANGA, "selfmangafun") {
+) : GroupleParser(MangaSource.SELFMANGA, "selfmangafun", 3) {
 
 	override val configKeyDomain = ConfigKey.Domain("selfmanga.live", null)
+
+	override fun getFaviconUrl(): String {
+		return "https://ressm.rmr.rocks/static/apple-touch-icon-a769ea533d811b73ac3eedde658bb1d3.png"
+	}
 }

src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/Madara5Parser.kt

@@ -0,0 +1,184 @@
+package org.koitharu.kotatsu.parsers.site.madara
+
+import androidx.collection.arraySetOf
+import org.jsoup.nodes.Element
+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.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.util.*
+import java.text.SimpleDateFormat
+import java.util.*
+
+abstract class Madara5Parser @InternalParsersApi constructor(
+	override val context: MangaLoaderContext,
+	source: MangaSource,
+	domain: String,
+) : MangaParser(source) {
+
+	protected open val pageSize = 22
+	protected open val tagPrefix = "/mangas/"
+	protected open val nsfwTags = arraySetOf("yaoi", "yuri", "mature")
+
+	override val sortOrders: Set<SortOrder> = EnumSet.of(SortOrder.UPDATED)
+
+	override val configKeyDomain = ConfigKey.Domain(domain, null)
+
+	@InternalParsersApi
+	override suspend fun getList(offset: Int, query: String?, tags: Set<MangaTag>?, sortOrder: SortOrder): List<Manga> {
+		val page = (offset / pageSize.toFloat()).toIntUp()
+		val domain = getDomain()
+		val url = buildString {
+			append("https://")
+			append(domain)
+			append("/search?s=")
+			if (!query.isNullOrEmpty()) {
+				append(query.urlEncoded())
+			}
+			append("&post_type=wp-manga")
+			if (!tags.isNullOrEmpty()) {
+				for (tag in tags) {
+					append("&genre%5B%5D=")
+					append(tag.key)
+				}
+			}
+			append("&op=1&author=&artist=&page=")
+			append(page)
+		}
+		val root = context.httpGet(url).parseHtml().body().selectFirstOrThrow(".search-wrap")
+		return root.select(".c-tabs-item__content").map { div ->
+			val a = div.selectFirstOrThrow("a")
+			val img = div.selectLastOrThrow("img")
+			val href = a.attrAsRelativeUrl("href")
+			val postContent = root.selectFirstOrThrow(".post-content")
+			val tagSet = postContent.getElementsContainingOwnText("Genre")
+				.firstOrNull()?.tableValue()
+				?.getElementsByAttributeValueContaining("href", tagPrefix)
+				?.mapToSet { it.asMangaTag() }.orEmpty()
+			Manga(
+				id = generateUid(href),
+				title = a.attr("title"),
+				altTitle = postContent.getElementsContainingOwnText("Alternative")
+					.firstOrNull()?.tableValue()?.text()?.trim(),
+				url = href,
+				publicUrl = a.attrAsAbsoluteUrl("href"),
+				coverUrl = img.src().orEmpty(),
+				author = postContent.getElementsContainingOwnText("Author")
+					.firstOrNull()?.tableValue()?.text()?.trim(),
+				state = postContent.getElementsContainingOwnText("Status")
+					.firstOrNull()?.tableValue()?.text()?.asMangaState(),
+				isNsfw = isNsfw(tagSet),
+				rating = div.selectFirstOrThrow(".score").text()
+					.toFloatOrNull()?.div(5f) ?: RATING_UNKNOWN,
+				tags = tagSet,
+				source = source,
+			)
+		}
+	}
+
+	override suspend fun getDetails(manga: Manga): Manga {
+		val root = context.httpGet(manga.url.toAbsoluteUrl(getDomain())).parseHtml().body()
+			.selectFirstOrThrow(".site-content")
+		val postContent = root.selectFirstOrThrow(".post-content")
+		val tags = postContent.getElementsContainingOwnText("Genre")
+			.firstOrNull()?.tableValue()
+			?.getElementsByAttributeValueContaining("href", tagPrefix)
+			?.mapToSet { a -> a.asMangaTag() } ?: manga.tags
+		val mangaId = root.getElementById("manga-chapters-holder")?.attr("data-id")?.toLongOrNull()
+			?: parseFailed("Cannot find mangaId")
+		return manga.copy(
+			description = (root.selectFirst(".detail-content")
+				?: root.selectFirstOrThrow(".description-summary")).html(),
+			author = postContent.getElementsContainingOwnText("Author")
+				.firstOrNull()?.tableValue()?.text()?.trim(),
+			state = postContent.getElementsContainingOwnText("Status")
+				.firstOrNull()?.tableValue()?.text()?.asMangaState(),
+			tags = tags,
+			isNsfw = isNsfw(tags),
+			chapters = loadChapters(mangaId),
+		)
+	}
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		val fullUrl = chapter.url.toAbsoluteUrl(getDomain())
+		val doc = context.httpGet(fullUrl).parseHtml()
+		val arrayData = doc.getElementById("arraydata") ?: parseFailed("#arraydata not found")
+		return arrayData.html().split(',').map { url ->
+			MangaPage(
+				id = generateUid(url),
+				url = url,
+				referer = fullUrl,
+				preview = null,
+				source = source,
+			)
+		}
+	}
+
+	override suspend fun getTags(): Set<MangaTag> {
+		val doc = context.httpGet("http://${getDomain()}/").parseHtml().body()
+		return doc.getElementsByAttributeValueContaining("href", tagPrefix)
+			.mapToSet { it.asMangaTag() }
+	}
+
+	private suspend fun loadChapters(mangaId: Long): List<MangaChapter> {
+		val dateFormat = SimpleDateFormat("MMMM dd, HH:mm", sourceLocale ?: Locale.US)
+		val doc = context.httpGet("https://${getDomain()}/ajax-list-chapter?mangaID=$mangaId").parseHtml()
+		return doc.select("li.wp-manga-chapter").asReversed().mapChapters { i, li ->
+			val a = li.selectFirstOrThrow("a")
+			val href = a.attrAsRelativeUrl("href")
+			MangaChapter(
+				id = generateUid(href),
+				url = href,
+				name = a.text(),
+				number = i + 1,
+				branch = null,
+				uploadDate = dateFormat.tryParse(
+					li.selectFirst(".chapter-release-date")?.text()?.trim(),
+				),
+				scanlator = null,
+				source = source,
+			)
+		}
+	}
+
+	protected fun isNsfw(tags: Set<MangaTag>): Boolean {
+		return tags.any { it.key in nsfwTags }
+	}
+
+	private fun Element.src(): String? {
+		return absUrl("data-src").ifEmpty {
+			absUrl("src")
+		}.takeUnless { it.isEmpty() }
+	}
+
+	private fun Element.tableValue(): Element {
+		for (p in parents()) {
+			val children = p.children()
+			if (children.size == 2) {
+				return children[1]
+			}
+		}
+		parseFailed("Cannot find tableValue for node ${text()}")
+	}
+
+	private fun String.asMangaState() = when (trim().lowercase(sourceLocale ?: Locale.US)) {
+		"ongoing" -> MangaState.ONGOING
+		"completed" -> MangaState.FINISHED
+		else -> null
+	}
+
+	private fun Element.asMangaTag() = MangaTag(
+		title = ownText(),
+		key = attr("href").removeSuffix('/').substringAfterLast('/')
+			.replace('-', '+'),
+		source = source,
+	)
+
+	@MangaSourceParser("MANGAOWLS", "BeautyManga", "en")
+	class BeautyManga(context: MangaLoaderContext) : Madara5Parser(context, MangaSource.MANGAOWLS, "beautymanga.com") {
+
+		override fun getFaviconUrl() = "http://${getDomain()}/frontend/images/favico.png"
+	}
+}

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

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site
+package org.koitharu.kotatsu.parsers.site.madara
 
 import org.jsoup.nodes.Element
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
@@ -36,11 +36,7 @@ internal abstract class MadaraParser(
 		tags: Set<MangaTag>?,
 		sortOrder: SortOrder,
 	): List<Manga> {
-		val tag = when {
-			tags.isNullOrEmpty() -> null
-			tags.size == 1 -> tags.first()
-			else -> throw IllegalArgumentException("Multiple genres are not supported by this source")
-		}
+		val tag = tags.oneOrThrowIfMany()
 		val payload = createRequestTemplate()
 		payload["page"] = (offset / PAGE_SIZE.toFloat()).toIntUp().toString()
 		payload["vars[meta_key]"] = when (sortOrder) {
@@ -108,7 +104,9 @@ internal abstract class MadaraParser(
 			}
 			MangaTag(
 				key = href,
-				title = a.ownText().trim().toTitleCase(),
+				title = a.ownText().trim().ifEmpty {
+					a.selectFirst(".menu-image-title")?.text()?.trim() ?: return@mapNotNullToSet null
+				}.toTitleCase(),
 				source = source,
 			)
 		}
@@ -139,7 +137,7 @@ internal abstract class MadaraParser(
 				?.select("p")
 				?.filterNot { it.ownText().startsWith("A brief description") }
 				?.joinToString { it.html() },
-			chapters = root2.select("li").asReversed().mapIndexed { i, li ->
+			chapters = root2.select("li").asReversed().mapChapters { i, li ->
 				val a = li.selectFirst("a")
 				val href = a?.attrAsRelativeUrlOrNull("href") ?: parseFailed("Link is missing")
 				MangaChapter(
@@ -202,6 +200,7 @@ internal abstract class MadaraParser(
 					set(Calendar.MILLISECOND, 0)
 				}.timeInMillis
 			}
+
 			date.startsWith("today", ignoreCase = true) -> {
 				Calendar.getInstance().apply {
 					set(Calendar.HOUR_OF_DAY, 0)
@@ -210,6 +209,7 @@ internal abstract class MadaraParser(
 					set(Calendar.MILLISECOND, 0)
 				}.timeInMillis
 			}
+
 			date.contains(Regex("""\d(st|nd|rd|th)""")) -> {
 				// Clean date (e.g. 5th December 2019 to 5 December 2019) before parsing it
 				date.split(" ").map {
@@ -221,6 +221,7 @@ internal abstract class MadaraParser(
 				}
 					.let { dateFormat.tryParse(it.joinToString(" ")) }
 			}
+
 			else -> dateFormat.tryParse(date)
 		}
 	}
@@ -240,24 +241,28 @@ internal abstract class MadaraParser(
 				"dia",
 				"day",
 			).anyWordIn(date) -> cal.apply { add(Calendar.DAY_OF_MONTH, -number) }.timeInMillis
+
 			WordSet("jam", "saat", "heure", "hora", "hour").anyWordIn(date) -> cal.apply {
 				add(
 					Calendar.HOUR,
 					-number,
 				)
 			}.timeInMillis
+
 			WordSet("menit", "dakika", "min", "minute", "minuto").anyWordIn(date) -> cal.apply {
 				add(
 					Calendar.MINUTE,
 					-number,
 				)
 			}.timeInMillis
+
 			WordSet("detik", "segundo", "second").anyWordIn(date) -> cal.apply {
 				add(
 					Calendar.SECOND,
 					-number,
 				)
 			}.timeInMillis
+
 			WordSet("month").anyWordIn(date) -> cal.apply { add(Calendar.MONTH, -number) }.timeInMillis
 			WordSet("year").anyWordIn(date) -> cal.apply { add(Calendar.YEAR, -number) }.timeInMillis
 			else -> 0
@@ -272,12 +277,12 @@ internal abstract class MadaraParser(
 
 	private fun createRequestTemplate() =
 		(
-			"action=madara_load_more&page=1&template=madara-core%2Fcontent%2Fcontent-search&vars%5Bs%5D=&vars%5B" +
-				"orderby%5D=meta_value_num&vars%5Bpaged%5D=1&vars%5Btemplate%5D=search&vars%5Bmeta_query" +
-				"%5D%5B0%5D%5Brelation%5D=AND&vars%5Bmeta_query%5D%5Brelation%5D=OR&vars%5Bpost_type" +
-				"%5D=wp-manga&vars%5Bpost_status%5D=publish&vars%5Bmeta_key%5D=_latest_update&vars%5Border" +
-				"%5D=desc&vars%5Bmanga_archives_item_layout%5D=default"
-			).split('&')
+				"action=madara_load_more&page=1&template=madara-core%2Fcontent%2Fcontent-search&vars%5Bs%5D=&vars%5B" +
+						"orderby%5D=meta_value_num&vars%5Bpaged%5D=1&vars%5Btemplate%5D=search&vars%5Bmeta_query" +
+						"%5D%5B0%5D%5Brelation%5D=AND&vars%5Bmeta_query%5D%5Brelation%5D=OR&vars%5Bpost_type" +
+						"%5D=wp-manga&vars%5Bpost_status%5D=publish&vars%5Bmeta_key%5D=_latest_update&vars%5Border" +
+						"%5D=desc&vars%5Bmanga_archives_item_layout%5D=default"
+				).split('&')
 			.map {
 				val pos = it.indexOf('=')
 				it.substring(0, pos) to it.substring(pos + 1)
@@ -291,6 +296,24 @@ internal abstract class MadaraParser(
 	@MangaSourceParser("MANGAWEEBS", "MangaWeebs", "en")
 	class MangaWeebs(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGAWEEBS, "mangaweebs.in")
 
+	@MangaSourceParser("KINGMANGA", "KingManga", "en")
+	class KingManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.KINGMANGA, "king-manga.com") {
+
+		override fun getFaviconUrl(): String {
+			return "https://${getDomain()}/wp-content/uploads/2022/05/cropped-logo-king-02-03-32x32.png"
+		}
+	}
+
+	@MangaSourceParser("MANGAHATACHI", "MangahaTachi", "ja")
+	class MangahaTachi(context: MangaLoaderContext) :
+		MadaraParser(context, MangaSource.MANGAHATACHI, "mangahatachi.com")
+
+	@MangaSourceParser("PIANMANGA", "PianManga", "en")
+	class PianManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.PIANMANGA, "pianmanga.com")
+
+	@MangaSourceParser("MANGAROSIE", "MangaRosie", "en")
+	class MangaRosie(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGAROSIE, "mangarosie.me")
+
 	@MangaSourceParser("READMANWHA", "ReadManwha", "en")
 	class ReadManwha(context: MangaLoaderContext) : MadaraParser(context, MangaSource.READMANWHA, "readmanwha.net")
 
@@ -311,12 +334,29 @@ internal abstract class MadaraParser(
 	@MangaSourceParser("MANGATX_OT", "MangaTx (ot)", "en")
 	class MangaTxOt(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGATX_OT, "manga-tx.com")
 
+	@MangaSourceParser("MANGALEK", "MangaLek", "ar")
+	class MangaLek(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGALEK, "mangalek.com") {
+
+		override fun getFaviconUrl(): String {
+			return "https://${getDomain()}/wp-content/logo192.png"
+		}
+	}
+
+	@MangaSourceParser("HARIMANGA", "HariManga", "en")
+	class HariManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.HARIMANGA, "harimanga.com")
+
+	@MangaSourceParser("KISSMANGA", "KissManga", "en")
+	class KissManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.KISSMANGA, "kissmanga.in")
+
 	@MangaSourceParser("MANGAROCK", "MangaRock", "en")
 	class MangaRock(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGAROCK, "mangarockteam.com")
 
 	@MangaSourceParser("ISEKAISCAN_EU", "IsekaiScan (eu)", "en")
 	class IsekaiScanEu(context: MangaLoaderContext) : MadaraParser(context, MangaSource.ISEKAISCAN_EU, "isekaiscan.eu")
 
+	@MangaSourceParser("FREEMANGA", "FreeManga", "en")
+	class FreeManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.FREEMANGA, "freemanga.me")
+
 	@MangaSourceParser("ISEKAISCAN", "IsekaiScan", "en")
 	class IsekaiScan(context: MangaLoaderContext) : MadaraParser(context, MangaSource.ISEKAISCAN, "isekaiscan.com") {
 
@@ -328,6 +368,18 @@ internal abstract class MadaraParser(
 	@MangaSourceParser("MANGA_KOMI", "MangaKomi", "en")
 	class MangaKomi(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGA_KOMI, "mangakomi.io")
 
+	@MangaSourceParser("READMANHWA", "ReadManhwa", "en")
+	class ReadManhwa(context: MangaLoaderContext) : MadaraParser(context, MangaSource.READMANHWA, "readmanhwa.info")
+
+	@MangaSourceParser("NEATMANGA", "NeatManga", "en")
+	class NeatManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.NEATMANGA, "neatmanga.com")
+
+	@MangaSourceParser("MANGAKIK", "MangaKik", "en")
+	class MangaKik(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGAKIK, "mangakik.net")
+
+	@MangaSourceParser("MANHWACLAN", "ManhwaClan", "en")
+	class ManhwaClan(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHWACLAN, "manhwaclan.com")
+
 	@MangaSourceParser("MANGA_3S", "Manga3s", "en")
 	class Manga3s(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGA_3S, "manga3s.com")
 
@@ -346,6 +398,15 @@ internal abstract class MadaraParser(
 	@MangaSourceParser("X2MANGA", "X2Manga", "en")
 	class X2Manga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.X2MANGA, "x2manga.com")
 
+	@MangaSourceParser("VINLOAD", "VinLoad", "en")
+	class VinLoad(context: MangaLoaderContext) : MadaraParser(context, MangaSource.VINLOAD, "vinload.com")
+
+	@MangaSourceParser("S2MANGA", "S2Manga", "en")
+	class S2Manga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.S2MANGA, "s2manga.com")
+
+	@MangaSourceParser("MANHWA", "Manhwa", "en")
+	class Manhwa(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHWA, "manhwa.pics")
+
 	@MangaSourceParser("SKY_MANGA", "Sky Manga", "en")
 	class SkyManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.SKY_MANGA, "skymanga.xyz") {
 
@@ -408,6 +469,18 @@ internal abstract class MadaraParser(
 		}
 	}
 
+	@MangaSourceParser("CAT_300", "Cat300", "th")
+	class Cat300(context: MangaLoaderContext) : MadaraParser(context, MangaSource.CAT_300, "cat300.com") {
+
+		override val isNsfwSource = true
+	}
+
+	@MangaSourceParser("BIBIMANGA", "BibiManga", "en")
+	class BibiManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.BIBIMANGA, "bibimanga.com") {
+
+		override val isNsfwSource = true
+	}
+
 	@MangaSourceParser("MANHWA_CHILL", "Manhwa Chill", "en")
 	class ManhwaChill(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANHWA_CHILL, "manhwachill.me")
 
@@ -452,4 +525,4 @@ internal abstract class MadaraParser(
 
 	@MangaSourceParser("ZINMANGA", "ZINMANGA", "en")
 	class Zinmanga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.ZINMANGA, "zinmanga.com")
-}
+}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/multichan/ChanParser.kt

@@ -1,13 +1,15 @@
-package org.koitharu.kotatsu.parsers.site
+package org.koitharu.kotatsu.parsers.site.multichan
 
 import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
+import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.exception.ParseException
 import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.util.*
 import java.text.SimpleDateFormat
 import java.util.*
 
-internal abstract class ChanParser(source: MangaSource) : MangaParser(source) {
+internal abstract class ChanParser(source: MangaSource) : MangaParser(source), MangaParserAuthProvider {
 
 	override val sortOrders: Set<SortOrder> = EnumSet.of(
 		SortOrder.NEWEST,
@@ -15,6 +17,12 @@ internal abstract class ChanParser(source: MangaSource) : MangaParser(source) {
 		SortOrder.ALPHABETICAL,
 	)
 
+	override val authUrl: String
+		get() = "https://${getDomain()}"
+
+	override val isAuthorized: Boolean
+		get() = context.cookieJar.getCookies(getDomain()).any { it.name == "dle_user_id" }
+
 	override suspend fun getList(
 		offset: Int,
 		query: String?,
@@ -29,11 +37,13 @@ internal abstract class ChanParser(source: MangaSource) : MangaParser(source) {
 				}
 				"https://$domain/?do=search&subaction=search&story=${query.urlEncoded()}"
 			}
+
 			!tags.isNullOrEmpty() -> tags.joinToString(
 				prefix = "https://$domain/tags/",
 				postfix = "&n=${getSortKey2(sortOrder)}?offset=$offset",
 				separator = "+",
 			) { tag -> tag.key }
+
 			else -> "https://$domain/${getSortKey(sortOrder)}?offset=$offset"
 		}
 		val doc = context.httpGet(url).parseHtml()
@@ -80,9 +90,9 @@ internal abstract class ChanParser(source: MangaSource) : MangaParser(source) {
 		return manga.copy(
 			description = root.getElementById("description")?.html()?.substringBeforeLast("<div"),
 			largeCoverUrl = root.getElementById("cover")?.absUrl("src"),
-			chapters = root.select("table.table_cha tr:gt(1)").reversed().mapIndexedNotNull { i, tr ->
+			chapters = root.select("table.table_cha tr:gt(1)").reversed().mapChapters { i, tr ->
 				val href = tr?.selectFirst("a")?.attrAsRelativeUrlOrNull("href")
-					?: return@mapIndexedNotNull null
+					?: return@mapChapters null
 				MangaChapter(
 					id = generateUid(href),
 					name = tr.selectFirst("a")?.text().orEmpty(),
@@ -143,6 +153,14 @@ internal abstract class ChanParser(source: MangaSource) : MangaParser(source) {
 		}
 	}
 
+	override suspend fun getUsername(): String {
+		val doc = context.httpGet("https://${getDomain()}").parseHtml().body()
+		val root = doc.requireElementById("top_user")
+		val a = root.getElementsByAttributeValueContaining("href", "/user/").firstOrNull()
+			?: throw AuthRequiredException(source)
+		return a.attr("href").removeSuffix('/').substringAfterLast('/')
+	}
+
 	private fun getSortKey(sortOrder: SortOrder) =
 		when (sortOrder) {
 			SortOrder.ALPHABETICAL -> "catalog"

src/main/kotlin/org/koitharu/kotatsu/parsers/site/multichan/HenChanParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site
+package org.koitharu.kotatsu.parsers.site.multichan
 
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaSourceParser
@@ -14,8 +14,8 @@ import org.koitharu.kotatsu.parsers.util.toTitleCase
 internal class HenChanParser(override val context: MangaLoaderContext) : ChanParser(MangaSource.HENCHAN) {
 
 	override val configKeyDomain = ConfigKey.Domain(
-		"xxx.hentaichan.live",
-		arrayOf("xxx.hentaichan.live", "xx.hentaichan.live", "hentaichan.live", "hentaichan.pro"),
+		"y.hentaichan.live",
+		arrayOf("y.hentaichan.live", "xxx.hentaichan.live", "xx.hentaichan.live", "hentaichan.live", "hentaichan.pro"),
 	)
 
 	override suspend fun getList(
@@ -34,8 +34,7 @@ internal class HenChanParser(override val context: MangaLoaderContext) : ChanPar
 
 	override suspend fun getDetails(manga: Manga): Manga {
 		val doc = context.httpGet(manga.url.toAbsoluteUrl(getDomain())).parseHtml()
-		val root =
-			doc.body().getElementById("dle-content") ?: throw ParseException("Cannot find root")
+		val root = doc.body().getElementById("dle-content") ?: throw ParseException("Cannot find root")
 		val readLink = manga.url.replace("manga", "online")
 		return manga.copy(
 			description = root.getElementById("description")?.html()?.substringBeforeLast("<div"),

src/main/kotlin/org/koitharu/kotatsu/parsers/site/multichan/MangaChanParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site
+package org.koitharu.kotatsu.parsers.site.multichan
 
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaSourceParser

src/main/kotlin/org/koitharu/kotatsu/parsers/site/multichan/YaoiChanParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site
+package org.koitharu.kotatsu.parsers.site.multichan
 
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaSourceParser
@@ -8,6 +8,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.attrAsRelativeUrl
+import org.koitharu.kotatsu.parsers.util.mapChapters
 import org.koitharu.kotatsu.parsers.util.parseHtml
 import org.koitharu.kotatsu.parsers.util.toAbsoluteUrl
 
@@ -25,7 +26,7 @@ internal class YaoiChanParser(override val context: MangaLoaderContext) : ChanPa
 			largeCoverUrl = root.getElementById("cover")?.absUrl("src"),
 			chapters = root.select("table.table_cha").flatMap { table ->
 				table.select("div.manga")
-			}.mapNotNull { it.selectFirst("a") }.reversed().mapIndexed { i, a ->
+			}.mapNotNull { it.selectFirst("a") }.reversed().mapChapters { i, a ->
 				val href = a.attrAsRelativeUrl("href")
 				MangaChapter(
 					id = generateUid(href),

src/main/kotlin/org/koitharu/kotatsu/parsers/site/rulib/HentaiLibParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site
+package org.koitharu.kotatsu.parsers.site.rulib
 
 import org.jsoup.nodes.Document
 import org.koitharu.kotatsu.parsers.MangaLoaderContext

src/main/kotlin/org/koitharu/kotatsu/parsers/site/rulib/MangaLibParser.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.site
+package org.koitharu.kotatsu.parsers.site.rulib
 
 import androidx.collection.ArraySet
 import org.json.JSONArray
@@ -92,7 +92,7 @@ internal open class MangaLibParser(
 		val chaptersDoc = context.httpGet("$fullUrl?section=chapters").parseHtml()
 		val scripts = chaptersDoc.select("script")
 		val dateFormat = SimpleDateFormat("yyy-MM-dd", Locale.US)
-		var chapters: ArrayList<MangaChapter>? = null
+		var chapters: ChaptersListBuilder? = null
 		scripts@ for (script in scripts) {
 			val raw = script.html().lines()
 			for (line in raw) {
@@ -100,7 +100,7 @@ internal open class MangaLibParser(
 					val json = JSONObject(line.substringAfter('=').substringBeforeLast(';'))
 					val list = json.getJSONObject("chapters").getJSONArray("list")
 					val total = list.length()
-					chapters = ArrayList(total)
+					chapters = ChaptersListBuilder(total)
 					for (i in 0 until total) {
 						val item = list.getJSONObject(i)
 						val chapterId = item.getLong("chapter_id")
@@ -111,7 +111,6 @@ internal open class MangaLibParser(
 							append(item.getInt("chapter_volume"))
 							append("/c")
 							append(item.getString("chapter_number"))
-							@Suppress("BlockingMethodInNonBlockingContext") // lint issue
 							append('/')
 							append(item.optString("chapter_string"))
 						}
@@ -160,7 +159,7 @@ internal open class MangaLibParser(
 				} ?: manga.tags,
 			isNsfw = isNsfw(doc),
 			description = info?.selectFirst("div.media-description__text")?.html(),
-			chapters = chapters,
+			chapters = chapters?.toList(),
 		)
 	}
 

src/main/kotlin/org/koitharu/kotatsu/parsers/site/rulib/YaoiLibParser.kt

@@ -0,0 +1,14 @@
+package org.koitharu.kotatsu.parsers.site.rulib
+
+import org.jsoup.nodes.Document
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaSourceParser
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.MangaSource
+
+@MangaSourceParser("YAOILIB", "YaoiLib", "ru")
+internal class YaoiLibParser(context: MangaLoaderContext) : MangaLibParser(context, MangaSource.YAOILIB) {
+
+	override val configKeyDomain = ConfigKey.Domain("yaoilib.me", null)
+	override fun isNsfw(doc: Document) = true
+}

src/main/kotlin/org/koitharu/kotatsu/parsers/util/Chapters.kt

@@ -0,0 +1,42 @@
+package org.koitharu.kotatsu.parsers.util
+
+import org.koitharu.kotatsu.parsers.InternalParsersApi
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+
+@InternalParsersApi
+inline fun <T> Iterable<T>.mapChapters(transform: (index: Int, T) -> MangaChapter?): List<MangaChapter> {
+	val builder = ChaptersListBuilder(collectionSize())
+	var index = 0
+	for (item in this) {
+		if (builder.add(transform(index, item))) {
+			index++
+		}
+	}
+	return builder.toList()
+}
+
+@PublishedApi
+internal fun <T> Iterable<T>.collectionSize(): Int {
+	return if (this is Collection<*>) this.size else 10
+}
+
+@PublishedApi
+internal class ChaptersListBuilder(initialSize: Int) {
+
+	private val ids = HashSet<Long>(initialSize)
+	private val list = ArrayList<MangaChapter>(initialSize)
+
+	fun add(chapter: MangaChapter?): Boolean {
+		return chapter != null && ids.add(chapter.id) && list.add(chapter)
+	}
+
+	operator fun plusAssign(chapter: MangaChapter?) {
+		add(chapter)
+	}
+
+	fun reverse() {
+		list.reverse()
+	}
+
+	fun toList(): List<MangaChapter> = list
+}

src/main/kotlin/org/koitharu/kotatsu/parsers/util/FaviconParser.kt

@@ -0,0 +1,94 @@
+package org.koitharu.kotatsu.parsers.util
+
+import okhttp3.Headers
+import org.jsoup.nodes.Element
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.model.Favicon
+import org.koitharu.kotatsu.parsers.model.Favicons
+import org.koitharu.kotatsu.parsers.util.json.mapJSON
+
+class FaviconParser(
+	private val context: MangaLoaderContext,
+	private val domain: String,
+	private val headers: Headers?,
+) {
+
+	suspend fun parseFavicons(): Favicons {
+		val url = "https://$domain"
+		val doc = context.httpGet(url, headers).parseHtml()
+		val result = HashSet<Favicon>()
+		val manifestLink = doc.getElementsByAttributeValue("rel", "manifest").firstOrNull()
+			?.attrAsAbsoluteUrlOrNull("href")
+		if (manifestLink != null) {
+			result += parseManifest(manifestLink)
+		}
+		val links = doc.getElementsByAttributeValueContaining("rel", "icon")
+		links.mapNotNullTo(result) { link ->
+			parseLink(link)
+		}
+		if (result.isEmpty()) {
+			result.add(createFallback())
+		}
+		return Favicons(result, url)
+	}
+
+	private fun parseLink(link: Element): Favicon? {
+		val href = link.attrAsAbsoluteUrlOrNull("href")
+		if (href == null || href.endsWith('/')) {
+			return null
+		}
+		val sizes = link.attr("sizes")
+		return Favicon(
+			url = href,
+			size = parseSize(sizes),
+			rel = link.attrOrNull("rel"),
+		)
+	}
+
+	private fun parseSize(sizes: String): Int {
+		if (sizes.isEmpty() || sizes == "any") {
+			return 0
+		}
+		return sizes.substringBefore(' ')
+			.split('x', 'X', '*')
+			.firstNotNullOfOrNull { it.toIntOrNull() }
+			?: 0
+	}
+
+	private suspend fun parseManifest(url: String): List<Favicon> {
+		val json = context.httpGet(url, headers).parseJson()
+		val icons = json.getJSONArray("icons")
+		return icons.mapJSON { jo ->
+			Favicon(
+				url = jo.getString("src").resolveLink(),
+				size = parseSize(jo.getString("sizes")),
+				rel = null,
+			)
+		}
+	}
+
+	private fun createFallback(): Favicon {
+		val href = "https://$domain/favicon.ico"
+		return Favicon(
+			url = href,
+			size = 0,
+			rel = null,
+		)
+	}
+
+	private fun String.resolveLink(): String {
+		return when {
+			startsWith("http:") || startsWith("https:") -> {
+				this
+			}
+
+			startsWith('/') -> {
+				"https://$domain$this"
+			}
+
+			else -> {
+				"https://$domain/$this"
+			}
+		}
+	}
+}

src/main/kotlin/org/koitharu/kotatsu/parsers/util/Jsoup.kt

@@ -100,4 +100,8 @@ fun Element.requireElementById(id: String): Element {
 
 fun Element.selectLast(cssQuery: String): Element? {
 	return select(cssQuery).lastOrNull()
+}
+
+fun Element.selectLastOrThrow(cssQuery: String): Element {
+	return selectLast(cssQuery) ?: throw ParseException("Cannot find \"$cssQuery\"")
 }

src/test/kotlin/org/koitharu/kotatsu/parsers/CloudFlareInterceptor.kt

@@ -17,7 +17,7 @@ class CloudFlareInterceptor : Interceptor {
 		if (response.code == HTTP_FORBIDDEN || response.code == HTTP_UNAVAILABLE) {
 			if (response.header(HEADER_SERVER)?.startsWith(SERVER_CLOUDFLARE) == true) {
 				response.closeQuietly()
-				throw CloudFlareProtectedException(chain.request().url.toString())
+				throw CloudFlareProtectedException(response.request.url.toString())
 			}
 		}
 		return response

src/test/kotlin/org/koitharu/kotatsu/parsers/MangaLoaderContextMock.kt

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.parsers
 
 import com.koushikdutta.quack.QuackContext
+import okhttp3.Headers
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -45,10 +46,13 @@ internal class MangaLoaderContextMock : MangaLoaderContext() {
 		return SourceConfigMock()
 	}
 
-	suspend fun doRequest(url: String, referer: String? = null): Response {
+	suspend fun doRequest(url: String, referer: String? = null, extraHeaders: Headers? = null): Response {
 		val request = Request.Builder()
 			.get()
 			.url(url)
+		if (extraHeaders != null) {
+			request.headers(extraHeaders)
+		}
 		if (referer != null) {
 			request.header("Referer", referer)
 		}

src/test/kotlin/org/koitharu/kotatsu/parsers/MangaParserTest.kt

@@ -15,12 +15,13 @@ import org.koitharu.kotatsu.test_util.isDistinctBy
 import org.koitharu.kotatsu.test_util.isUrlAbsolute
 import org.koitharu.kotatsu.test_util.maxDuplicates
 
+
 @ExtendWith(AuthCheckExtension::class)
 internal class MangaParserTest {
 
 	private val context = MangaLoaderContextMock()
 
-	@ParameterizedTest
+	@ParameterizedTest(name = "{index}|list|{0}")
 	@MangaSources
 	fun list(source: MangaSource) = runTest {
 		val parser = source.newParser(context)
@@ -29,7 +30,7 @@ internal class MangaParserTest {
 		assert(list.all { it.source == source })
 	}
 
-	@ParameterizedTest
+	@ParameterizedTest(name = "{index}|search|{0}")
 	@MangaSources
 	fun search(source: MangaSource) = runTest {
 		val parser = source.newParser(context)
@@ -46,7 +47,7 @@ internal class MangaParserTest {
 		assert(list.all { it.source == source })
 	}
 
-	@ParameterizedTest
+	@ParameterizedTest(name = "{index}|tags|{0}")
 	@MangaSources
 	fun tags(source: MangaSource) = runTest {
 		val parser = source.newParser(context)
@@ -66,7 +67,7 @@ internal class MangaParserTest {
 		assert(list.all { it.source == source })
 	}
 
-	@ParameterizedTest
+	@ParameterizedTest(name = "{index}|details|{0}")
 	@MangaSources
 	fun details(source: MangaSource) = runTest {
 		val parser = source.newParser(context)
@@ -95,7 +96,7 @@ internal class MangaParserTest {
 		}
 	}
 
-	@ParameterizedTest
+	@ParameterizedTest(name = "{index}|pages|{0}")
 	@MangaSources
 	fun pages(source: MangaSource) = runTest {
 		val parser = source.newParser(context)
@@ -115,16 +116,23 @@ internal class MangaParserTest {
 		checkImageRequest(pageUrl, page.referer)
 	}
 
-	@ParameterizedTest
+	@ParameterizedTest(name = "{index}|favicon|{0}")
 	@MangaSources
 	fun favicon(source: MangaSource) = runTest {
 		val parser = source.newParser(context)
-		val faviconUrl = parser.getFaviconUrl()
-		assert(faviconUrl.isUrlAbsolute())
-		checkImageRequest(faviconUrl, null)
+		val favicons = parser.parseFavicons()
+		val types = setOf("png", "svg", "ico", "gif", "jpg", "jpeg")
+		assert(favicons.isNotEmpty())
+		favicons.forEach {
+			assert(it.url.isUrlAbsolute()) { "Favicon url is not absolute: ${it.url}" }
+			assert(it.type in types) { "Unknown icon type: ${it.type}" }
+		}
+		val favicon = favicons.find(24)
+		checkNotNull(favicon)
+		checkImageRequest(favicon.url, favicons.referer)
 	}
 
-	@ParameterizedTest
+	@ParameterizedTest(name = "{index}|domain|{0}")
 	@MangaSources
 	fun domain(source: MangaSource) = runTest {
 		val parser = source.newParser(context)
@@ -133,7 +141,7 @@ internal class MangaParserTest {
 			.host(defaultDomain)
 			.scheme("https")
 			.toString()
-		val response = context.doRequest(url)
+		val response = context.doRequest(url, extraHeaders = parser.headers)
 		val realUrl = response.request.url
 		val realDomain = realUrl.topPrivateDomain()
 		val realHost = realUrl.host
@@ -142,7 +150,7 @@ internal class MangaParserTest {
 		}
 	}
 
-	@ParameterizedTest
+	@ParameterizedTest(name = "{index}|authorization|{0}")
 	@MangaSources
 	@Disabled
 	fun authorization(source: MangaSource) = runTest {

src/test/resources/junit-platform.properties

@@ -0,0 +1,2 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent