Mirrors/cobalt
1
0
Fork 0
mirror of https://github.com/wukko/cobalt.git synced 2025-05-24 18:42:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

web/queue: more uuid refactoring

Browse Source
This commit is contained in:
jj 2025-05-23 17:37:04 +00:00
parent 47683cecec
commit 17bcfa3a03
No known key found for this signature in database
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/components/queue/ProcessingQueueItem.svelte
View File

@ -9,7 +9,7 @@
import { queueVisible } from "$lib/state/queue-visibility"; import { queueVisible } from "$lib/state/queue-visibility";
import { currentTasks } from "$lib/state/task-manager/current-tasks"; 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 type { CobaltCurrentTasks } from "$lib/types/task-manager";
import ProgressBar from "$components/queue/ProgressBar.svelte"; import ProgressBar from "$components/queue/ProgressBar.svelte";
@ -32,7 +32,7 @@
}; };
type Props = { type Props = {
id: string; id: UUID;
info: CobaltQueueItem; 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)) { if (item.state === 'running' && item.completedWorkers.has(workerId)) {
return 100; return 100;
} }

3
web/src/components/queue/ProgressBar.svelte
View File

@ -1,9 +1,10 @@
<script lang="ts"> <script lang="ts">
import Skeleton from "$components/misc/Skeleton.svelte"; import Skeleton from "$components/misc/Skeleton.svelte";
import type { UUID } from "$lib/types/queue";
type Props = { type Props = {
percentage?: number; percentage?: number;
workerId: string; workerId: UUID;
completedWorkers: Set<string>; completedWorkers: Set<string>;
} }

12
web/src/lib/state/task-manager/queue.ts
View File

@ -4,7 +4,7 @@ import { schedule } from "$lib/task-manager/scheduler";
import { clearFileStorage, removeFromFileStorage } from "$lib/storage/opfs"; import { clearFileStorage, removeFromFileStorage } from "$lib/storage/opfs";
import { clearCurrentTasks, removeWorkerFromQueue } from "$lib/state/task-manager/current-tasks"; 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) => { const clearPipelineCache = (queueItem: CobaltQueueItem) => {
if (queueItem.state === "running") { if (queueItem.state === "running") {
@ -35,7 +35,7 @@ export function addItem(item: CobaltQueueItem) {
schedule(); schedule();
} }
export function itemError(id: string, workerId: string, error: string) { export function itemError(id: UUID, workerId: UUID, error: string) {
update(queueData => { update(queueData => {
if (queueData[id]) { if (queueData[id]) {
queueData[id] = clearPipelineCache(queueData[id]); queueData[id] = clearPipelineCache(queueData[id]);
@ -53,7 +53,7 @@ export function itemError(id: string, workerId: string, error: string) {
schedule(); schedule();
} }
export function itemDone(id: string, file: File) { export function itemDone(id: UUID, file: File) {
update(queueData => { update(queueData => {
if (queueData[id]) { if (queueData[id]) {
queueData[id] = clearPipelineCache(queueData[id]); queueData[id] = clearPipelineCache(queueData[id]);
@ -70,7 +70,7 @@ export function itemDone(id: string, file: File) {
schedule(); schedule();
} }
export function pipelineTaskDone(id: string, workerId: string, file: File) { export function pipelineTaskDone(id: UUID, workerId: UUID, file: File) {
update(queueData => { update(queueData => {
const item = queueData[id]; const item = queueData[id];
@ -86,7 +86,7 @@ export function pipelineTaskDone(id: string, workerId: string, file: File) {
schedule(); schedule();
} }
export function itemRunning(id: string) { export function itemRunning(id: UUID) {
update(queueData => { update(queueData => {
const data = queueData[id] as CobaltQueueItemRunning; const data = queueData[id] as CobaltQueueItemRunning;
@ -102,7 +102,7 @@ export function itemRunning(id: string) {
schedule(); schedule();
} }
export function removeItem(id: string) { export function removeItem(id: UUID) {
update(queueData => { update(queueData => {
const item = queueData[id]; const item = queueData[id];

4
web/src/lib/task-manager/runners/fetch.ts
View File

@ -4,9 +4,9 @@ import { killWorker } from "$lib/task-manager/run-worker";
import { updateWorkerProgress } from "$lib/state/task-manager/current-tasks"; import { updateWorkerProgress } from "$lib/state/task-manager/current-tasks";
import { pipelineTaskDone, itemError, queue } from "$lib/state/task-manager/queue"; 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 worker = new FetchWorker();
const unsubscribe = queue.subscribe((queue: CobaltQueue) => { const unsubscribe = queue.subscribe((queue: CobaltQueue) => {