Simplify installExtension

This commit is contained in:
Syer10
2026-07-12 23:47:08 -04:00
parent a830782b4b
commit c84ab6e426

View File

@@ -87,27 +87,22 @@ object Extension {
} ?: throw NullPointerException("Could not find extension for $pkgName") } ?: throw NullPointerException("Could not find extension for $pkgName")
val jarUrl = extension[ExtensionTable.jarUrl] val jarUrl = extension[ExtensionTable.jarUrl]
val apkUrl = extension[ExtensionTable.apkUrl] val apkUrl = extension[ExtensionTable.apkUrl]
val fetchToTemp: suspend (String) -> Path = { url ->
val name = Uri.parse(jarUrl).lastPathSegment!!
val savePath = Path(applicationDirs.tempRoot) / "extensions" / name
// download jar file
downloadExtension(url, savePath)
savePath
}
return when { return when {
jarUrl != null -> { jarUrl != null -> {
installJAR { installJAR { fetchToTemp(jarUrl) }
val jarName = Uri.parse(jarUrl).lastPathSegment!!
val jarSavePath = Path(applicationDirs.tempRoot) / "extensions" / jarName
// download jar file
downloadExtension(jarUrl, jarSavePath)
jarSavePath
}
} }
apkUrl != null -> { apkUrl != null -> {
installAPK { installAPK { fetchToTemp(apkUrl) }
val apkName = Uri.parse(apkUrl).lastPathSegment!!
val apkSavePath = Path(applicationDirs.tempRoot) / "extensions" / apkName
// download apk file
downloadExtension(apkUrl, apkSavePath)
apkSavePath
}
} }
else -> { else -> {