github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

DownloadCache: Fix freezing on initial loading of cache file (#9523)

Browse source
This commit is contained in:
Ivan Iskandar 2023-05-20 09:06:06 +07:00 committed by GitHub
parent c27bf4e866
commit 73118d4af7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
View file

@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.onStart
import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.coroutines.flow.shareIn import kotlinx.coroutines.flow.shareIn
import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withTimeoutOrNull import kotlinx.coroutines.withTimeoutOrNull
@ -96,7 +96,7 @@ class DownloadCache(
get() = File(context.cacheDir, "dl_index_cache") get() = File(context.cacheDir, "dl_index_cache")
private val rootDownloadsDirLock = Mutex() private val rootDownloadsDirLock = Mutex()
private var rootDownloadsDir: RootDirectory private var rootDownloadsDir = RootDirectory(getDirectoryFromPreference())
init { init {
downloadPreferences.downloadsDirectory().changes() downloadPreferences.downloadsDirectory().changes()
@ -106,20 +106,20 @@ class DownloadCache(
} }
.launchIn(scope) .launchIn(scope)
rootDownloadsDir = runBlocking(Dispatchers.IO) { // Attempt to read cache file
scope.launch {
rootDownloadsDirLock.withLock {
try { try {
val diskCache = diskCacheFile.inputStream().use { val diskCache = diskCacheFile.inputStream().use {
ProtoBuf.decodeFromByteArray<RootDirectory>(it.readBytes()) ProtoBuf.decodeFromByteArray<RootDirectory>(it.readBytes())
} }
lastRenew = 1 // Just so that the banner won't show up rootDownloadsDir = diskCache
diskCache lastRenew = System.currentTimeMillis()
} catch (e: Throwable) { } catch (e: Throwable) {
diskCacheFile.delete() diskCacheFile.delete()
null
} }
} ?: RootDirectory(getDirectoryFromPreference()) }
}
notifyChanges()
} }
/** /**