From cfa1ce8ab653c217ea59013bac7ecfcaea187de2 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Tue, 20 Jun 2023 19:34:38 +0800
Subject: [PATCH] Cleanup code

---
 .../spider/Android14CoroutineHttpEngine.kt    | 26 +++++++++----------
 .../com/hippo/ehviewer/spider/SpiderDen.kt    | 22 +++++++---------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt b/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt
index e93658665..42b545b68 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt
+++ b/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt
@@ -28,7 +28,7 @@ val cronetHttpClientExecutor = EhApplication.nonCacheOkHttpClient.dispatcher.exe
 
 // TODO: Rewrite this to use android.net.http.HttpEngine and make it Android 14 only when released
 class CronetRequest : AutoCloseable {
-    lateinit var mConsumer: (UrlResponseInfo, ByteBuffer) -> Unit
+    lateinit var consumer: (UrlResponseInfo, ByteBuffer) -> Unit
     lateinit var onResponse: CronetRequest.(UrlResponseInfo) -> Unit
     lateinit var request: UrlRequest
     lateinit var daemonCont: Continuation<Boolean>
@@ -44,7 +44,7 @@ class CronetRequest : AutoCloseable {
 
         override fun onReadCompleted(p0: UrlRequest, p1: UrlResponseInfo, p2: ByteBuffer) {
             p2.flip()
-            mConsumer(p1, p2)
+            consumer(p1, p2)
             buffer.clear()
             request.read(buffer)
         }
@@ -72,25 +72,23 @@ inline fun cronetRequest(url: String, conf: UrlRequest.Builder.() -> Unit) = Cro
     request = cronetHttpClient.newUrlRequestBuilder(url, callback, cronetHttpClientExecutor).apply(conf).build()
 }
 
-suspend infix fun CronetRequest.consumeBodyFully(callback: (UrlResponseInfo, ByteBuffer) -> Unit) = run {
-    mConsumer = callback
+suspend infix fun CronetRequest.awaitBodyFully(consumer: (UrlResponseInfo, ByteBuffer) -> Unit) = run {
+    this.consumer = consumer
     suspendCancellableCoroutine { cont ->
         readerCont = cont
         request.read(buffer)
     }
 }
 
-suspend inline infix fun CronetRequest.execute(noinline callback: suspend CronetRequest.(UrlResponseInfo) -> Unit): Boolean {
-    return coroutineScope {
-        onResponse = {
-            launch {
-                callback(it)
+suspend inline fun CronetRequest.execute(noinline onResponse: suspend CronetRequest.(UrlResponseInfo) -> Unit): Boolean {
+    return use {
+        coroutineScope {
+            this@execute.onResponse = { launch { onResponse(it) } }
+            suspendCancellableCoroutine { cont ->
+                cont.invokeOnCancellation { request.cancel() }
+                daemonCont = cont
+                request.start()
             }
         }
-        suspendCancellableCoroutine { cont ->
-            cont.invokeOnCancellation { request.cancel() }
-            daemonCont = cont
-            request.start()
-        }
     }
 }
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 2b1085178..7edfdf556 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt
@@ -134,18 +134,16 @@ class SpiderDen(private val mGalleryInfo: GalleryInfo) {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             cronetRequest(url) {
                 referer?.let { addHeader("Referer", it) }
-            }.use { request ->
-                request execute { info ->
-                    val headers = info.allHeaders
-                    val type = headers["Content-Type"]?.first()?.toMediaType()?.subtype ?: "jpg"
-                    val length = headers["Content-Length"]!!.first().toLong()
-                    saveResponseMeta(index, type, length) { file ->
-                        file.openOutputStream().use {
-                            val chan = it.channel
-                            consumeBodyFully { info, buffer ->
-                                val read = chan.write(buffer)
-                                notifyProgress(length, info.receivedByteCount, read)
-                            }
+            }.execute { info ->
+                val headers = info.allHeaders
+                val type = headers["Content-Type"]?.first()?.toMediaType()?.subtype ?: "jpg"
+                val length = headers["Content-Length"]!!.first().toLong()
+                saveResponseMeta(index, type, length) { file ->
+                    file.openOutputStream().use {
+                        val chan = it.channel
+                        awaitBodyFully { info, buffer ->
+                            val read = chan.write(buffer)
+                            notifyProgress(length, info.receivedByteCount, read)
                         }
                     }
                 }