From 426c073d5fbe945fcf2a2e03eeb68ff593363e49 Mon Sep 17 00:00:00 2001 From: jj Date: Fri, 16 May 2025 14:58:23 +0000 Subject: [PATCH] web/queue: move error() out of createSavePipeline closure --- web/src/lib/task-manager/queue.ts | 39 ++++++++++++++++--------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/web/src/lib/task-manager/queue.ts b/web/src/lib/task-manager/queue.ts index 8a4aad3e..b1be95b7 100644 --- a/web/src/lib/task-manager/queue.ts +++ b/web/src/lib/task-manager/queue.ts @@ -109,28 +109,28 @@ const makeGifArgs = () => { ]; } +const showError = (errorCode: string) => { + return createDialog({ + id: "pipeline-error", + type: "small", + meowbalt: "error", + buttons: [ + { + text: get(t)("button.gotit"), + main: true, + action: () => {}, + }, + ], + bodyText: get(t)(`error.${errorCode}`), + }); +} + export const createSavePipeline = (info: CobaltLocalProcessingResponse, request: CobaltSaveRequestBody) => { // this is a pre-queue part of processing, // so errors have to be returned via a regular dialog - const error = (errorCode: string) => { - return createDialog({ - id: "pipeline-error", - type: "small", - meowbalt: "error", - buttons: [ - { - text: get(t)("button.gotit"), - main: true, - action: () => {}, - }, - ], - bodyText: get(t)(`error.${errorCode}`), - }); - } - if (!info.output?.filename || !info.output?.type) { - return error("pipeline.missing_response_data"); + return showError("pipeline.missing_response_data"); } const parentId = crypto.randomUUID(); @@ -160,7 +160,7 @@ export const createSavePipeline = (info: CobaltLocalProcessingResponse, request: const args = makeAudioArgs(info); if (!args) { - return error("pipeline.missing_response_data"); + return showError("pipeline.missing_response_data"); } workerType = "encode"; @@ -169,7 +169,8 @@ export const createSavePipeline = (info: CobaltLocalProcessingResponse, request: workerType = "encode"; ffargs = makeGifArgs(); } else { - throw new Error("unknown work type: " + info.type); + console.error("unknown work type: " + info.type); + return showError("pipeline.missing_response_data"); } pipeline.push({