copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

fix: separate same-name extension's installing status from different repos (#295)

Browse source
This commit is contained in:
Tran M. Cuong 2024-08-26 13:27:56 +07:00 committed by GitHub
parent 228abc31c4
commit a876742d74
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
View file

@ -291,7 +291,12 @@ class ExtensionManager(
}
fun cancelInstallUpdateExtension(extension: Extension) {
installer.cancelInstall(extension.pkgName)
installer.cancelInstall(
extension.pkgName +
// KMK -->
":${extension.signatureHash}",
// KMK <--
)
}
/**

7
app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt
View file

@ -69,7 +69,10 @@ internal class ExtensionInstaller(private val context: Context) {
* @param extension The extension to install.
*/
fun downloadAndInstall(url: String, extension: Extension): Flow<InstallStep> {
val pkgName = extension.pkgName
val pkgName = extension.pkgName +
// KMK -->
":${extension.signatureHash}"
// KMK <--
val oldDownload = activeDownloads[pkgName]
if (oldDownload != null) {
@ -236,7 +239,7 @@ internal class ExtensionInstaller(private val context: Context) {
/**
* Deletes the download for the given package name.
*
* @param pkgName The package name of the download to delete.
* @param pkgName The package name of the download to delete together with its signature.
*/
private fun deleteDownload(pkgName: String) {
val downloadId = activeDownloads.remove(pkgName)

29
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionsScreenModel.kt
View file

@ -48,7 +48,15 @@ class ExtensionsScreenModel(
val context = Injekt.get<Application>()
val extensionMapper: (Map<String, InstallStep>) -> ((Extension) -> ExtensionUiModel.Item) = { map ->
{
ExtensionUiModel.Item(it, map[it.pkgName] ?: InstallStep.Idle)
ExtensionUiModel.Item(
it,
map[
it.pkgName +
// KMK -->
":${it.signatureHash}",
// KMK <--
] ?: InstallStep.Idle,
)
}
}
val queryFilter: (String) -> ((Extension) -> Boolean) = { query ->
@ -193,11 +201,26 @@ class ExtensionsScreenModel(
}
private fun addDownloadState(extension: Extension, installStep: InstallStep) {
currentDownloads.update { it + Pair(extension.pkgName, installStep) }
currentDownloads.update {
it + Pair(
extension.pkgName +
// KMK -->
":${extension.signatureHash}",
// KMK <--
installStep,
)
}
}
private fun removeDownloadState(extension: Extension) {
currentDownloads.update { it - extension.pkgName }
currentDownloads.update {
it - (
extension.pkgName +
// KMK -->
":${extension.signatureHash}"
// KMK <--
)
}
}
private suspend fun Flow<InstallStep>.collectToInstallUpdate(extension: Extension) =