Skip to content

best way to save what you love

web/queue: clear files from storage when needed

wukko50df95b2127b
diff --git a/web/src/lib/state/queen-bee/queue.ts b/web/src/lib/state/queen-bee/queue.ts
index 5151551b..e6016297 100644
--- a/web/src/lib/state/queen-bee/queue.ts
+++ b/web/src/lib/state/queen-bee/queue.ts
@@ -1,10 +1,23 @@
import { readable, type Updater } from "svelte/store";
+
import { checkTasks } from "$lib/queen-bee/scheduler";
+import { clearFileStorage, removeFromFileStorage } from "$lib/storage";
import { clearCurrentTasks, removeWorkerFromQueue } from "$lib/state/queen-bee/current-tasks";
import type { CobaltFileReference } from "$lib/types/storage";
import type { CobaltQueue, CobaltQueueItem } from "$lib/types/queue";
+const clearPipelineCache = (queueItem: CobaltQueueItem) => {
+ if (queueItem.state === "running" && queueItem.pipelineResults) {
+ for (const item of queueItem.pipelineResults) {
+ removeFromFileStorage(item.file.name);
+ }
+ delete queueItem.pipelineResults;
+ }
+
+ return queueItem;
+}
+
let update: (_: Updater<CobaltQueue>) => void;
const queue = readable<CobaltQueue>(
@@ -24,9 +37,7 @@ export function addItem(item: CobaltQueueItem) {
export function itemError(id: string, workerId: string, error: string) {
update(queueData => {
if (queueData[id]) {
- if (queueData[id].state === "running" && queueData[id].pipelineResults) {
- delete queueData[id].pipelineResults;
- }
+ queueData[id] = clearPipelineCache(queueData[id]);
queueData[id] = {
...queueData[id],
@@ -44,9 +55,7 @@ export function itemError(id: string, workerId: string, error: string) {
export function itemDone(id: string, file: CobaltFileReference) {
update(queueData => {
if (queueData[id]) {
- if (queueData[id].state === "running" && queueData[id].pipelineResults) {
- delete queueData[id].pipelineResults;
- }
+ queueData[id] = clearPipelineCache(queueData[id]);
queueData[id] = {
...queueData[id],
@@ -93,6 +102,7 @@ export function removeItem(id: string) {
for (const worker in queueData[id].pipeline) {
removeWorkerFromQueue(queueData[id].pipeline[worker].workerId);
}
+ clearPipelineCache(queueData[id]);
delete queueData[id];
return queueData;
@@ -107,6 +117,7 @@ export function clearQueue() {
});
clearCurrentTasks();
+ clearFileStorage();
}
export { queue };
diff --git a/web/src/lib/storage.ts b/web/src/lib/storage.ts
index 68a5982c..cae26e79 100644
--- a/web/src/lib/storage.ts
+++ b/web/src/lib/storage.ts
@@ -1,3 +1,5 @@
+const cobaltProcessingDir = "cobalt-processing-data";
+
export class OPFSStorage {
#root;
#handle;
@@ -11,7 +13,7 @@ export class OPFSStorage {
static async init() {
const root = await navigator.storage.getDirectory();
- const cobaltDir = await root.getDirectoryHandle('cobalt-processing-data', { create: true });
+ const cobaltDir = await root.getDirectoryHandle(cobaltProcessingDir, { create: true });
const handle = await cobaltDir.getFileHandle(crypto.randomUUID(), { create: true });
const reader = await handle.createSyncAccessHandle();
@@ -33,13 +35,7 @@ export class OPFSStorage {
}
async write(data: Uint8Array | Int8Array, offset: number) {
- const writ = this.#io.write(data, { at: offset });
-
- if (data.length !== writ) {
- console.log(data.length, writ);
- }
-
- return writ;
+ return this.#io.write(data, { at: offset })
}
async destroy() {
@@ -51,3 +47,14 @@ export class OPFSStorage {
}
}
+export const removeFromFileStorage = async (filename: string) => {
+ const root = await navigator.storage.getDirectory();
+ const cobaltDir = await root.getDirectoryHandle(cobaltProcessingDir);
+ return await cobaltDir.removeEntry(filename);
+}
+
+export const clearFileStorage = async () => {
+ const root = await navigator.storage.getDirectory();
+ return await root.removeEntry(cobaltProcessingDir, { recursive: true });
+}
+