From ac23a4312d7e42da5972d4be5558e793abaefd9c Mon Sep 17 00:00:00 2001 From: Dude so hot Date: Tue, 15 Oct 2024 18:13:10 +0800 Subject: [PATCH] Address CR --- app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderDen.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderDen.kt b/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderDen.kt index 5b5adfe62..cf6d3df62 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderDen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderDen.kt @@ -77,7 +77,7 @@ class SpiderDen(val info: GalleryInfo) { // Search in both directories to maintain compatibility private val fileCache by lazy { - listOf(tempDownloadDir, downloadDir).mapNotNull { it?.list() }.flatten().associateBy { it.name } as MutableMap + listOfNotNull(tempDownloadDir, downloadDir).map(Path::list).flatten().associateBy { it.name } as MutableMap } private val imageDir @@ -159,9 +159,9 @@ class SpiderDen(val info: GalleryInfo) { removeTempFile(index) } - private fun Path.findDownloadFileForIndex(index: Int, extension: String): Path { + private fun Path.findDownloadFileForIndex(index: Int, extension: String) = with(lock) { val name = perFilename(index, extension) - return lock.write { fileCache.getOrPut(name) { resolve(name) } } + read { fileCache[name] } ?: resolve(name).also { write { fileCache[name] = it } } } suspend fun makeHttpCallAndSaveImage(