yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 2 Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2022-09-20 14:01:50 +08:00
parent 35a63482d0
commit 77ef97c072
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt
+4 -4
View File
@@ -17,12 +17,12 @@ private val mutexMap by lazy { hashMapOf<String, Mutex>() }
private val exploreKindsMap by lazy { ConcurrentHashMap<String, List<ExploreKind>>() } private val exploreKindsMap by lazy { ConcurrentHashMap<String, List<ExploreKind>>() }
private val aCache by lazy { ACache.get("explore") } private val aCache by lazy { ACache.get("explore") }
private fun BookSource.exploreKindsKey(): String { private fun BookSource.getExploreKindsKey(): String {
return MD5Utils.md5Encode(bookSourceUrl + exploreUrl) return MD5Utils.md5Encode(bookSourceUrl + exploreUrl)
} }
suspend fun BookSource.exploreKinds(): List<ExploreKind> { suspend fun BookSource.exploreKinds(): List<ExploreKind> {
val exploreKindsKey = exploreKindsKey() val exploreKindsKey = getExploreKindsKey()
exploreKindsMap[exploreKindsKey]?.let { return it } exploreKindsMap[exploreKindsKey]?.let { return it }
val exploreUrl = exploreUrl val exploreUrl = exploreUrl
if (exploreUrl.isNullOrBlank()) { if (exploreUrl.isNullOrBlank()) {
@@ -30,7 +30,7 @@ suspend fun BookSource.exploreKinds(): List<ExploreKind> {
} }
val mutex = mutexMap[bookSourceUrl] ?: Mutex().apply { mutexMap[bookSourceUrl] = this } val mutex = mutexMap[bookSourceUrl] ?: Mutex().apply { mutexMap[bookSourceUrl] = this }
mutex.withLock { mutex.withLock {
exploreKindsMap[exploreKindsKey()]?.let { return it } exploreKindsMap[exploreKindsKey]?.let { return it }
val kinds = arrayListOf<ExploreKind>() val kinds = arrayListOf<ExploreKind>()
var ruleStr: String = exploreUrl var ruleStr: String = exploreUrl
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
@@ -72,6 +72,6 @@ suspend fun BookSource.exploreKinds(): List<ExploreKind> {
suspend fun BookSource.clearExploreKindsCache() { suspend fun BookSource.clearExploreKindsCache() {
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
aCache.remove(bookSourceUrl) aCache.remove(bookSourceUrl)
exploreKindsMap.remove(exploreKindsKey()) exploreKindsMap.remove(getExploreKindsKey())
} }
} }
app/src/main/java/io/legado/app/help/source/RssSourceExtensions.kt
+3 -3
View File
@@ -8,13 +8,13 @@ import kotlinx.coroutines.withContext
private val aCache by lazy { ACache.get("rssSortUrl") } private val aCache by lazy { ACache.get("rssSortUrl") }
private fun RssSource.sortUrlsKey(): String { private fun RssSource.getSortUrlsKey(): String {
return MD5Utils.md5Encode(sourceUrl + sortUrl) return MD5Utils.md5Encode(sourceUrl + sortUrl)
} }
suspend fun RssSource.sortUrls(): List<Pair<String, String>> = suspend fun RssSource.sortUrls(): List<Pair<String, String>> =
arrayListOf<Pair<String, String>>().apply { arrayListOf<Pair<String, String>>().apply {
val sortUrlsKey = sortUrlsKey() val sortUrlsKey = getSortUrlsKey()
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
kotlin.runCatching { kotlin.runCatching {
var a = sortUrl var a = sortUrl
@@ -46,6 +46,6 @@ suspend fun RssSource.sortUrls(): List<Pair<String, String>> =
suspend fun RssSource.removeSortCache() { suspend fun RssSource.removeSortCache() {
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
aCache.remove(sortUrlsKey()) aCache.remove(getSortUrlsKey())
} }
} }