Fix Manga District & Hentai4free parsers #157

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

@@ -0,0 +1,69 @@
+package org.koitharu.kotatsu.parsers.site.madara
+
+import org.jsoup.nodes.Document
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaSourceParser
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.util.*
+import java.text.SimpleDateFormat
+import java.util.*
+
+@MangaSourceParser("HENTAI_4FREE", "Hentai4Free", "en")
+internal class Hentai4Free(context: MangaLoaderContext) :
+	MadaraParser(context, MangaSource.HENTAI_4FREE, "hentai4free.net") {
+
+	override val tagPrefix = "hentai-tag/"
+
+	override val isNsfwSource = true
+
+	override suspend fun getTags(): Set<MangaTag> {
+		val doc = webClient.httpGet("https://$domain/").parseHtml()
+		val body = doc.body()
+		val root1 = body.selectFirst("header")?.selectFirst("ul.second-menu")
+		val list = root1?.select("li").orEmpty()
+		val keySet = HashSet<String>(list.size)
+		return list.mapNotNullToSet { li ->
+			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
+			val href = a.attr("href").removeSuffix("/")
+				.substringAfterLast(tagPrefix, "")
+			if (href.isEmpty() || !keySet.add(href)) {
+				return@mapNotNullToSet null
+			}
+			MangaTag(
+				key = href,
+				title = a.ownText().trim().toTitleCase(),
+				source = source,
+			)
+		}
+	}
+
+	override suspend fun getChapters(manga: Manga, doc: Document): List<MangaChapter> {
+		val slug = manga.url.removeSuffix('/').substringAfterLast('/')
+		val doc2 = webClient.httpPost(
+			"https://$domain/hentai/$slug/ajax/chapters/",
+			mapOf(),
+		).parseHtml()
+		val ul = doc2.body().selectFirstOrThrow("ul")
+		val dateFormat = SimpleDateFormat(datePattern, Locale.US)
+		return ul.select("li").asReversed().mapChapters { i, li ->
+			val a = li.selectFirst("a")
+			val href = a?.attrAsRelativeUrlOrNull("href") ?: li.parseFailed("Link is missing")
+			MangaChapter(
+				id = generateUid(href),
+				name = a.ownText(),
+				number = i + 1,
+				url = href,
+				uploadDate = parseChapterDate(
+					dateFormat,
+					li.selectFirst("span.chapter-release-date i")?.text(),
+				),
+				source = source,
+				scanlator = null,
+				branch = null,
+			)
+		}
+	}
+}

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

@@ -337,14 +337,10 @@ internal abstract class MadaraParser(
 	}
 
 	@MangaSourceParser("AQUAMANGA", "AquaManga", "en")
-    class AquaManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.AQUAMANGA, "aquamanga.com") {
+	class AquaManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.AQUAMANGA, "aquamanga.com")
-
-    }
 
 	@MangaSourceParser("MANGALEK", "MangaLek", "ar")
-    class MangaLek(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGALEK, "mangalek.com") {
+	class MangaLek(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGALEK, "mangalek.com")
-
-    }
 
 	@MangaSourceParser("HARIMANGA", "HariManga", "en")
 	class HariManga(context: MangaLoaderContext) : MadaraParser(context, MangaSource.HARIMANGA, "harimanga.com") {
@@ -401,15 +397,6 @@ internal abstract class MadaraParser(
 		override val isNsfwSource = true
 	}
 
-    @MangaSourceParser("MANGA_DISTRICT", "Manga District", "en")
-    class MangaDistrict(context: MangaLoaderContext) :
-        MadaraParser(context, MangaSource.MANGA_DISTRICT, "mangadistrict.com") {
-
-        override val tagPrefix = "read-scan/"
-
-        override val isNsfwSource = true
-    }
-
 	@MangaSourceParser("HENTAI20", "Hentai20", "en")
 	class Hentai20(context: MangaLoaderContext) :
 		MadaraParser(context, MangaSource.HENTAI20, "hentai20.io") {
@@ -419,36 +406,6 @@ internal abstract class MadaraParser(
 		override val isNsfwSource = true
 	}
 
-    @MangaSourceParser("HENTAI_4FREE", "Hentai4Free", "en")
-    class Hentai4Free(context: MangaLoaderContext) :
-        MadaraParser(context, MangaSource.HENTAI_4FREE, "hentai4free.net") {
-
-        override val tagPrefix = "hentai-genre/"
-
-        override val isNsfwSource = true
-
-        override suspend fun getTags(): Set<MangaTag> {
-            val doc = webClient.httpGet("https://$domain/").parseHtml()
-            val body = doc.body()
-            val root1 = body.selectFirst("header")?.selectFirst("ul.second-menu")
-            val list = root1?.select("li").orEmpty()
-            val keySet = HashSet<String>(list.size)
-            return list.mapNotNullToSet { li ->
-                val a = li.selectFirst("a") ?: return@mapNotNullToSet null
-                val href = a.attr("href").removeSuffix("/")
-                    .substringAfterLast(tagPrefix, "")
-                if (href.isEmpty() || !keySet.add(href)) {
-                    return@mapNotNullToSet null
-                }
-                MangaTag(
-                    key = href,
-                    title = a.ownText().trim().toTitleCase(),
-                    source = source,
-                )
-            }
-        }
-    }
-
 	@MangaSourceParser("ALLPORN_COMIC", "All Porn Comic", "en")
 	class AllPornComic(context: MangaLoaderContext) :
 		MadaraParser(context, MangaSource.ALLPORN_COMIC, "allporncomic.com") {
@@ -479,9 +436,7 @@ internal abstract class MadaraParser(
 	}
 
 	@MangaSourceParser("MANGACV", "Manga Cv", "en")
-    class MangaCv(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGACV, "mangacv.com") {
+	class MangaCv(context: MangaLoaderContext) : MadaraParser(context, MangaSource.MANGACV, "mangacv.com")
-
-    }
 
 	@MangaSourceParser("TOONILY", "Toonily", "en")
 	class Toonily(context: MangaLoaderContext) : MadaraParser(context, MangaSource.TOONILY, "toonily.com") {

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

@@ -0,0 +1,49 @@
+package org.koitharu.kotatsu.parsers.site.madara
+
+import org.jsoup.nodes.Document
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaSourceParser
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.*
+import java.text.SimpleDateFormat
+import java.util.*
+
+@MangaSourceParser("MANGA_DISTRICT", "Manga District", "en")
+internal class MangaDistrict(context: MangaLoaderContext) :
+	MadaraParser(context, MangaSource.MANGA_DISTRICT, "mangadistrict.com") {
+
+	override val tagPrefix = "publication-genre/"
+
+	override val isNsfwSource = true
+
+	override val datePattern = "MMM dd,yyyy"
+
+	override suspend fun getChapters(manga: Manga, doc: Document): List<MangaChapter> {
+		val slug = manga.url.removeSuffix('/').substringAfterLast('/')
+		val doc2 = webClient.httpPost(
+			"https://$domain/read-scan/$slug/ajax/chapters/",
+			mapOf(),
+		).parseHtml()
+		val ul = doc2.body().selectFirstOrThrow("ul")
+		val dateFormat = SimpleDateFormat(datePattern, Locale.US)
+		return ul.select("li").asReversed().mapChapters { i, li ->
+			val a = li.selectFirst("a")
+			val href = a?.attrAsRelativeUrlOrNull("href") ?: li.parseFailed("Link is missing")
+			MangaChapter(
+				id = generateUid(href),
+				name = a.ownText(),
+				number = i + 1,
+				url = href,
+				uploadDate = parseChapterDate(
+					dateFormat,
+					li.selectFirst("span.chapter-release-date i")?.text(),
+				),
+				source = source,
+				scanlator = null,
+				branch = null,
+			)
+		}
+	}
+}