From 5d64e8c61bdd32e57476127db70304c088cd8728 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Sun, 19 Feb 2023 23:09:06 +0800 Subject: [PATCH] fixup! Introduce kotlin style diskcache operation --- app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt index bbb48e710..3ec56c51f 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt @@ -109,7 +109,7 @@ class SpiderDen(private val mGalleryInfo: GalleryInfo) { private fun copyFromCacheToDownloadDir(index: Int): Boolean { val dir = downloadDir ?: return false val key = EhCacheKeyFactory.getImageKey(mGid, index) - runCatching { + return runCatching { sCache.read(key) { val extension = fixExtension("." + metadata.toFile().readText()) val file = dir.createFile(generateImageFilename(index, extension)) ?: return false @@ -123,12 +123,10 @@ class SpiderDen(private val mGalleryInfo: GalleryInfo) { } } } - }.onSuccess { - return true - }.onFailure { + }.getOrElse { it.printStackTrace() + false } - return false } operator fun contains(index: Int): Boolean {