v5.1

scripts/patch_ninemanga_niadd.py

@@ -425,38 +425,6 @@ replace_exact(
 
                 val dateText = anchorDate ?: rowDate
 
-                val metadataText = when {
-                    anchorDate != null -> anchorText
-                    rowDate != null -> rowText
-                    else -> ""
-                }
-
-                val textBeforeDate = if (dateText != null) {
-                    metadataText
-                        .substringBefore(dateText)
-                        .trim()
-                } else {
-                    metadataText
-                }
-
-                /*
-                 * Niadd exposes the page count immediately before
-                 * the chapter date, for example:
-                 *
-                 *   Падение русала 1 - 42 41 Aug 02, 2024
-                 *                           ^^
-                 *
-                 * Store that number in a URL fragment. Fragments
-                 * are local metadata and are not sent to the server.
-                 */
-                val pageCount = Regex(
-                    """\\s+(\\d+)\\s*$"""
-                )
-                    .find(textBeforeDate)
-                    ?.groupValues
-                    ?.getOrNull(1)
-                    ?.toIntOrNull()
-
                 val chapterTitle = if (
                     dateText != null &&
                     rawTitle.contains(dateText)
@@ -472,15 +440,6 @@ replace_exact(
                     rawTitle
                 }
 
-                val chapterUrl = if (
-                    pageCount != null &&
-                    pageCount > 0
-                ) {
-                    "$href#niadd-pages=$pageCount"
-                } else {
-                    href
-                }
-
                 MangaChapter(
                     id = generateUid(href),
                     title = chapterTitle.takeIf {
@@ -488,7 +447,7 @@ replace_exact(
                     },
                     number = i + 1f,
                     volume = 0,
-                    url = chapterUrl,
+                    url = href,
                     uploadDate = parseChapterDateByLang(
                         dateText.orEmpty()
                     ),
@@ -641,42 +600,78 @@ replace_exact(
     '''    override suspend fun getPages(
         chapter: MangaChapter,
     ): List<MangaPage> {
-        if (domain.endsWith("niadd.com")) {
+        val chapterUrl = chapter.url
-            val originalUrl = chapter.url
             .substringBefore("#")
-                .substringBefore("?")
 
-            val totalPages = chapter.url
+        val doc = webClient
-                .substringAfter(
+            .httpGet(
-                    "#niadd-pages=",
+                chapterUrl.toAbsoluteUrl(domain)
-                    "",
             )
-                .substringBefore("&")
+            .parseHtml()
-                .toIntOrNull()
+
-                ?.takeIf { it > 0 }
+        if (domain.endsWith("niadd.com")) {
+            val pageLabelRegex = Regex(
+                """^\\s*(\\d+)\\s*/\\s*(\\d+)\\s*$"""
+            )
+
+            val pageOptions = doc
+                .select("option[value]")
+                .mapNotNull { option ->
+                    val match = pageLabelRegex.matchEntire(
+                        option.text().trim()
+                    ) ?: return@mapNotNull null
+
+                    val pageNumber = match
+                        .groupValues
+                        .getOrNull(1)
+                        ?.toIntOrNull()
+                        ?: return@mapNotNull null
+
+                    val totalPages = match
+                        .groupValues
+                        .getOrNull(2)
+                        ?.toIntOrNull()
+                        ?: return@mapNotNull null
+
+                    val url = option.attr("value").trim()
+                    if (url.isEmpty()) {
+                        return@mapNotNull null
+                    }
+
+                    Triple(pageNumber, totalPages, url)
+                }
+                .distinctBy { (pageNumber, _, _) ->
+                    pageNumber
+                }
+                .sortedBy { (pageNumber, _, _) ->
+                    pageNumber
+                }
+
+            val totalPages = pageOptions
+                .firstOrNull()
+                ?.second
                 ?: error(
-                    "Niadd page count is missing for ${chapter.url}. " +
+                    "Cannot find Niadd page selector for $chapterUrl"
-                        "Refresh manga details and try again."
                 )
 
-            val normalizedUrl = originalUrl
+            check(
-                .removeSuffix("/")
+                pageOptions.all { (_, total, _) ->
-
+                    total == totalPages
-            val baseUrl = if (
+                }
-                normalizedUrl.endsWith(".html")
             ) {
-                normalizedUrl.removeSuffix(".html")
+                "Inconsistent Niadd page count for $chapterUrl"
-            } else {
-                normalizedUrl
             }
 
-            return (1..totalPages).map { pageNumber ->
+            check(
-                val url = if (pageNumber == 1) {
+                pageOptions.size == totalPages &&
-                    originalUrl
+                    pageOptions.map { it.first } ==
-                } else {
+                    (1..totalPages).toList()
-                    "$baseUrl-$pageNumber.html"
+            ) {
+                "Incomplete Niadd page selector for $chapterUrl: " +
+                    "found ${pageOptions.size} of $totalPages pages"
             }
 
+            return pageOptions.map { (_, _, url) ->
                 MangaPage(
                     id = generateUid(url),
                     url = url,
@@ -686,12 +681,6 @@ replace_exact(
             }
         }
 
-        val doc = webClient
-            .httpGet(
-                chapter.url.toAbsoluteUrl(domain)
-            )
-            .parseHtml()
-
         return doc
             .body()
             .requireElementById("page")