Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
Jobobby04 2022-12-17 23:33:56 -05:00
parent 28d0353306
commit 33d5c08597
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt
View File

@ -11,6 +11,7 @@ import kotlinx.coroutines.NonCancellable
import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.cancelAndJoin import kotlinx.coroutines.cancelAndJoin
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.job
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex
@ -22,7 +23,6 @@ import java.io.FileNotFoundException
import java.io.InputStream import java.io.InputStream
import java.nio.ByteBuffer import java.nio.ByteBuffer
import kotlin.concurrent.thread import kotlin.concurrent.thread
import kotlin.coroutines.CoroutineContext
/** /**
* In memory Int -> Obj lookup table implementation that * In memory Int -> Obj lookup table implementation that
@ -36,7 +36,7 @@ class MemAutoFlushingLookupTable<T>(
file: File, file: File,
private val serializer: EntrySerializer<T>, private val serializer: EntrySerializer<T>,
private val debounceTimeMs: Long = 3000, private val debounceTimeMs: Long = 3000,
) : CoroutineScope, Closeable { ) : CoroutineScope by CoroutineScope(Dispatchers.IO + SupervisorJob()), Closeable {
/** /**
* The context of this scope. * The context of this scope.
* Context is encapsulated by the scope and used for implementation of coroutine builders that are extensions on the scope. * Context is encapsulated by the scope and used for implementation of coroutine builders that are extensions on the scope.
@ -44,8 +44,6 @@ class MemAutoFlushingLookupTable<T>(
* *
* By convention, should contain an instance of a [job][Job] to enforce structured concurrency. * By convention, should contain an instance of a [job][Job] to enforce structured concurrency.
*/ */
override val coroutineContext: CoroutineContext
get() = Dispatchers.IO + SupervisorJob()
private val table = SparseArray<T>(INITIAL_SIZE) private val table = SparseArray<T>(INITIAL_SIZE)
private val mutex = Mutex(true) private val mutex = Mutex(true)
@ -202,7 +200,7 @@ class MemAutoFlushingLookupTable<T>(
* @throws Exception if this resource cannot be closed * @throws Exception if this resource cannot be closed
*/ */
override fun close() { override fun close() {
runBlocking { coroutineContext[Job]?.cancelAndJoin() } runBlocking { coroutineContext.job.cancelAndJoin() }
Runtime.getRuntime().removeShutdownHook(shutdownHook) Runtime.getRuntime().removeShutdownHook(shutdownHook)
} }

2
app/src/main/java/exh/ui/metadata/MetadataViewScreenModel.kt
View File

@ -29,9 +29,7 @@ class MetadataViewScreenModel(
coroutineScope.launchIO { coroutineScope.launchIO {
_manga.value = getManga.await(mangaId) _manga.value = getManga.await(mangaId)
} }
}
init {
coroutineScope.launchIO { coroutineScope.launchIO {
val metadataSource = sourceManager.get(sourceId)?.getMainSource<MetadataSource<*, *>>() val metadataSource = sourceManager.get(sourceId)?.getMainSource<MetadataSource<*, *>>()
if (metadataSource == null) { if (metadataSource == null) {