SheWhoReignsSupreme/GoonManager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(PatchingScreenModel): handle patch runner errors & cancellations properly

Browse source
This commit is contained in:
rushiiMachine 2024-08-03 23:26:16 -07:00
parent 3cd27f7c9c
commit cb7bb308d0
No known key found for this signature in database
GPG key ID: DCBE5952BB3B6420
1 changed files with 42 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenModel.kt
View file

@ -119,64 +119,57 @@ class PatchingScreenModel(
startTime = Date()
mutableState.value = PatchingScreenState.Working
val newJob = screenModelScope.launch {
val runner = KotlinPatchRunner(options)
.also { stepRunner = it }
// Bind InstallStep's GPP Warning state to this
runner.getStep<InstallStep>(completed = false)
.gppWarningLock
.take(1) // Take only the initially trigger value
.onEach { showGppWarning = true }
.launchIn(this@launch)
steps = runner.steps.groupBy { it.group }
.mapValues { it.value.toUnsafeImmutable() }
.toUnsafeImmutable()
// Intentionally delay to show the state change of the first step in UI when it runs
// without it, on a fast internet it just immediately shows as "Success"
delay(600)
// Execute all the steps and catch any errors
when (val error = runner.executeAll()) {
null -> {
// If install step is marked skipped then the installation was manually aborted
// and if so, immediately close install screen
if (runner.getStep<InstallStep>().state == StepState.Skipped) {
mutableState.value = PatchingScreenState.CloseScreen
}
// At this point, the installation has successfully completed
else {
mutableState.value = PatchingScreenState.Success
}
}
else -> {
Log.e(BuildConfig.TAG, "Failed to perform installation process", error)
mutableState.value = PatchingScreenState.Failed(failureLog = getFailureInfo(error))
}
runnerJob = screenModelScope.launch {
try {
startPatchRunner()
} catch (_: CancellationException) {
Log.w(BuildConfig.TAG, "Installation was cancelled before completion")
mutableState.value = PatchingScreenState.CloseScreen
} catch (error: Throwable) {
Log.e(BuildConfig.TAG, "Failed to orchestrate patch runner", error)
mutableState.value = PatchingScreenState.Failed(failureLog = getFailureInfo(error))
}
}
}
newJob.invokeOnCompletion { error ->
when (error) {
// Successfully executed, already handled above
null -> {}
private suspend fun startPatchRunner() {
val runner = KotlinPatchRunner(options)
.also { stepRunner = it }
// Job was cancelled before being able to finish setting state
is CancellationException -> {
Log.w(BuildConfig.TAG, "Installation was cancelled before completing", error)
// Bind InstallStep's GPP Warning state to this
runner.getStep<InstallStep>(completed = false)
.gppWarningLock
.take(1) // Take only the initially trigger value
.onEach { showGppWarning = true }
.launchIn(CoroutineScope(currentCoroutineContext()))
steps = runner.steps.groupBy { it.group }
.mapValues { it.value.toUnsafeImmutable() }
.toUnsafeImmutable()
// Intentionally delay to show the state change of the first step in UI when it runs
// without it, on a fast internet it just immediately shows as "Success"
delay(600)
// Execute all the steps and catch any errors
when (val error = runner.executeAll()) {
null -> {
// If install step is marked skipped then the installation was manually aborted
// and if so, immediately close install screen
if (runner.getStep<InstallStep>().state == StepState.Skipped) {
mutableState.value = PatchingScreenState.CloseScreen
}
// At this point, the installation has successfully completed
else {
mutableState.value = PatchingScreenState.Success
}
}
// This should never happen, all install errors are caught
else -> throw error
else -> {
Log.e(BuildConfig.TAG, "Failed to perform installation process", error)
mutableState.value = PatchingScreenState.Failed(failureLog = getFailureInfo(error))
}
}
runnerJob = newJob
}
private suspend fun getFailureInfo(stacktrace: Throwable): String {