From 546bbfcbe5233b9e3bd0dc90060d9bb8176d759d Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Wed, 11 Nov 2026 05:53:28 +0000 Subject: [PATCH] refactor(speech): remove each model folder's leftovers in one loop on delete --- src/main/speech/model-manager.ts | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/speech/model-manager.ts b/src/main/speech/model-manager.ts index 9fbd9fc4596..f6d264d9ca1 100644 --- a/src/main/speech/model-manager.ts +++ b/src/main/speech/model-manager.ts @@ -239,21 +239,17 @@ export class ModelManager extends SpeechModelDownloadTransport { this.cancelDownload(modelId) // A swap already under way ignores cancel; deleting mid-swap could race its restore. await download?.settled - const modelDir = this.getModelDir(modelId) - if (existsSync(modelDir)) { - await rm(modelDir, { recursive: true, force: true }) - } - await rm(`${modelDir}.partial`, { recursive: true, force: true }) - await rm(previousSpeechModelDir(modelDir), { recursive: true, force: true }) - await rm(join(this.modelsDir, `${modelId}.tar.bz2`), { force: true }) // Remove the migration source too or next launch resurrects the model. + const modelDirs = [this.getModelDir(modelId)] if (this.migrationSourceDir) { - const sourceModelDir = this.getSafeModelDir(modelId, this.migrationSourceDir) - if (existsSync(sourceModelDir)) { - await rm(sourceModelDir, { recursive: true, force: true }) - } - await rm(previousSpeechModelDir(sourceModelDir), { recursive: true, force: true }) + modelDirs.push(this.getSafeModelDir(modelId, this.migrationSourceDir)) } + for (const modelDir of modelDirs) { + for (const path of [modelDir, `${modelDir}.partial`, previousSpeechModelDir(modelDir)]) { + await rm(path, { recursive: true, force: true }) + } + } + await rm(join(this.modelsDir, `${modelId}.tar.bz2`), { force: true }) this.modelStates.delete(modelId) }