From ebb3eb1ab332e8f4bf0f0bcb2cf57ab8cb962153 Mon Sep 17 00:00:00 2001 From: GG Bond Date: Sat, 24 Feb 2024 22:02:36 +0800 Subject: [PATCH] Simplify EhEngine.getPreviewList --- app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt | 2 +- .../kotlin/com/hippo/ehviewer/ui/screen/GalleryPreviewScreen.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 eac2a2314..8644b4105 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt @@ -226,7 +226,7 @@ object EhEngine { } suspend fun getPreviewList(url: String) = ehRequest(url, EhUrl.referer).fetchUsingAsText { - GalleryDetailParser.parsePreviewList(this) to GalleryDetailParser.parsePreviewPages(this) + GalleryDetailParser.parsePreviewList(this) } suspend fun getFavorites(url: String) = ehRequest(url, EhUrl.referer).fetchUsingAsByteBuffer(FavoritesParser::parse) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryPreviewScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryPreviewScreen.kt index c960c89b6..e99e7e3fa 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryPreviewScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryPreviewScreen.kt @@ -95,7 +95,7 @@ fun GalleryPreviewScreen(galleryDetail: GalleryDetail, toNextPageArg: Boolean, n (up..end).filterNot { it in previewPagesMap }.map { it / pgSize }.toSet() .parMap(concurrency = Settings.multiThreadDownload) { page -> val url = EhUrl.getGalleryDetailUrl(gid, token, page, false) - EhEngine.getPreviewList(url).first.first + EhEngine.getPreviewList(url).first }.flatten().forEach { previewPagesMap[it.position] = it if (Settings.preloadThumbAggressively) {