best way to save what you love
Svelte collaborationdownloaderinstagramjavascriptmusicredditsocial-mediasoundcloudsveltetiktoktwittertypescriptvideovimeovkwebappyoutubeyoutube-downloader
web/queue: more uuid refactoring
jj17bcfa3a03d9
diff --git a/web/src/components/queue/ProcessingQueueItem.svelte b/web/src/components/queue/ProcessingQueueItem.svelteindex 2bcf57e1..1535d7c5 100644--- a/web/src/components/queue/ProcessingQueueItem.svelte+++ b/web/src/components/queue/ProcessingQueueItem.svelte@@ -9,7 +9,7 @@import { queueVisible } from "$lib/state/queue-visibility";import { currentTasks } from "$lib/state/task-manager/current-tasks";- import type { CobaltQueueItem } from "$lib/types/queue";+ import type { CobaltQueueItem, UUID } from "$lib/types/queue";import type { CobaltCurrentTasks } from "$lib/types/task-manager";import ProgressBar from "$components/queue/ProgressBar.svelte";@@ -32,7 +32,7 @@};type Props = {- id: string;+ id: UUID;info: CobaltQueueItem;}@@ -133,7 +133,7 @@}};- const getWorkerProgress = (item: CobaltQueueItem, workerId: string): number | undefined => {+ const getWorkerProgress = (item: CobaltQueueItem, workerId: UUID): number | undefined => {if (item.state === 'running' && item.completedWorkers.has(workerId)) {return 100;}diff --git a/web/src/components/queue/ProgressBar.svelte b/web/src/components/queue/ProgressBar.svelteindex 64289a81..138f1fe7 100644--- a/web/src/components/queue/ProgressBar.svelte+++ b/web/src/components/queue/ProgressBar.svelte@@ -1,9 +1,10 @@<script lang="ts">import Skeleton from "$components/misc/Skeleton.svelte";+ import type { UUID } from "$lib/types/queue";type Props = {percentage?: number;- workerId: string;+ workerId: UUID;completedWorkers: Set<string>;}diff --git a/web/src/lib/state/task-manager/queue.ts b/web/src/lib/state/task-manager/queue.tsindex 098d2f76..7f16eb8d 100644--- a/web/src/lib/state/task-manager/queue.ts+++ b/web/src/lib/state/task-manager/queue.ts@@ -4,7 +4,7 @@ import { schedule } from "$lib/task-manager/scheduler";import { clearFileStorage, removeFromFileStorage } from "$lib/storage/opfs";import { clearCurrentTasks, removeWorkerFromQueue } from "$lib/state/task-manager/current-tasks";-import type { CobaltQueue, CobaltQueueItem, CobaltQueueItemRunning } from "$lib/types/queue";+import type { CobaltQueue, CobaltQueueItem, CobaltQueueItemRunning, UUID } from "$lib/types/queue";const clearPipelineCache = (queueItem: CobaltQueueItem) => {if (queueItem.state === "running") {@@ -35,7 +35,7 @@ export function addItem(item: CobaltQueueItem) {schedule();}-export function itemError(id: string, workerId: string, error: string) {+export function itemError(id: UUID, workerId: UUID, error: string) {update(queueData => {if (queueData[id]) {queueData[id] = clearPipelineCache(queueData[id]);@@ -53,7 +53,7 @@ export function itemError(id: string, workerId: string, error: string) {schedule();}-export function itemDone(id: string, file: File) {+export function itemDone(id: UUID, file: File) {update(queueData => {if (queueData[id]) {queueData[id] = clearPipelineCache(queueData[id]);@@ -70,7 +70,7 @@ export function itemDone(id: string, file: File) {schedule();}-export function pipelineTaskDone(id: string, workerId: string, file: File) {+export function pipelineTaskDone(id: UUID, workerId: UUID, file: File) {update(queueData => {const item = queueData[id];@@ -86,7 +86,7 @@ export function pipelineTaskDone(id: string, workerId: string, file: File) {schedule();}-export function itemRunning(id: string) {+export function itemRunning(id: UUID) {update(queueData => {const data = queueData[id] as CobaltQueueItemRunning;@@ -102,7 +102,7 @@ export function itemRunning(id: string) {schedule();}-export function removeItem(id: string) {+export function removeItem(id: UUID) {update(queueData => {const item = queueData[id];diff --git a/web/src/lib/task-manager/runners/fetch.ts b/web/src/lib/task-manager/runners/fetch.tsindex 49e76ecb..1da004ad 100644--- a/web/src/lib/task-manager/runners/fetch.ts+++ b/web/src/lib/task-manager/runners/fetch.ts@@ -4,9 +4,9 @@ import { killWorker } from "$lib/task-manager/run-worker";import { updateWorkerProgress } from "$lib/state/task-manager/current-tasks";import { pipelineTaskDone, itemError, queue } from "$lib/state/task-manager/queue";-import type { CobaltQueue } from "$lib/types/queue";+import type { CobaltQueue, UUID } from "$lib/types/queue";-export const runFetchWorker = async (workerId: string, parentId: string, url: string) => {+export const runFetchWorker = async (workerId: UUID, parentId: UUID, url: string) => {const worker = new FetchWorker();const unsubscribe = queue.subscribe((queue: CobaltQueue) => {