@@ -56,7 +57,7 @@
{/each}
@@ -69,7 +70,9 @@
{/if}
{#if info.state === "running"}
- {(info.completedWorkers?.length || 0) + 1}/{info.pipeline.length}
+ {#if info.pipeline.length > 1}
+ {(info.completedWorkers?.length || 0) + 1}/{info.pipeline.length}
+ {/if}
{#if runningWorker && progress && progress.percentage}
{$t(`queue.state.running.${runningWorker.type}`)}: {Math.ceil(
progress.percentage
@@ -210,7 +213,7 @@
}
}
- @media(hover: none) {
+ @media (hover: none) {
.processing-info {
overflow: hidden;
flex: 1;
diff --git a/web/src/lib/queen-bee/queue.ts b/web/src/lib/queen-bee/queue.ts
index 141d800c..c1d0f8a4 100644
--- a/web/src/lib/queen-bee/queue.ts
+++ b/web/src/lib/queen-bee/queue.ts
@@ -35,7 +35,6 @@ export const createRemuxPipeline = (file: File) => {
type: file.type,
extension: file.name.split(".").pop(),
},
- filename: file.name,
},
}];
@@ -45,6 +44,7 @@ export const createRemuxPipeline = (file: File) => {
state: "waiting",
pipeline,
filename: file.name,
+ mimeType: file.type,
mediaType,
})
}
@@ -82,7 +82,6 @@ export const createSavePipeline = (info: CobaltLocalProcessingResponse) => {
type: mime.getType(info.filename) || undefined,
extension: info.filename.split(".").pop(),
},
- filename: info.filename,
},
})
@@ -91,6 +90,7 @@ export const createSavePipeline = (info: CobaltLocalProcessingResponse) => {
state: "waiting",
pipeline,
filename: info.filename,
+ mimeType: mime.getType(info.filename) || undefined,
mediaType: "video",
})
}
diff --git a/web/src/lib/queen-bee/run-worker.ts b/web/src/lib/queen-bee/run-worker.ts
index 47746806..4ee5f0b4 100644
--- a/web/src/lib/queen-bee/run-worker.ts
+++ b/web/src/lib/queen-bee/run-worker.ts
@@ -21,8 +21,7 @@ export const runRemuxWorker = async (
parentId: string,
files: CobaltFileReference[],
args: string[],
- output: FileInfo,
- filename: string
+ output: FileInfo
) => {
const worker = new RemuxWorker();
@@ -55,7 +54,6 @@ export const runRemuxWorker = async (
files,
args,
output,
- filename,
}
});
@@ -165,14 +163,13 @@ export const startWorker = async ({ worker, workerId, parentId, workerArgs }: Co
}
}
- if (files.length > 0 && workerArgs.ffargs && workerArgs.output && workerArgs.filename) {
+ if (files.length > 0 && workerArgs.ffargs && workerArgs.output) {
await runRemuxWorker(
workerId,
parentId,
files,
workerArgs.ffargs,
workerArgs.output,
- workerArgs.filename
);
}
break;
diff --git a/web/src/lib/types/queue.ts b/web/src/lib/types/queue.ts
index c09e0d6b..07edeaaa 100644
--- a/web/src/lib/types/queue.ts
+++ b/web/src/lib/types/queue.ts
@@ -9,6 +9,7 @@ export type CobaltQueueBaseItem = {
pipeline: CobaltPipelineItem[],
// TODO: metadata
filename: string,
+ mimeType?: string,
mediaType: CobaltPipelineResultFileType,
};
diff --git a/web/src/lib/types/workers.ts b/web/src/lib/types/workers.ts
index e42d8ba7..fdb8d341 100644
--- a/web/src/lib/types/workers.ts
+++ b/web/src/lib/types/workers.ts
@@ -17,7 +17,6 @@ export type CobaltWorkerArgs = {
url?: string,
ffargs?: string[],
output?: FileInfo,
- filename?: string,
}
export type CobaltPipelineItem = {
diff --git a/web/src/lib/workers/remux.ts b/web/src/lib/workers/remux.ts
index 1f3f6aff..9f2dc60e 100644
--- a/web/src/lib/workers/remux.ts
+++ b/web/src/lib/workers/remux.ts
@@ -27,7 +27,7 @@ const ff = new LibAVWrapper((progress) => {
ff.init();
-const remux = async (files: CobaltFileReference[], args: string[], output: FileInfo, filename: string) => {
+const remux = async (files: CobaltFileReference[], args: string[], output: FileInfo) => {
if (!(files && output && args)) return;
await ff.init();
@@ -86,8 +86,7 @@ const remux = async (files: CobaltFileReference[], args: string[], output: FileI
self.postMessage({
cobaltRemuxWorker: {
- render,
- filename
+ render
}
});
} catch (e) {
@@ -99,8 +98,8 @@ const remux = async (files: CobaltFileReference[], args: string[], output: FileI
self.onmessage = async (event: MessageEvent) => {
const ed = event.data.cobaltRemuxWorker;
if (ed) {
- if (ed.files && ed.args && ed.output && ed.filename) {
- await remux(ed.files, ed.args, ed.output, ed.filename);
+ if (ed.files && ed.args && ed.output) {
+ await remux(ed.files, ed.args, ed.output);
}
}
}