diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt index aec899024..319bfd019 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt @@ -306,8 +306,8 @@ object EhEngine { suspend fun getFavoriteNote(gid: Long, token: String) = ehRequest(EhUrl.getAddFavorites(gid, token), EhUrl.getGalleryDetailUrl(gid, token)) .fetchUsingAsText(FavoritesParser::parseNote) - suspend fun downloadArchive(gid: Long, token: String, or: String?, res: String, isHAtH: Boolean): String? { - val url = EhUrl.getDownloadArchive(gid, token, or) + suspend fun downloadArchive(gid: Long, token: String, res: String, isHAtH: Boolean): String? { + val url = EhUrl.getDownloadArchive(gid, token) val referer = EhUrl.getGalleryDetailUrl(gid, token) val request = ehRequest(url, referer, EhUrl.origin) { formBody { diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/EhUrl.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/EhUrl.kt index 9ab93744f..a67c46167 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/client/EhUrl.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/client/EhUrl.kt @@ -125,10 +125,9 @@ object EhUrl { addQueryParameter("act", "addfav") }.buildString() - fun getDownloadArchive(gid: Long, token: String, or: String?) = ehUrl("archiver.php") { + fun getDownloadArchive(gid: Long, token: String) = ehUrl("archiver.php") { addQueryParameter("gid", "$gid") addQueryParameter("token", token) - addQueryParameterIfNotBlank("or", or) }.buildString() fun getTagDefinitionUrl(tag: String) = "https://ehwiki.org/wiki/" + tag.replace(' ', '_') diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt index 60b4b1065..e252de5a6 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt @@ -25,8 +25,6 @@ object ArchiveParser { Regex("(.*).*Click Here To Start Downloading") private val PATTERN_CURRENT_FUNDS = Regex("
([\\d,]+) GP \\[[^]]*] ([\\d,]+) Credits \\[[^]]*]
") - private val PATTERN_HATH_FORM = - Regex("