From ca6a78eaa196187c6f0e284ec657c9a73b57f9ff Mon Sep 17 00:00:00 2001 From: nullptr <62841684+not-nullptr@users.noreply.github.com> Date: Fri, 15 Nov 2024 12:18:14 +0000 Subject: [PATCH 1/2] feat: fix case-sensitivity (#28) * feat: testing nightly webhook * feat: add nightly label * chore: uguhhhh debug * fix: ?????? * fifiixxixifixiifixi * ???? * fix: hawk a tuah behind YOU * fix hawk tuah * test!! * sdfgsdgsdfg??? * oh no * fix: conversion casing --- src/lib/converters/vips.svelte.ts | 10 ++++++++-- src/lib/types/file.svelte.ts | 1 - src/routes/+page.svelte | 2 +- src/routes/convert/+page.svelte | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/lib/converters/vips.svelte.ts b/src/lib/converters/vips.svelte.ts index 639809c..bc91676 100644 --- a/src/lib/converters/vips.svelte.ts +++ b/src/lib/converters/vips.svelte.ts @@ -1,12 +1,16 @@ import { VertFile } from "$lib/types"; import { Converter } from "./converter.svelte"; -import VipsWorker from "$lib/workers/vips?worker"; +import VipsWorker from "$lib/workers/vips?worker&url"; import { browser } from "$app/environment"; import type { WorkerMessage, OmitBetterStrict } from "$lib/types"; import { log } from "$lib/logger"; export class VipsConverter extends Converter { - private worker: Worker = browser ? new VipsWorker() : null!; + private worker: Worker = browser + ? new Worker(VipsWorker, { + type: "module", + }) + : null!; private id = 0; public name = "libvips"; public ready = $state(false); @@ -35,8 +39,10 @@ export class VipsConverter extends Converter { super(); log(["converters", this.name], `created converter`); if (!browser) return; + log(["converters", this.name], `loading worker @ ${VipsWorker}`); this.worker.onmessage = (e) => { const message: WorkerMessage = e.data; + log(["converters", this.name], `received message ${message.type}`); if (message.type === "loaded") this.ready = true; }; } diff --git a/src/lib/types/file.svelte.ts b/src/lib/types/file.svelte.ts index d82d0ff..bcc2631 100644 --- a/src/lib/types/file.svelte.ts +++ b/src/lib/types/file.svelte.ts @@ -34,7 +34,6 @@ export class VertFile { } public async convert() { - console.log(this.converter); if (!this.converter) throw new Error("No converter found"); this.result = null; this.progress = 0; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 0c4d52f..5fd9a71 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -20,7 +20,7 @@ const from = "." + f.name.toLowerCase().split(".").slice(-1); const converter = converters.find((c) => - c.supportedFormats.includes(from), + c.supportedFormats.includes(from.toLowerCase()), ); if (!converter) resolve(); const to = diff --git a/src/routes/convert/+page.svelte b/src/routes/convert/+page.svelte index 24b19cf..77a8ddb 100644 --- a/src/routes/convert/+page.svelte +++ b/src/routes/convert/+page.svelte @@ -35,8 +35,8 @@ const file = files.files[i]; const converter = converters.find( (c) => - c.supportedFormats.includes(file.from) && - c.supportedFormats.includes(file.to), + c.supportedFormats.includes(file.from.toLowerCase()) && + c.supportedFormats.includes(file.to.toLowerCase()), ); if (!converter) throw new Error("No converter found"); required.push(converter); From 5bf7ed5f4fa793cc31e440dc18de739ac931b9cf Mon Sep 17 00:00:00 2001 From: not-nullptr Date: Fri, 15 Nov 2024 12:20:04 +0000 Subject: [PATCH 2/2] fix: further fix case sensitivity im not opening another merge request for this --- src/routes/convert/+page.svelte | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/routes/convert/+page.svelte b/src/routes/convert/+page.svelte index 77a8ddb..6b39205 100644 --- a/src/routes/convert/+page.svelte +++ b/src/routes/convert/+page.svelte @@ -280,7 +280,9 @@ {#each reversedFiles as file, i (file.id)} {@const converter = (() => { return converters.find((c) => - c.supportedFormats.includes(file.from), + c.supportedFormats.includes( + file.from.toLowerCase(), + ), ); })()}
- {#if converter && converter.supportedFormats.includes(file.from)} + {#if converter && converter.supportedFormats.includes(file.from.toLowerCase())} from
- {#if converter && converter.supportedFormats.includes(file.from)} + {#if converter && converter.supportedFormats.includes(file.from.toLowerCase())}