Fix ohmanhua decryption (#4317)

* Fix ohmanhua decryption

* Fix ohmanhua not parsing certain manga details properly

src/zh/onemanhua/build.gradle

@@ -5,7 +5,7 @@ ext {
     extName = 'OhManhua (OneManHua)'
     pkgNameSuffix = 'zh.onemanhua'
     extClass = '.Onemanhua'
-    extVersionCode = 4
+    extVersionCode = 5
     libVersion = '1.2'
 }
 

src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/Onemanhua.kt

@@ -9,6 +9,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
+import java.net.URLEncoder
 import java.util.regex.Pattern
 import javax.crypto.Cipher
 import javax.crypto.spec.SecretKeySpec
@@ -25,7 +26,6 @@ class Onemanhua : ParsedHttpSource() {
     override val baseUrl = "https://www.ohmanhua.com/"
 
     private var decryptKey = "fw12558899ertyui"
-    private var imageServerUrl = "https://img.ohmanhua.com/comic/"
 
     // Common
     private var commonSelector = "li.fed-list-item"
@@ -109,15 +109,31 @@ class Onemanhua : ParsedHttpSource() {
         return SManga.create().apply {
             title = document.select("h1.fed-part-eone").first().text().trim()
             thumbnail_url = picElement.attr("data-original")
-            status = when (detailElements[0].select("a").first().text()) {
+
+            status = when (detailElements.firstOrNull {
+                it.children().firstOrNull {
+                    it2 -> it2.hasClass("fed-text-muted") && it2.ownText() == "状态"
+                } != null
+            }?.select("a")?.first()?.text()) {
                 "连载中" -> SManga.ONGOING
                 "已完结" -> SManga.COMPLETED
                 else -> SManga.UNKNOWN
             }
-            author = detailElements[1].select("a").first().text()
 
-            genre = detailElements[4].select("a").joinToString { it.text() }
+            author = detailElements.firstOrNull {
-            description = detailElements[5].select(".fed-part-esan").first().text().trim()
+                it.children().firstOrNull {
+                    it2 -> it2.hasClass("fed-text-muted") && it2.ownText() == "作者"
+                } != null
+            }?.select("a")?.first()?.text()
+
+            genre = detailElements.firstOrNull {
+                it.children().firstOrNull {
+                    it2 -> it2.hasClass("fed-text-muted") && it2.ownText() == "类别"
+                } != null
+            }?.select("a")?.joinToString { it.text() }
+
+            description = document.select("ul.fed-part-rows li.fed-col-xs12.fed-show-md-block .fed-part-esan")
+                .firstOrNull()?.text()?.trim()
         }
     }
 
@@ -141,13 +157,30 @@ class Onemanhua : ParsedHttpSource() {
         // 3. decrypt C_DATA
         val decryptedData = decryptAES(decodedData, decryptKey)
 
-        val imgRelativePath = getImgRelativePath(decryptedData)
+        // 4. Extract values from C_DATA to formulate page urls
-        val startImg = getStartImg(decryptedData)
+        var imageServerDomain = regexExtractStringValue(
-        val totalPages = getTotalPages(decryptedData)
+            decryptedData, "domain:\"(.+?)\"", "Unable to match for imageServerDomain"
+        )
+        var mhId = regexExtractStringValue(
+            decryptedData, "mhid:\"(.+?)\"", "Unable to match for mhId"
+        )
+        var pageName = regexExtractStringValue(
+            decryptedData, "pagename:\"(.+?)\"", "Unable to match for pagename"
+        )
+        val startImg = regexExtractIntValue(
+            decryptedData, "startimg:([0-9]+?),", "Unable to match for startimg"
+        )
+
+        // 5. Decode and decrypt total pages
+        var encodedTotalPages = regexExtractStringValue(
+            decryptedData, "enc_code1:\"(.+?)\"", "Unable to match for enc_code1"
+        )
+        var decodedTotalPages = String(Base64.decode(encodedTotalPages, Base64.NO_WRAP))
+        var decryptedTotalPages = Integer.parseInt(decryptAES(decodedTotalPages, decryptKey))
 
         return mutableListOf<Page>().apply {
-            for (i in startImg..totalPages) {
+            for (i in startImg..decryptedTotalPages) {
-                add(Page(i, "", "${imageServerUrl}${imgRelativePath}${"%04d".format(i)}.jpg"))
+                add(Page(i, "", "https://$imageServerDomain/comic/$mhId/${encodeUriComponent(pageName)}/${"%04d".format(i)}.jpg"))
             }
         }
     }
@@ -183,33 +216,24 @@ class Onemanhua : ParsedHttpSource() {
         }
     }
 
-    private fun getImgRelativePath(mangaData: String): String {
+    private fun regexExtractStringValue(mangaData: String, regex: String, messageIfError: String): String {
-        val pattern = Pattern.compile("imgpath:\"(.+?)\"")
+        val pattern = Pattern.compile(regex)
         val matcher = pattern.matcher(mangaData)
         if (matcher.find()) {
-            return matcher.group(1) ?: throw Exception("imgpath not found")
+            return matcher.group(1) ?: throw Exception(messageIfError)
         }
 
-        throw Error("Unable to match for imgPath")
+        throw Error(messageIfError)
     }
 
-    private fun getTotalPages(mangaData: String): Int {
+    private fun regexExtractIntValue(mangaData: String, regex: String, messageIfError: String): Int {
-        val pattern = Pattern.compile("totalimg:([0-9]+?),")
+        return regexExtractStringValue(mangaData, regex, messageIfError).let { Integer.parseInt(it) }
-        val matcher = pattern.matcher(mangaData)
-        if (matcher.find()) {
-            return matcher.group(1)?.let { Integer.parseInt(it) } ?: throw Exception("totalimg not found")
-        }
-
-        throw Error("Unable to match for totalimg")
     }
 
-    private fun getStartImg(mangaData: String): Int {
+    private fun encodeUriComponent(str: String): String {
-        val pattern = Pattern.compile("startimg:([0-9]+?),")
+        return URLEncoder.encode(str, "UTF-8")
-        val matcher = pattern.matcher(mangaData)
+            .replace("+", "%20")
-        if (matcher.find()) {
+            .replace("%7E", "~")
-            return matcher.group(1)?.let { Integer.parseInt(it) } ?: throw Exception("startimg not found")
+            .replace("*", "%2A")
-        }
-
-        throw Error("Unable to match for startimg")
     }
 }