From a1cac7a83712ca59d0f0da200240cee0bcb0e456 Mon Sep 17 00:00:00 2001 From: kunfei Date: Tue, 20 Sep 2022 14:01:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/help/source/BookSourceExtensions.kt | 8 ++++---- .../java/io/legado/app/help/source/RssSourceExtensions.kt | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt b/app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt index f098c4748..63feac15a 100644 --- a/app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt +++ b/app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt @@ -17,12 +17,12 @@ private val mutexMap by lazy { hashMapOf() } private val exploreKindsMap by lazy { ConcurrentHashMap>() } private val aCache by lazy { ACache.get("explore") } -private fun BookSource.exploreKindsKey(): String { +private fun BookSource.getExploreKindsKey(): String { return MD5Utils.md5Encode(bookSourceUrl + exploreUrl) } suspend fun BookSource.exploreKinds(): List { - val exploreKindsKey = exploreKindsKey() + val exploreKindsKey = getExploreKindsKey() exploreKindsMap[exploreKindsKey]?.let { return it } val exploreUrl = exploreUrl if (exploreUrl.isNullOrBlank()) { @@ -30,7 +30,7 @@ suspend fun BookSource.exploreKinds(): List { } val mutex = mutexMap[bookSourceUrl] ?: Mutex().apply { mutexMap[bookSourceUrl] = this } mutex.withLock { - exploreKindsMap[exploreKindsKey()]?.let { return it } + exploreKindsMap[exploreKindsKey]?.let { return it } val kinds = arrayListOf() var ruleStr: String = exploreUrl withContext(Dispatchers.IO) { @@ -72,6 +72,6 @@ suspend fun BookSource.exploreKinds(): List { suspend fun BookSource.clearExploreKindsCache() { withContext(Dispatchers.IO) { aCache.remove(bookSourceUrl) - exploreKindsMap.remove(exploreKindsKey()) + exploreKindsMap.remove(getExploreKindsKey()) } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/help/source/RssSourceExtensions.kt b/app/src/main/java/io/legado/app/help/source/RssSourceExtensions.kt index e7332ad34..e181de0e2 100644 --- a/app/src/main/java/io/legado/app/help/source/RssSourceExtensions.kt +++ b/app/src/main/java/io/legado/app/help/source/RssSourceExtensions.kt @@ -8,13 +8,13 @@ import kotlinx.coroutines.withContext private val aCache by lazy { ACache.get("rssSortUrl") } -private fun RssSource.sortUrlsKey(): String { +private fun RssSource.getSortUrlsKey(): String { return MD5Utils.md5Encode(sourceUrl + sortUrl) } suspend fun RssSource.sortUrls(): List> = arrayListOf>().apply { - val sortUrlsKey = sortUrlsKey() + val sortUrlsKey = getSortUrlsKey() withContext(Dispatchers.IO) { kotlin.runCatching { var a = sortUrl @@ -46,6 +46,6 @@ suspend fun RssSource.sortUrls(): List> = suspend fun RssSource.removeSortCache() { withContext(Dispatchers.IO) { - aCache.remove(sortUrlsKey()) + aCache.remove(getSortUrlsKey()) } } \ No newline at end of file