Tweak ParseException

FooIbar · Sep 8, 2023 · c7c0446 · c7c0446
1 parent 1347775
commit c7c0446
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 31 deletions.
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt
@@ -120,8 +120,8 @@ private fun rethrowExactly(code: Int, headers: Headers, body: String, e: Throwab
         } else if ("<" !in body) {
             throw EhException(body)
         } else {
-            if (Settings.saveParseErrorBody) AppConfig.saveParseErrorBody(e)
-            throw EhException(appCtx.getString(R.string.error_parse_error))
+            if (Settings.saveParseErrorBody) AppConfig.saveParseErrorBody(e, body)
+            throw EhException(appCtx.getString(R.string.error_parse_error), e)
         }
     }
 

diff --git a/app/src/main/java/com/hippo/ehviewer/client/exception/ParseException.kt b/app/src/main/java/com/hippo/ehviewer/client/exception/ParseException.kt
@@ -16,16 +16,7 @@
 package com.hippo.ehviewer.client.exception
 
 class ParseException : EhException {
-    val body: String
+    constructor(detailMessage: String?) : super(detailMessage)
 
-    constructor(detailMessage: String?, body: String) : super(detailMessage) {
-        this.body = body
-    }
-
-    constructor(detailMessage: String?, body: String, cause: Throwable?) : super(
-        detailMessage,
-        cause,
-    ) {
-        this.body = body
-    }
+    constructor(detailMessage: String?, cause: Throwable?) : super(detailMessage, cause)
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/FavoritesParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/FavoritesParser.kt
@@ -12,7 +12,7 @@ object FavoritesParser {
         }
         val catArray = arrayOfNulls<String>(10)
         val countArray = parseFav(body, catArray)
-        if (countArray.isEmpty()) throw ParseException("Parse favorites error", body)
+        if (countArray.isEmpty()) throw ParseException("Parse favorites error")
         val result = GalleryListParser.parse(body)
         return Result(catArray.requireNoNulls(), countArray, result)
     }

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt
@@ -114,9 +114,9 @@ object GalleryDetailParser {
             gd.token = groupValues[2]
             gd.apiUid = groupValues[3].toLongOrNull() ?: -1L
             gd.apiKey = groupValues[4]
-        } ?: throw ParseException("Can't parse gallery detail", body)
+        } ?: throw ParseException("Can't parse gallery detail")
         if (gd.gid == -1L) {
-            throw ParseException("Can't parse gallery detail", body)
+            throw ParseException("Can't parse gallery detail")
         }
         PATTERN_TORRENT.find(body)?.run {
             gd.torrentUrl = groupValues[1].trim().unescapeXml()
@@ -214,7 +214,7 @@ object GalleryDetailParser {
             }
         } catch (e: Throwable) {
             ExceptionUtils.throwIfFatal(e)
-            throw ParseException("Can't parse gallery detail", body)
+            throw ParseException("Can't parse gallery detail")
         }
 
         // newer version
@@ -450,15 +450,15 @@ object GalleryDetailParser {
      */
     fun parsePreviewPages(body: String): Int {
         return PATTERN_PREVIEW_PAGES.find(body)?.groupValues?.get(1)?.toIntOrNull()
-            ?: throw ParseException("Parse preview page count error", body)
+            ?: throw ParseException("Parse preview page count error")
     }
 
     /**
      * Parse pages with regular expressions
      */
     fun parsePages(body: String): Int {
         return PATTERN_PAGES.find(body)?.groupValues?.get(1)?.toIntOrNull()
-            ?: throw ParseException("Parse pages error", body)
+            ?: throw ParseException("Parse pages error")
     }
 
     fun parsePreviewList(body: String): Pair<List<GalleryPreview>, List<String>> {

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.kt
@@ -25,7 +25,7 @@ object GalleryListParser {
         if (body.contains("No hits found</p>")) {
             throw EhException(R.string.gallery_list_empty_hit)
         }
-        throw ParseException("Can't parse gallery list", body, it)
+        throw ParseException("Can't parse gallery list", it)
     }
 }
 

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryMultiPageViewerPTokenParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryMultiPageViewerPTokenParser.kt
@@ -33,7 +33,7 @@ object GalleryMultiPageViewerPTokenParser {
             imagelist.parseAs<List<Item>>().map(Item::token)
         }.getOrElse {
             ExceptionUtils.throwIfFatal(it)
-            throw ParseException("Parse pToken from MPV error", body, it)
+            throw ParseException("Parse pToken from MPV error", it)
         }
     }
 

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageApiParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageApiParser.kt
@@ -27,7 +27,7 @@ object GalleryPageApiParser {
     private val PATTERN_ORIGIN_IMAGE_URL = Regex("<a href=\"([^\"]+)fullimg.php([^\"]+)\">")
 
     fun parse(body: String): Result {
-        runCatching { body.parseAs<Error>() }.onSuccess { throw ParseException(it.error, body) }
+        runCatching { body.parseAs<Error>() }.onSuccess { throw ParseException(it.error) }
         val res = body.parseAs<JsonResult>()
         val imageUrl = PATTERN_IMAGE_URL.find(res.imageUrl)?.run {
             groupValues[1].trim().unescapeXml()
@@ -41,7 +41,7 @@ object GalleryPageApiParser {
         if (!imageUrl.isNullOrEmpty()) {
             return Result(imageUrl, skipHathKey, originImageUrl)
         } else {
-            throw ParseException("Parse image url and skip hath key error", body)
+            throw ParseException("Parse image url and skip hath key error")
         }
     }
 

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.kt
@@ -56,7 +56,7 @@ object GalleryPageParser {
         return if (!imageUrl.isNullOrEmpty() && !showKey.isNullOrEmpty()) {
             Result(imageUrl, skipHathKey, originImageUrl, showKey)
         } else {
-            throw ParseException("Parse image url and show error", body)
+            throw ParseException("Parse image url and show error")
         }
     }
 

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/HomeParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/HomeParser.kt
@@ -24,7 +24,7 @@ object HomeParser {
             val fundsGP = ParserUtils.parseInt(get(2), 0) * 1000
             return Funds(fundsGP, fundsC)
         }
-        throw ParseException("Parse funds error", body)
+        throw ParseException("Parse funds error")
     }
 
     @Parcelize

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/ProfileParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/ProfileParser.kt
@@ -46,7 +46,7 @@ object ProfileParser {
             Result(displayName, avatar)
         }.getOrElse {
             ExceptionUtils.throwIfFatal(it)
-            throw ParseException("Parse forums error", body)
+            throw ParseException("Parse forums error")
         }
     }
 

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/SignInParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/SignInParser.kt
@@ -35,7 +35,7 @@ object SignInParser {
             if (m.find()) {
                 throw EhException(m.group(1) ?: m.group(2))
             } else {
-                throw ParseException("Can't parse sign in", body)
+                throw ParseException("Can't parse sign in")
             }
         }
     }

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/TorrentParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/TorrentParser.kt
@@ -1,9 +1,12 @@
 package com.hippo.ehviewer.client.parser
 
+import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
 
 object TorrentParser {
-    fun parse(body: ByteBuffer) = parseTorrent(body)
+    fun parse(body: ByteBuffer) = runCatching {
+        parseTorrent(body)
+    }.getOrElse { throw ParseException("Can't parse torrent list", it) }
 }
 
 class Torrent(

diff --git a/app/src/main/java/com/hippo/ehviewer/util/AppConfig.kt b/app/src/main/java/com/hippo/ehviewer/util/AppConfig.kt
@@ -60,12 +60,12 @@ object AppConfig {
         return FileUtils.createTempFile(tempDir, null)
     }
 
-    fun saveParseErrorBody(e: ParseException) {
+    fun saveParseErrorBody(e: ParseException, body: String) {
         val dir = externalParseErrorDir ?: return
         File(dir, ReadableTime.getFilenamableTime(System.currentTimeMillis()) + ".txt").writer().use {
             it.write(e.message)
             it.appendLine()
-            it.append(e.body)
+            it.append(body)
         }
     }
 

diff --git a/app/src/main/rust/src/parser/torrent.rs b/app/src/main/rust/src/parser/torrent.rs
@@ -30,7 +30,7 @@ pub fn parseTorrent(env: JNIEnv, _class: JClass, buffer: JByteBuffer, limit: jin
     parse_bytebuffer(&mut env, buffer, limit, |dom, parser, _env| {
         Some(dom.query_selector("table")?.filter_map(|e| {
             let html = e.get(parser)?.inner_html(parser);
-            let grp = regex!("</span> ([0-9-]+) [0-9:]+</td>[\\s\\S]+</span> ([0-9.]+ [KMGT]B)</td>[\\s\\S]+</span> ([0-9]+)</td>[\\s\\S]+</span> ([0-9]+)</td>[\\s\\S]+</span> ([0-9]+)</td>[\\s\\S]+</span>([^<]+)</td>[\\s\\S]+onclick=\"document.location='([^\"]+)'[^<]+>([^<]+)</a>").captures(&html)?;
+            let grp = regex!("</span> ([0-9-]+) [0-9:]+</td>[\\s\\S]+</span> ([0-9.]+ [KMGT]B)</td>[\\s\\S]+</span> ([0-9]+)</td>[\\s\\S]+</span> ([0-9]+)</td>[\\s\\S]+</span> ([0-9]+)</td>[\\s\\S]+</span>([^<]+)</td>[\\s\\S]+onclick=\"document.location='([^\"]+)'[^<]+>([^<]+)</a>").captures(&html).unwrap();
             let name = unescape(&grp[8]).ok()?;
             Some(Torrent {
                 posted: grp[1].to_string(),