This commit is contained in:
Lyz Coote
2026-02-02 21:52:13 +01:00
parent d6a5cb8a67
commit 0f71cd3e0a
30 changed files with 3949 additions and 93 deletions

View File

@@ -1,14 +1,18 @@
import { redirect } from '@sveltejs/kit';
import type { PageLoad } from './$types';
import { GetImageViewerData, GetStartupFile, ReadEML } from '$lib/wailsjs/go/main/App';
import { GetViewerData, GetStartupFile, ReadEML } from '$lib/wailsjs/go/main/App';
import DOMPurify from 'dompurify';
export const load: PageLoad = async () => {
try {
// Check if we are in viewer mode
const viewerData = await GetImageViewerData();
if (viewerData && viewerData.data) {
throw redirect(302, "/image-viewer");
const viewerData = await GetViewerData();
if (viewerData) {
if (viewerData.imageData) {
throw redirect(302, "/image");
}
if (viewerData.pdfData) {
throw redirect(302, "/pdf");
}
}
// Check if opened with a file

View File

@@ -21,26 +21,26 @@
import { dangerZoneEnabled, unsavedChanges } from "$lib/stores/app";
import { LogDebug } from "$lib/wailsjs/runtime/runtime";
import { settingsStore } from "$lib/stores/settings.svelte";
import { GetMachineData } from "$lib/wailsjs/go/main/App";
import * as m from "$lib/paraglide/messages";
import { setLocale } from "$lib/paraglide/runtime";
import { mailState } from "$lib/stores/mail-state.svelte.js";
let { data } = $props();
let machineData = $derived(data.machineData);
let config = $derived(data.config);
const defaults: EMLy_GUI_Settings = {
selectedLanguage: "it",
useBuiltinPreview: true,
useBuiltinPDFViewer: true,
previewFileSupportedTypes: ["jpg", "jpeg", "png"],
};
async function setLanguage(lang: EMLy_GUI_Settings["selectedLanguage"] | null) {
async function setLanguage(
lang: EMLy_GUI_Settings["selectedLanguage"] | null,
) {
if (!browser) return;
try {
await setLocale(lang || "en", {reload: false});
await setLocale(lang || "en", { reload: false });
toast.success(m.settings_toast_language_changed());
} catch {
toast.error(m.settings_toast_language_change_failed());
@@ -48,30 +48,27 @@
}
// Clone store state for form editing
let form = $state<EMLy_GUI_Settings>({ ...settingsStore.settings });
let lastSaved = $state<EMLy_GUI_Settings>({
...settingsStore.settings,
});
// Use normalizeSettings to ensure new fields (like useBuiltinPDFViewer) are populated with defaults
let form = $state<EMLy_GUI_Settings>(normalizeSettings(settingsStore.settings));
let lastSaved = $state<EMLy_GUI_Settings>(normalizeSettings(settingsStore.settings));
let dangerWarningOpen = $state(false);
function normalizeSettings(
s: EMLy_GUI_Settings,
): EMLy_GUI_Settings {
function normalizeSettings(s: EMLy_GUI_Settings): EMLy_GUI_Settings {
return {
selectedLanguage: s.selectedLanguage || defaults.selectedLanguage || "en",
useBuiltinPreview: !!s.useBuiltinPreview,
useBuiltinPDFViewer:
s.useBuiltinPDFViewer ?? defaults.useBuiltinPDFViewer ?? true,
previewFileSupportedTypes:
s.previewFileSupportedTypes || defaults.previewFileSupportedTypes || [],
};
}
function isSameSettings(
a: EMLy_GUI_Settings,
b: EMLy_GUI_Settings,
) {
function isSameSettings(a: EMLy_GUI_Settings, b: EMLy_GUI_Settings) {
return (
(a.selectedLanguage ?? "") === (b.selectedLanguage ?? "") &&
!!a.useBuiltinPreview === !!b.useBuiltinPreview &&
!!a.useBuiltinPDFViewer === !!b.useBuiltinPDFViewer &&
JSON.stringify(a.previewFileSupportedTypes?.sort()) ===
JSON.stringify(b.previewFileSupportedTypes?.sort())
);
@@ -152,8 +149,9 @@
isSameSettings(lastSaved, defaults) &&
!isSameSettings(lastSaved, settingsStore.settings)
) {
form = { ...settingsStore.settings };
lastSaved = { ...settingsStore.settings };
// Ensure we normalize when syncing from store too
form = normalizeSettings(settingsStore.settings);
lastSaved = normalizeSettings(settingsStore.settings);
}
});
@@ -162,9 +160,6 @@
$effect(() => {
(async () => {
if ($dangerZoneEnabled && !previousDangerZoneEnabled) {
if (!data.machineData || data.machineData === undefined) {
data.machineData = await GetMachineData();
}
dangerWarningOpen = true;
toast.info("Here be dragons!", { icon: Flame });
}
@@ -191,16 +186,15 @@
<Button
class="cursor-pointer hover:cursor-pointer"
variant="ghost"
onclick={() => goto("/")}><ChevronLeft class="size-4" /> {m.settings_back()}</Button
onclick={() => goto("/")}
><ChevronLeft class="size-4" /> {m.settings_back()}</Button
>
</header>
<Card.Root>
<Card.Header class="space-y-1">
<Card.Title>{m.settings_language_title()}</Card.Title>
<Card.Description
>{m.settings_language_description()}</Card.Description
>
<Card.Description>{m.settings_language_description()}</Card.Description>
</Card.Header>
<Card.Content>
<RadioGroup.Root
@@ -237,16 +231,17 @@
</div>
</RadioGroup.Root>
<div class="text-xs text-muted-foreground mt-4">
<strong>Info:</strong> {m.settings_language_info()}
<strong>Info:</strong>
{m.settings_language_info()}
</div>
</Card.Content>
</Card.Root>
<Card.Root>
<Card.Header class="space-y-1">
<Card.Title>{m.settings_preview_files_title()}</Card.Title>
<Card.Title>{m.settings_preview_page_title()}</Card.Title>
<Card.Description
>{m.settings_preview_files_description()}</Card.Description
>{m.settings_preview_page_description()}</Card.Description
>
</Card.Header>
<Card.Content class="space-y-4">
@@ -315,28 +310,20 @@
PNG (.png)
</Label>
</div>
<p class="text-xs text-muted-foreground mt-2">
{m.settings_preview_images_hint()}
</p>
<Separator />
</div>
<p class="text-xs text-muted-foreground mt-2">
{m.settings_preview_images_hint()}
</p>
</div>
</Card.Content>
</Card.Root>
<Card.Root>
<Card.Header class="space-y-1">
<Card.Title>{m.settings_preview_page_title()}</Card.Title>
<Card.Description
>{m.settings_preview_page_description()}</Card.Description
>
</Card.Header>
<Card.Content class="space-y-4">
<div class="space-y-3">
<div
class="flex items-center justify-between gap-4 rounded-lg border bg-card p-4"
>
<div>
<div class="font-medium">{m.settings_preview_builtin_label()}</div>
<div class="font-medium">
{m.settings_preview_builtin_label()}
</div>
<div class="text-sm text-muted-foreground">
{m.settings_preview_builtin_hint()}
</div>
@@ -352,14 +339,36 @@
</div>
<Separator />
<div class="space-y-3">
<div
class="flex items-center justify-between gap-4 rounded-lg border bg-card p-4"
>
<div>
<div class="font-medium">
{m.settings_preview_pdf_builtin_label()}
</div>
<div class="text-sm text-muted-foreground">
{m.settings_preview_pdf_builtin_hint()}
</div>
</div>
<Switch
bind:checked={form.useBuiltinPDFViewer}
class="cursor-pointer hover:cursor-pointer"
/>
</div>
<p class="text-xs text-muted-foreground mt-2">
{m.settings_preview_pdf_builtin_info()}
</p>
</div>
</Card.Content>
</Card.Root>
{#if $dangerZoneEnabled}
<Card.Root class="border-destructive/50 bg-destructive/15">
<Card.Header class="space-y-1">
<Card.Title class="text-destructive">{m.settings_danger_zone_title()}</Card.Title>
<Card.Title class="text-destructive"
>{m.settings_danger_zone_title()}</Card.Title
>
<Card.Description
>{m.settings_danger_zone_description()}</Card.Description
>
@@ -369,13 +378,35 @@
class="flex items-center justify-between gap-4 rounded-lg border border-destructive/30 bg-card p-4"
>
<div class="space-y-1">
<Label class="text-sm">{m.settings_danger_devtools_label()}</Label>
<Label class="text-sm">{m.settings_danger_devtools_label()}</Label
>
<div class="text-sm text-muted-foreground">
{m.settings_danger_devtools_hint()}
</div>
</div>
</div>
<Separator />
<div
class="flex items-center justify-between gap-4 rounded-lg border border-destructive/30 bg-card p-4"
>
<div class="space-y-1">
<Label class="text-sm">{m.settings_danger_reload_label()}</Label>
<div class="text-sm text-muted-foreground">
{m.settings_danger_reload_hint()}
</div>
</div>
<a
data-sveltekit-reload
href="/"
class={`${buttonVariants({ variant: "destructive" })} cursor-pointer hover:cursor-pointer`}
style="text-decoration: none;"
>
{m.settings_danger_reload_button()}
</a>
</div>
<Separator />
<div
class="flex items-center justify-between gap-4 rounded-lg border border-destructive/30 bg-card p-4"
>
@@ -401,7 +432,7 @@
</AlertDialog.Title>
<AlertDialog.Description>
{m.settings_danger_reset_dialog_description_part1()}
<br/>
<br />
{m.settings_danger_reset_dialog_description_part2()}
</AlertDialog.Description>
</AlertDialog.Header>
@@ -423,30 +454,11 @@
</AlertDialog.Root>
</div>
<div class="text-xs text-muted-foreground">
<strong>{m.settings_danger_warning() }</strong>
<strong>{m.settings_danger_warning()}</strong>
</div>
<Separator />
<div class="text-xs text-muted-foreground">
OS: {machineData?.Version} ({machineData?.OS})
<br />
Hostname: {machineData?.Hostname}
<br />
ID: {machineData?.HWID}
<br />
CPU: {machineData?.CPU.processors[0].model.trim()} ({machineData
?.CPU.total_hardware_threads} cores)
<br />
RAM: {Math.round(
(machineData?.RAM.total_physical_bytes ?? 0) /
(1024 * 1024 * 1024),
)} GB
<br />
GPU: {machineData?.GPU.cards?.find(
(c) => !(c.pci?.product?.name ?? "").includes("Virtual"),
)?.pci?.product?.name ?? "N/A"}
<br />
<br />
GUI: {config
? `${config.GUISemver} (${config.GUIReleaseChannel})`
: "N/A"}
@@ -462,7 +474,9 @@
<AlertDialog.Root bind:open={dangerWarningOpen}>
<AlertDialog.Content>
<AlertDialog.Header>
<AlertDialog.Title>{m.settings_danger_alert_title()}</AlertDialog.Title>
<AlertDialog.Title
>{m.settings_danger_alert_title()}</AlertDialog.Title
>
<AlertDialog.Description>
{m.settings_danger_alert_description()}
</AlertDialog.Description>

View File

@@ -6,7 +6,7 @@
RotateCw,
ZoomIn,
ZoomOut,
Square,
AlignHorizontalSpaceAround,
} from "@lucide/svelte";
import { sidebarOpen } from "$lib/stores/app";
import { toast } from "svelte-sonner";
@@ -36,7 +36,7 @@
imageData = result.data;
filename = result.filename;
// Adjust title
document.title = filename + " - EMLy Viewer";
document.title = filename + " - EMLy Image Viewer";
sidebarOpen.set(false);
} else {
toast.error("No image data provided");
@@ -131,7 +131,7 @@
</button>
<div class="separator"></div>
<button class="btn" onclick={reset} title="Reset">
<Square size="16" />
<AlignHorizontalSpaceAround size="16" />
</button>
</div>
</div>

View File

@@ -0,0 +1,145 @@
<script lang="ts">
import {
WindowMinimise,
WindowMaximise,
WindowUnmaximise,
WindowIsMaximised,
Quit,
} from "$lib/wailsjs/runtime/runtime";
import type { LayoutProps } from "./$types";
let { data, children }: LayoutProps = $props();
let isMaximized = $state(false);
async function syncMaxState() {
isMaximized = await WindowIsMaximised();
}
async function toggleMaximize() {
if (isMaximized) {
WindowUnmaximise();
} else {
WindowMaximise();
}
isMaximized = !isMaximized;
}
function minimize() {
WindowMinimise();
}
function closeWindow() {
Quit();
}
function onTitlebarDblClick() {
toggleMaximize();
}
syncMaxState();
</script>
<div class="app-layout">
<!-- Titlebar -->
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div
class="titlebar"
ondblclick={onTitlebarDblClick}
style="--wails-draggable:drag"
>
<div class="title">EMLy PDF Viewer</div>
<div class="controls">
<button class="btn" onclick={minimize}>─</button>
<button class="btn" onclick={toggleMaximize}>
{#if isMaximized}
{:else}
{/if}
</button>
<button class="btn close" onclick={closeWindow}>✕</button>
</div>
</div>
<!-- Content -->
<main class="content">
{@render children()}
</main>
</div>
<style>
:global(body) {
margin: 0;
background: #000;
overflow: hidden;
}
.app-layout {
display: flex;
flex-direction: column;
height: 100vh;
overflow: hidden;
}
.titlebar {
height: 32px;
background: #000;
display: flex;
align-items: center;
justify-content: space-between;
padding-left: 12px;
-webkit-app-region: drag;
user-select: none;
flex: 0 0 32px;
z-index: 50;
border-bottom: 1px solid rgba(255, 255, 255, 0.08);
}
.title {
font-size: 13px;
opacity: 0.9;
color: white;
}
.controls {
display: flex;
height: 100%;
opacity: 0.5;
}
.btn {
width: 46px;
height: 100%;
border: none;
background: transparent;
color: white;
font-size: 14px;
cursor: pointer;
-webkit-app-region: no-drag;
}
.btn:hover {
background: rgba(255, 255, 255, 0.1);
}
.btn:disabled {
opacity: 0.5;
cursor: not-allowed;
background: rgba(255, 255, 255, 0.02);
}
.close:hover {
background: #e81123;
}
.content {
flex: 1;
min-height: 0;
display: flex;
flex-direction: column;
overflow: hidden;
background: #111;
}
</style>

View File

@@ -0,0 +1,375 @@
<script lang="ts">
import { onMount } from "svelte";
import type { PageData } from './$types';
import {
RotateCcw,
RotateCw,
ZoomIn,
ZoomOut,
AlignHorizontalSpaceAround
} from "@lucide/svelte";
import { sidebarOpen } from "$lib/stores/app";
import { toast } from "svelte-sonner";
import * as pdfjsLib from "pdfjs-dist";
import pdfWorker from "pdfjs-dist/build/pdf.worker.min.mjs?url";
if (typeof Promise.withResolvers === 'undefined') {
// @ts-ignore
Promise.withResolvers = function () {
let resolve, reject;
const promise = new Promise((res, rej) => {
resolve = res;
reject = rej;
});
return { promise, resolve, reject };
};
}
// Set worker source
pdfjsLib.GlobalWorkerOptions.workerSrc = pdfWorker;
let { data }: { data: PageData } = $props();
let pdfData = $state<Uint8Array | null>(null);
let filename = $state("");
let rotation = $state(0);
let scale = $state(1.5); // Default scale
let error = $state("");
let loading = $state(true);
let pdfDoc = $state<pdfjsLib.PDFDocumentProxy | null>(null);
let pageNum = $state(1);
let totalPages = $state(0);
let canvasRef = $state<HTMLCanvasElement>();
let canvasContainerRef = $state<HTMLDivElement>();
let renderTask = $state<pdfjsLib.RenderTask | null>(null);
onMount(async () => {
try {
const result = data?.data;
if (result) {
// Decode Base64 to Uint8Array
const binaryString = window.atob(result.data);
const len = binaryString.length;
const bytes = new Uint8Array(len);
for (let i = 0; i < len; i++) {
bytes[i] = binaryString.charCodeAt(i);
}
pdfData = bytes;
filename = result.filename;
// Adjust title
document.title = filename + " - EMLy PDF Viewer";
sidebarOpen.set(false);
await loadPDF();
} else {
toast.error("No PDF data provided");
error = "No PDF data provided. Please open this window from the main EMLy application.";
loading = false;
}
} catch (e) {
error = "Failed to load PDF: " + e;
loading = false;
}
});
async function loadPDF() {
if (!pdfData) return;
// Set a timeout to prevent infinite loading
const timeout = setTimeout(() => {
if (loading) {
loading = false;
error = "Timeout loading PDF. The worker might have failed to initialize.";
toast.error(error);
}
}, 10000);
try {
const loadingTask = pdfjsLib.getDocument({ data: pdfData });
pdfDoc = await loadingTask.promise;
totalPages = pdfDoc.numPages;
pageNum = 1;
await renderPage(pageNum);
loading = false;
} catch (e) {
console.error(e);
error = "Error parsing PDF: " + e;
loading = false;
} finally {
clearTimeout(timeout);
}
}
async function renderPage(num: number) {
if (!pdfDoc || !canvasRef) return;
if (renderTask) {
await renderTask.promise.catch(() => {}); // Cancel previous render if any (though we wait usually)
}
try {
const page = await pdfDoc.getPage(num);
// Calculate scale if needed or use current scale
// We apply rotation to the viewport
const viewport = page.getViewport({ scale: scale, rotation: rotation });
const canvas = canvasRef;
const context = canvas.getContext('2d');
if (!context) return;
canvas.height = viewport.height;
canvas.width = viewport.width;
const renderContext = {
canvasContext: context,
viewport: viewport
};
// Cast to any to avoid type mismatch with PDF.js definitions
await page.render(renderContext as any).promise;
} catch (e: any) {
if (e.name !== 'RenderingCancelledException') {
console.error(e);
toast.error("Error rendering page: " + e.message);
}
}
}
function fitToWidth() {
if (!pdfDoc || !canvasContainerRef) return;
// We need to fetch page to get dimensions
loading = true;
pdfDoc.getPage(pageNum).then(page => {
const containerWidth = canvasContainerRef!.clientWidth - 40; // padding
const viewport = page.getViewport({ scale: 1, rotation: rotation });
scale = containerWidth / viewport.width;
renderPage(pageNum).then(() => { loading = false; });
});
}
$effect(() => {
// Re-render when scale or rotation changes
// Access them here to ensure dependency tracking since renderPage is async
const _deps = [scale, rotation];
if (pdfDoc) {
renderPage(pageNum);
}
});
function rotate(deg: number) {
rotation = (rotation + deg + 360) % 360;
}
function zoom(factor: number) {
scale = Math.max(0.1, Math.min(5.0, scale + factor));
}
function nextPage() {
if (pageNum >= totalPages) return;
pageNum++;
renderPage(pageNum);
}
function prevPage() {
if (pageNum <= 1) return;
pageNum--;
renderPage(pageNum);
}
</script>
<div class="viewer-container">
{#if loading}
<div class="loading-overlay">
<div class="spinner"></div>
<div>Loading PDF...</div>
</div>
{/if}
{#if error}
<div class="error-overlay">
<div class="error-message">{error}</div>
</div>
{/if}
<div class="toolbar">
<h1 class="title" title={filename}>{filename || "Image Viewer"}</h1>
<div class="controls">
<button class="btn" onclick={() => zoom(0.1)} title="Zoom In">
<ZoomIn size="16" />
</button>
<button class="btn" onclick={() => zoom(-0.1)} title="Zoom Out">
<ZoomOut size="16" />
</button>
<div class="separator"></div>
<button class="btn" onclick={() => rotate(-90)} title="Rotate Left">
<RotateCcw size="16" />
</button>
<button class="btn" onclick={() => rotate(90)} title="Rotate Right">
<RotateCw size="16" />
</button>
<div class="separator"></div>
<button class="btn" onclick={fitToWidth} title="Reset">
<AlignHorizontalSpaceAround size="16" />
</button>
</div>
</div>
<div class="canvas-container" bind:this={canvasContainerRef}>
<canvas bind:this={canvasRef}></canvas>
</div>
</div>
<style>
.viewer-container {
display: flex;
flex-direction: column;
height: 100%;
background: #1e1e1e;
position: relative;
user-select: none;
}
.loading-overlay {
position: absolute;
inset: 0;
z-index: 50;
display: flex;
flex-direction: column; /* Match the requested style */
gap: 10px;
align-items: center;
justify-content: center;
background: #111;
color: white;
}
.spinner {
width: 32px;
height: 32px;
border: 2px solid rgba(255, 255, 255, 0.1);
border-top-color: rgba(255, 255, 255, 0.8);
border-radius: 50%;
animation: spin 0.6s linear infinite;
}
@keyframes spin {
to {
transform: rotate(360deg);
}
}
.error-overlay {
position: absolute;
inset: 0;
z-index: 40;
display: flex;
align-items: center;
justify-content: center;
background: #111;
color: #ef4444;
}
.toolbar {
height: 50px;
background: #000;
border-bottom: 1px solid rgba(255, 255, 255, 0.08);
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 16px;
flex-shrink: 0;
z-index: 10;
}
.title {
font-size: 14px;
font-weight: 500;
opacity: 0.9;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
max-width: 50%;
}
.controls {
display: flex;
align-items: center;
gap: 6px;
}
.separator {
width: 1px;
height: 18px;
background: rgba(255, 255, 255, 0.15);
margin: 0 4px;
}
.btn {
display: inline-flex;
align-items: center;
justify-content: center;
width: 32px;
height: 32px;
padding: 0;
border-radius: 8px;
border: 1px solid rgba(255, 255, 255, 0.12);
background: rgba(255, 255, 255, 0.06);
color: rgba(255, 255, 255, 0.85);
cursor: pointer;
transition: all 0.2s;
}
.btn:hover {
background: rgba(255, 255, 255, 0.12);
color: #fff;
}
.separator {
width: 1px;
height: 24px;
background: rgba(255, 255, 255, 0.1);
}
.canvas-container {
flex: 1;
overflow: auto;
display: flex;
justify-content: center;
align-items: flex-start; /* scroll from top */
padding: 20px;
background: #333; /* Dark background for contrast */
}
canvas {
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
max-width: none; /* Allow canvas to be larger than container */
}
::-webkit-scrollbar {
width: 6px;
height: 6px;
}
::-webkit-scrollbar-track {
background: transparent;
}
::-webkit-scrollbar-thumb {
background: rgba(255, 255, 255, 0.1);
border-radius: 6px;
}
::-webkit-scrollbar-thumb:hover {
background: rgba(255, 255, 255, 0.2);
}
::-webkit-scrollbar-corner {
background: transparent;
}
</style>

View File

@@ -0,0 +1,13 @@
import type { PageLoad } from './$types';
import { GetPDFViewerData } from "$lib/wailsjs/go/main/App";
export const load = (async () => {
try {
const data = await GetPDFViewerData();
console.log("PDF Viewer Data:", data);
return { data };
} catch (error) {
console.error("Error fetching pdf viewer data:", error);
return { data: null };
}
}) satisfies PageLoad;