From a20336a11a4288526a1ed4bd71a5fc05c1b588ee Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sun, 19 Feb 2023 20:54:34 +0800
Subject: [PATCH] Introduce kotlin style diskcache operation

---
 .../java/com/hippo/ehviewer/coil/DiskCache.kt | 21 +++++++++++++++++
 .../com/hippo/ehviewer/spider/SpiderDen.kt    | 23 +++++++++++--------
 2 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/com/hippo/ehviewer/coil/DiskCache.kt

diff --git a/app/src/main/java/com/hippo/ehviewer/coil/DiskCache.kt b/app/src/main/java/com/hippo/ehviewer/coil/DiskCache.kt
new file mode 100644
index 000000000..f916ba67f
--- /dev/null
+++ b/app/src/main/java/com/hippo/ehviewer/coil/DiskCache.kt
@@ -0,0 +1,21 @@
+package com.hippo.ehviewer.coil
+
+import coil.disk.DiskCache
+
+inline fun DiskCache.edit(key: String, block: DiskCache.Editor.() -> Unit): Boolean {
+    val editor = edit(key) ?: return false
+    editor.runCatching {
+        block(this)
+    }.onFailure {
+        editor.abort()
+        throw it
+    }.onSuccess {
+        editor.commit()
+    }
+    return true
+}
+
+inline fun DiskCache.read(key: String, block: DiskCache.Snapshot.() -> Unit): Boolean {
+    (get(key) ?: return false).use { block(it) }
+    return true
+}
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 e2e933d91..bbb48e710 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt
@@ -28,6 +28,8 @@ import com.hippo.ehviewer.client.EhCacheKeyFactory
 import com.hippo.ehviewer.client.EhRequestBuilder
 import com.hippo.ehviewer.client.EhUtils.getSuitableTitle
 import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.coil.edit
+import com.hippo.ehviewer.coil.read
 import com.hippo.ehviewer.gallery.PageLoader2
 import com.hippo.image.Image.CloseableSource
 import com.hippo.unifile.RawFile
@@ -108,12 +110,12 @@ class SpiderDen(private val mGalleryInfo: GalleryInfo) {
         val dir = downloadDir ?: return false
         val key = EhCacheKeyFactory.getImageKey(mGid, index)
         runCatching {
-            (sCache[key] ?: return false).use { snapshot ->
-                val extension = fixExtension("." + snapshot.metadata.toFile().readText())
+            sCache.read(key) {
+                val extension = fixExtension("." + metadata.toFile().readText())
                 val file = dir.createFile(generateImageFilename(index, extension)) ?: return false
                 (file.openOutputStream() as FileOutputStream).use { outputStream ->
                     outputStream.channel.use { outChannel ->
-                        snapshot.data.toFile().inputStream().use { inputStream ->
+                        data.toFile().inputStream().use { inputStream ->
                             inputStream.channel.use {
                                 outChannel.transferFrom(it, 0, it.size())
                             }
@@ -121,7 +123,10 @@ class SpiderDen(private val mGalleryInfo: GalleryInfo) {
                     }
                 }
             }
+        }.onSuccess {
             return true
+        }.onFailure {
+            it.printStackTrace()
         }
         return false
     }
@@ -206,19 +211,17 @@ class SpiderDen(private val mGalleryInfo: GalleryInfo) {
             // Read Mode, allow save to cache
             if (mMode == SpiderQueen.MODE_READ) {
                 val key = EhCacheKeyFactory.getImageKey(mGid, index)
-                val editor = sCache.edit(key) ?: return false
                 var received: Long = 0
                 runCatching {
-                    editor.metadata.toFile().writeText(extension)
-                    editor.data.toFile().outputStream().use { outputStream ->
-                        outputStream.channel.use { received = doSave(it) }
+                    sCache.edit(key) {
+                        metadata.toFile().writeText(extension)
+                        data.toFile().outputStream().use { outputStream ->
+                            outputStream.channel.use { received = doSave(it) }
+                        }
                     }
                 }.onFailure {
-                    editor.abort()
                     it.printStackTrace()
-                    return false
                 }.onSuccess {
-                    editor.commit()
                     return received == length
                 }
             }