Skip to content

best way to save what you love

web/workers: refactor and clean up types

jj76462ee66559
diff --git a/web/src/lib/types/task-manager.ts b/web/src/lib/types/task-manager.ts
index 6b6d6c53..56d099b0 100644
--- a/web/src/lib/types/task-manager.ts
+++ b/web/src/lib/types/task-manager.ts
@@ -1,7 +1,7 @@
-import type { CobaltWorkerProgress, CobaltWorkerType } from "$lib/types/workers";
+import type { CobaltPipelineItem, CobaltWorkerProgress } from "$lib/types/workers";
export type CobaltCurrentTaskItem = {
- type: CobaltWorkerType,
+ type: CobaltPipelineItem['worker'],
parentId: string,
progress?: CobaltWorkerProgress,
}
diff --git a/web/src/lib/types/workers.ts b/web/src/lib/types/workers.ts
index c69c95fe..8a2cbb5d 100644
--- a/web/src/lib/types/workers.ts
+++ b/web/src/lib/types/workers.ts
@@ -3,7 +3,6 @@ import type { CobaltFileReference } from "$lib/types/storage";
export const resultFileTypes = ["video", "audio", "image"] as const;
-export type CobaltWorkerType = "remux" | "fetch";
export type CobaltPipelineResultFileType = typeof resultFileTypes[number];
export type CobaltWorkerProgress = {
@@ -12,28 +11,32 @@ export type CobaltWorkerProgress = {
size: number,
}
-export type CobaltFetchWorkerArgs = { url: string };
-
-export type CobaltRemuxWorkerArgs = {
+type CobaltFFmpegWorkerArgs = {
files: CobaltFileReference[],
ffargs: string[],
output: FileInfo,
}
-export type CobaltPipelineItemBase = {
- worker: CobaltWorkerType,
+type CobaltPipelineItemBase = {
workerId: string,
parentId: string,
};
type CobaltRemuxPipelineItem = CobaltPipelineItemBase & {
worker: "remux",
- workerArgs: CobaltRemuxWorkerArgs,
+ workerArgs: CobaltFFmpegWorkerArgs,
+}
+
+type CobaltEncodePipelineItem = CobaltPipelineItemBase & {
+ worker: "encode",
+ workerArgs: CobaltFFmpegWorkerArgs,
}
type CobaltFetchPipelineItem = CobaltPipelineItemBase & {
worker: "fetch",
- workerArgs: CobaltFetchWorkerArgs,
+ workerArgs: { url: string },
}
-export type CobaltPipelineItem = CobaltRemuxPipelineItem | CobaltFetchPipelineItem;
+export type CobaltPipelineItem = CobaltEncodePipelineItem
+ | CobaltRemuxPipelineItem
+ | CobaltFetchPipelineItem;