Cache loadSource
This commit is contained in:
@@ -26,8 +26,12 @@ import android.graphics.drawable.Drawable
|
|||||||
import androidx.compose.runtime.*
|
import androidx.compose.runtime.*
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import dalvik.system.PathClassLoader
|
import dalvik.system.PathClassLoader
|
||||||
|
import kotlinx.coroutines.coroutineScope
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
|
import kotlinx.coroutines.sync.Mutex
|
||||||
|
import kotlinx.coroutines.sync.withLock
|
||||||
import xyz.quaver.pupil.sources.core.Source
|
import xyz.quaver.pupil.sources.core.Source
|
||||||
|
import java.util.concurrent.ConcurrentHashMap
|
||||||
|
|
||||||
private const val SOURCES_FEATURE = "pupil.sources"
|
private const val SOURCES_FEATURE = "pupil.sources"
|
||||||
private const val SOURCES_PACKAGE_PREFIX = "xyz.quaver.pupil.sources"
|
private const val SOURCES_PACKAGE_PREFIX = "xyz.quaver.pupil.sources"
|
||||||
@@ -77,12 +81,19 @@ fun loadSource(context: Context, packageInfo: PackageInfo): List<SourceEntry> {
|
|||||||
}.orEmpty()
|
}.orEmpty()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun loadSource(context: Context, sourceEntry: SourceEntry): Source {
|
private val sourceCacheMutex = Mutex()
|
||||||
val classLoader = PathClassLoader(sourceEntry.sourceDir, null, context.classLoader)
|
private val sourceCache = mutableMapOf<String, Source>()
|
||||||
|
|
||||||
return Class.forName("${sourceEntry.packagePath}${sourceEntry.sourcePath}", false, classLoader)
|
suspend fun loadSource(context: Context, sourceEntry: SourceEntry): Source = coroutineScope {
|
||||||
.getConstructor(Application::class.java)
|
sourceCacheMutex.withLock {
|
||||||
.newInstance(context.applicationContext) as Source
|
sourceCache[sourceEntry.packageName] ?: run {
|
||||||
|
val classLoader = PathClassLoader(sourceEntry.sourceDir, null, context.classLoader)
|
||||||
|
|
||||||
|
Class.forName("${sourceEntry.packagePath}${sourceEntry.sourcePath}", false, classLoader)
|
||||||
|
.getConstructor(Application::class.java)
|
||||||
|
.newInstance(context.applicationContext) as Source
|
||||||
|
}.also { sourceCache[sourceEntry.packageName] = it }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun updateSources(context: Context): List<SourceEntry> {
|
fun updateSources(context: Context): List<SourceEntry> {
|
||||||
|
|||||||
Reference in New Issue
Block a user