mirror of
https://codeberg.org/PLG-Development/PLG-MuDiCS
synced 2026-07-06 17:07:08 +00:00
Compare commits
67 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 346e511bb4 | |||
| 54e10b98e2 | |||
| 83eaf34475 | |||
| b251e8951f | |||
| 31cb614958 | |||
| 8fb9f5b9db | |||
| d13fd347ac | |||
| 922b47bd1e | |||
| b57ea762bf | |||
| c171706d96 | |||
| 6d5aa9041f | |||
| c2d9a2b049 | |||
| f84a7c0520 | |||
| 7f6891ecff | |||
| d63fc5cac4 | |||
| 12f4ec7d6c | |||
| 86f23077ea | |||
| 47d462ba76 | |||
| 5533696aad | |||
| ac68939abd | |||
| d6bafd4e6f | |||
| ce28a1f771 | |||
| 7632229704 | |||
| b5e997e675 | |||
| ca08d6fb6a | |||
| 4ab8f43295 | |||
| fc59b576b5 | |||
| e2a9558d3f | |||
| 662bcb3b8d | |||
| 9044262ab6 | |||
| 6c654e295c | |||
| a2bbf19fee | |||
| 246549acdf | |||
| 80cee15576 | |||
| 1c59b40971 | |||
| 548f8ccba8 | |||
| 5b93250e22 | |||
| 5ca2487598 | |||
| 464422ec51 | |||
| 128bbb4ca2 | |||
| 8686a1cb47 | |||
| d3f8a0134b | |||
| ea2f063991 | |||
| 9be8a70452 | |||
| 9ce2c1d8bb | |||
| ce8133d59e | |||
| b0a57f9c67 | |||
| c64eb345fd | |||
| 9ed35750c4 | |||
| 2b58c8bc69 | |||
| 9fdd2c4729 | |||
| db925e1509 | |||
| 438c64f055 | |||
| 6a65ac7e70 | |||
| 74779740f7 | |||
| 5d868bc1fd | |||
| 8b7aabb473 | |||
| fe5cc22cc0 | |||
| 30138ebe04 | |||
| f9c3161cf6 | |||
| 0692034344 | |||
| c175e9d3f8 | |||
| e27cf170ef | |||
| 0d6d3a6012 | |||
| 426ea4802e | |||
| bdcb0a8ce3 | |||
| 09adf5dba4 |
@@ -6,14 +6,7 @@ Open source solution for advanced remote control and coordination of one or more
|
|||||||
|
|
||||||
## Display Requirements
|
## Display Requirements
|
||||||
|
|
||||||
- Linux
|
See [packages in the NixOS config](https://github.com/PLG-Development/PLG-MuDiCS/blob/b0a57f9c679e8c483d1a81cb3c749cf8555785f6/nixos/configuration.nix#L86).
|
||||||
- Bash
|
|
||||||
- Chromium
|
|
||||||
- LibreOffice (optional, presentation view)
|
|
||||||
- Xreader (optional, pdf view)
|
|
||||||
- ImageMagick (optional, image preview)
|
|
||||||
- ffmpeg (optional, video preview)
|
|
||||||
- Ghostscript (optional, pdf preview)
|
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
|
|||||||
Executable
BIN
Binary file not shown.
Generated
+286
-261
File diff suppressed because it is too large
Load Diff
Generated
+963
-1196
File diff suppressed because it is too large
Load Diff
@@ -16,40 +16,40 @@
|
|||||||
"test": "deno task test:e2e"
|
"test": "deno task test:e2e"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/compat": "^1.2.5",
|
"@eslint/compat": "^1.4.1",
|
||||||
"@eslint/js": "^9.18.0",
|
"@eslint/js": "^9.39.2",
|
||||||
"@playwright/test": "1.56.1",
|
"@playwright/test": "1.56.1",
|
||||||
"@sveltejs/adapter-auto": "^6.0.0",
|
"@sveltejs/adapter-auto": "^6.1.1",
|
||||||
"@sveltejs/adapter-static": "^3.0.9",
|
"@sveltejs/adapter-static": "^3.0.10",
|
||||||
"@sveltejs/kit": "^2.22.0",
|
"@sveltejs/kit": "^2.49.3",
|
||||||
"@sveltejs/vite-plugin-svelte": "^6.0.0",
|
"@sveltejs/vite-plugin-svelte": "^6.2.3",
|
||||||
"@tailwindcss/vite": "^4.0.0",
|
"@tailwindcss/vite": "^4.1.18",
|
||||||
"@tiptap/extension-placeholder": "^3.11.0",
|
"@tiptap/extension-placeholder": "^3.15.3",
|
||||||
"eslint": "^9.18.0",
|
"eslint": "^9.39.2",
|
||||||
"eslint-config-prettier": "^10.0.1",
|
"eslint-config-prettier": "^10.1.8",
|
||||||
"eslint-plugin-svelte": "^3.0.0",
|
"eslint-plugin-svelte": "^3.14.0",
|
||||||
"globals": "^16.0.0",
|
"globals": "^16.5.0",
|
||||||
"prettier": "^3.4.2",
|
"prettier": "^3.7.4",
|
||||||
"prettier-plugin-svelte": "^3.3.3",
|
"prettier-plugin-svelte": "^3.4.1",
|
||||||
"sass-embedded": "^1.93.3",
|
"sass-embedded": "^1.97.2",
|
||||||
"svelte": "^5.0.0",
|
"svelte": "^5.46.1",
|
||||||
"svelte-check": "^4.3.5",
|
"svelte-check": "^4.3.5",
|
||||||
"svelte-dnd-action": "^0.9.65",
|
"svelte-dnd-action": "^0.9.69",
|
||||||
"tailwindcss": "^4.0.0",
|
"tailwindcss": "^4.1.18",
|
||||||
"typescript": "^5.0.0",
|
"typescript": "^5.9.3",
|
||||||
"typescript-eslint": "^8.20.0",
|
"typescript-eslint": "^8.52.0",
|
||||||
"vite": "^7.0.4"
|
"vite": "^7.3.1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@thisux/sveltednd": "^0.0.20",
|
"@thisux/sveltednd": "^0.0.20",
|
||||||
"@tiptap/core": "^3.11.0",
|
"@tiptap/core": "^3.15.3",
|
||||||
"@tiptap/extension-highlight": "^3.11.0",
|
"@tiptap/extension-highlight": "^3.15.3",
|
||||||
"@tiptap/extension-text-style": "^3.11.0",
|
"@tiptap/extension-text-style": "^3.15.3",
|
||||||
"@tiptap/extensions": "^3.11.0",
|
"@tiptap/extensions": "^3.15.3",
|
||||||
"@tiptap/pm": "^3.11.0",
|
"@tiptap/pm": "^3.15.3",
|
||||||
"@tiptap/starter-kit": "^3.11.0",
|
"@tiptap/starter-kit": "^3.15.3",
|
||||||
"dexie": "^4.2.1",
|
"dexie": "^4.2.1",
|
||||||
"lucide-svelte": "^0.545.0",
|
"lucide-svelte": "^0.545.0",
|
||||||
"svelte-splitpanes": "^8.0.9"
|
"svelte-splitpanes": "^8.0.12"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,14 @@
|
|||||||
--color-stone-850: oklch(0.242 0.0065 45.171);
|
--color-stone-850: oklch(0.242 0.0065 45.171);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.link {
|
||||||
|
@apply text-blue-300 underline;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
@apply text-blue-400;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.button {
|
.button {
|
||||||
&.space {
|
&.space {
|
||||||
@apply px-4;
|
@apply px-4;
|
||||||
@@ -26,7 +34,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
main {
|
html {
|
||||||
scrollbar-width: thin;
|
scrollbar-width: thin;
|
||||||
scrollbar-color: var(--color-stone-300) transparent;
|
scrollbar-color: var(--color-stone-300) transparent;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,22 +11,25 @@
|
|||||||
import DisplayObject from './DisplayObject.svelte';
|
import DisplayObject from './DisplayObject.svelte';
|
||||||
import {
|
import {
|
||||||
all_displays_of_group_selected,
|
all_displays_of_group_selected,
|
||||||
get_display_ids_in_group,
|
|
||||||
set_select_for_group,
|
set_select_for_group,
|
||||||
|
update_db_displays,
|
||||||
|
local_displays,
|
||||||
set_new_display_order
|
set_new_display_order
|
||||||
} from '$lib/ts/stores/displays';
|
} from '$lib/ts/stores/displays';
|
||||||
import DNDGrip from '$lib/components/DNDGrip.svelte';
|
import DNDGrip from '$lib/components/DNDGrip.svelte';
|
||||||
import { fade } from 'svelte/transition';
|
import { fade } from 'svelte/transition';
|
||||||
import type { MenuOption } from '$lib/ts/types';
|
import type { Display, DisplayIdGroup, MenuOption } from '$lib/ts/types';
|
||||||
import { selected_display_ids } from '$lib/ts/stores/select';
|
import { selected_display_ids } from '$lib/ts/stores/select';
|
||||||
import { liveQuery, type Observable } from 'dexie';
|
import { liveQuery, type Observable } from 'dexie';
|
||||||
|
import { onMount } from 'svelte';
|
||||||
|
import { get_uuid } from '$lib/ts/utils';
|
||||||
|
|
||||||
let {
|
let {
|
||||||
display_group_id,
|
display_id_group,
|
||||||
get_display_menu_options,
|
get_display_menu_options,
|
||||||
close_pinned_display
|
close_pinned_display
|
||||||
}: {
|
}: {
|
||||||
display_group_id: string;
|
display_id_group: DisplayIdGroup;
|
||||||
get_display_menu_options: (display_id: string) => MenuOption[];
|
get_display_menu_options: (display_id: string) => MenuOption[];
|
||||||
close_pinned_display: () => void;
|
close_pinned_display: () => void;
|
||||||
} = $props();
|
} = $props();
|
||||||
@@ -34,14 +37,14 @@
|
|||||||
let all_selected: Observable<boolean> | undefined = $state();
|
let all_selected: Observable<boolean> | undefined = $state();
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
const sdi = $selected_display_ids;
|
const sdi = $selected_display_ids;
|
||||||
all_selected = liveQuery(() => all_displays_of_group_selected(display_group_id, sdi));
|
all_selected = liveQuery(() => all_displays_of_group_selected(display_id_group.id, sdi));
|
||||||
});
|
});
|
||||||
let display_ids_in_group = liveQuery(() => get_display_ids_in_group(display_group_id));
|
|
||||||
let hovering_selectable = $state(false);
|
let hovering_selectable = $state(false);
|
||||||
|
|
||||||
async function select_all_of_this_group() {
|
async function select_all_of_this_group() {
|
||||||
const new_value = !($all_selected || false);
|
const new_value = !($all_selected || false);
|
||||||
await set_select_for_group(display_group_id, new_value);
|
await set_select_for_group(display_id_group.id, new_value);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handle_consider(e: CustomEvent) {
|
async function handle_consider(e: CustomEvent) {
|
||||||
@@ -49,14 +52,21 @@
|
|||||||
|
|
||||||
if (items.length !== 1 && info.trigger === TRIGGERS.DRAG_STARTED) {
|
if (items.length !== 1 && info.trigger === TRIGGERS.DRAG_STARTED) {
|
||||||
$is_display_drag = true;
|
$is_display_drag = true;
|
||||||
// add_empty_display_group();
|
// add empty display group if its not just one group
|
||||||
|
if (!($local_displays.length === 1 && $local_displays[0].displays.length === 1)) {
|
||||||
|
$local_displays.push({
|
||||||
|
id: get_uuid(),
|
||||||
|
displays: []
|
||||||
|
});
|
||||||
}
|
}
|
||||||
await set_new_display_order(items);
|
}
|
||||||
|
set_new_display_order(display_id_group.id, items);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handle_finalize(e: CustomEvent) {
|
async function handle_finalize(e: CustomEvent) {
|
||||||
|
set_new_display_order(display_id_group.id, e.detail.items);
|
||||||
|
await update_db_displays();
|
||||||
$is_display_drag = false;
|
$is_display_drag = false;
|
||||||
await set_new_display_order(e.detail.items);
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -77,7 +87,7 @@
|
|||||||
<div
|
<div
|
||||||
class="flex flex-col min-w-0 pl-2 py-2 gap-2 w-full"
|
class="flex flex-col min-w-0 pl-2 py-2 gap-2 w-full"
|
||||||
use:dragHandleZone={{
|
use:dragHandleZone={{
|
||||||
items: $display_ids_in_group || [],
|
items: display_id_group.displays,
|
||||||
type: 'item',
|
type: 'item',
|
||||||
flipDurationMs: dnd_flip_duration_ms,
|
flipDurationMs: dnd_flip_duration_ms,
|
||||||
dropTargetStyle: { outline: 'none' }
|
dropTargetStyle: { outline: 'none' }
|
||||||
@@ -85,18 +95,15 @@
|
|||||||
onconsider={handle_consider}
|
onconsider={handle_consider}
|
||||||
onfinalize={handle_finalize}
|
onfinalize={handle_finalize}
|
||||||
>
|
>
|
||||||
{#each $display_ids_in_group || [] as display (display.id)}
|
{#each display_id_group.displays as display_id_object (display_id_object.id)}
|
||||||
<!-- Each Group -->
|
<!-- Each Group -->
|
||||||
<section
|
<section class="outline-none" role="figure">
|
||||||
animate:flip={{ duration: $is_group_drag ? 0 : dnd_flip_duration_ms, easing: cubicOut }}
|
<!-- animate:flip={{ duration: $is_group_drag ? 0 : dnd_flip_duration_ms, easing: cubicOut }} -->
|
||||||
class="outline-none"
|
<DisplayObject {display_id_object} {get_display_menu_options} {close_pinned_display} />
|
||||||
role="figure"
|
|
||||||
>
|
|
||||||
<DisplayObject {display} {get_display_menu_options} {close_pinned_display} />
|
|
||||||
</section>
|
</section>
|
||||||
{/each}
|
{/each}
|
||||||
|
|
||||||
{#if ($display_ids_in_group || []).length === 0}
|
{#if display_id_group.displays.length === 0}
|
||||||
<div class="min-h-10 h-full w-full pl-2 py-2 flex justify-center items-center">
|
<div class="min-h-10 h-full w-full pl-2 py-2 flex justify-center items-center">
|
||||||
Hier in leere neue Gruppe ablegen
|
Hier in leere neue Gruppe ablegen
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -8,38 +8,40 @@
|
|||||||
import DNDGrip from '$lib/components/DNDGrip.svelte';
|
import DNDGrip from '$lib/components/DNDGrip.svelte';
|
||||||
import { Menu, Pin, PinOff, VideoOff } from 'lucide-svelte';
|
import { Menu, Pin, PinOff, VideoOff } from 'lucide-svelte';
|
||||||
import OnlineState from './OnlineState.svelte';
|
import OnlineState from './OnlineState.svelte';
|
||||||
import type { Display, MenuOption } from '$lib/ts/types';
|
import type { Display, DisplayIdObject, MenuOption } from '$lib/ts/types';
|
||||||
import { is_selected, select, selected_display_ids } from '$lib/ts/stores/select';
|
import { is_selected, select, selected_display_ids } from '$lib/ts/stores/select';
|
||||||
import { screenshot_loop } from '$lib/ts/stores/displays';
|
import { get_display_by_id, screenshot_loop } from '$lib/ts/stores/displays';
|
||||||
import { change_file_path, current_file_path } from '$lib/ts/stores/files';
|
import { change_file_path, current_file_path } from '$lib/ts/stores/files';
|
||||||
|
import { liveQuery } from 'dexie';
|
||||||
|
|
||||||
let {
|
let {
|
||||||
display,
|
display_id_object,
|
||||||
get_display_menu_options,
|
get_display_menu_options,
|
||||||
close_pinned_display
|
close_pinned_display
|
||||||
}: {
|
}: {
|
||||||
display: Display;
|
display_id_object: DisplayIdObject;
|
||||||
get_display_menu_options: (display_id: string) => MenuOption[];
|
get_display_menu_options: (display_id: string) => MenuOption[];
|
||||||
close_pinned_display: () => void;
|
close_pinned_display: () => void;
|
||||||
} = $props();
|
} = $props();
|
||||||
|
|
||||||
let hovering_unselectable = $state(false);
|
let hovering_unselectable = $state(false);
|
||||||
|
let display = liveQuery(() => get_display_by_id(display_id_object.id));
|
||||||
|
|
||||||
async function onclick(e: Event) {
|
async function onclick(e: Event) {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
select(selected_display_ids, display.id, 'toggle');
|
select(selected_display_ids, display_id_object.id, 'toggle');
|
||||||
|
|
||||||
// force file view update
|
// force file view update
|
||||||
await change_file_path($current_file_path);
|
await change_file_path($current_file_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function on_preview_click(e: MouseEvent) {
|
async function on_preview_click(e: MouseEvent) {
|
||||||
if ($pinned_display_id === display.id) {
|
if ($pinned_display_id === display_id_object.id) {
|
||||||
close_pinned_display();
|
close_pinned_display();
|
||||||
} else {
|
} else {
|
||||||
$pinned_display_id = display.id;
|
$pinned_display_id = display_id_object.id;
|
||||||
}
|
}
|
||||||
await screenshot_loop(display.id);
|
await screenshot_loop(display_id_object.id);
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -52,7 +54,7 @@
|
|||||||
if (e.key === 'Enter' || e.key === ' ') onclick(e);
|
if (e.key === 'Enter' || e.key === ' ') onclick(e);
|
||||||
}}
|
}}
|
||||||
{onclick}
|
{onclick}
|
||||||
class="p-1 {get_selectable_color_classes(is_selected(display.id, $selected_display_ids), {
|
class="p-1 {get_selectable_color_classes(is_selected(display_id_object.id, $selected_display_ids), {
|
||||||
bg: true,
|
bg: true,
|
||||||
hover: true,
|
hover: true,
|
||||||
active: !hovering_unselectable,
|
active: !hovering_unselectable,
|
||||||
@@ -68,12 +70,12 @@
|
|||||||
onclick={on_preview_click}
|
onclick={on_preview_click}
|
||||||
>
|
>
|
||||||
<div class="flex h-full w-full items-center justify-center">
|
<div class="flex h-full w-full items-center justify-center">
|
||||||
{#if $pinned_display_id === display.id}
|
{#if $pinned_display_id === display_id_object.id}
|
||||||
<div class="size-[50%]">
|
<div class="size-[50%]">
|
||||||
<Pin class="size-full" />
|
<Pin class="size-full" />
|
||||||
</div>
|
</div>
|
||||||
{:else if display.preview.url}
|
{:else if $display && $display.preview.url}
|
||||||
<img src={display.preview.url} alt="preview" class="w-full object-cover bg-black" />
|
<img src={$display.preview.url} alt="preview" class="w-full object-cover bg-black" />
|
||||||
{:else}
|
{:else}
|
||||||
<!-- No Signal -->
|
<!-- No Signal -->
|
||||||
<div class="size-full bg-black flex justify-center items-center">
|
<div class="size-full bg-black flex justify-center items-center">
|
||||||
@@ -84,11 +86,11 @@
|
|||||||
|
|
||||||
<!-- Hover Effect -->
|
<!-- Hover Effect -->
|
||||||
<span
|
<span
|
||||||
class="pointer-events-none absolute inset-0 {$pinned_display_id === display.id
|
class="pointer-events-none absolute inset-0 {$pinned_display_id === display_id_object.id
|
||||||
? 'bg-stone-700'
|
? 'bg-stone-700'
|
||||||
: 'bg-stone-700/70'} opacity-0 transition-opacity duration-200 flex items-center justify-center group-hover:opacity-100"
|
: 'bg-stone-700/70'} opacity-0 transition-opacity duration-200 flex items-center justify-center group-hover:opacity-100"
|
||||||
>
|
>
|
||||||
{#if $pinned_display_id === display.id}
|
{#if $pinned_display_id === display_id_object.id}
|
||||||
<PinOff class="size-[50%]" aria-hidden="true" />
|
<PinOff class="size-[50%]" aria-hidden="true" />
|
||||||
{:else}
|
{:else}
|
||||||
<Pin class="size-[50%]" aria-hidden="true" />
|
<Pin class="size-[50%]" aria-hidden="true" />
|
||||||
@@ -100,20 +102,20 @@
|
|||||||
class="h-full flex flex-col justify-center gap-1 select-none
|
class="h-full flex flex-col justify-center gap-1 select-none
|
||||||
min-w-0 basis-0 flex-1"
|
min-w-0 basis-0 flex-1"
|
||||||
>
|
>
|
||||||
<div class="text-xl font-bold truncate w-full" title={display.name}>
|
<div class="text-xl font-bold truncate w-full" title={$display?.name ?? ''}>
|
||||||
{display.name}
|
{$display?.name ?? ''}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<OnlineState
|
<OnlineState
|
||||||
selected={is_selected(display.id, $selected_display_ids)}
|
selected={is_selected(display_id_object.id, $selected_display_ids)}
|
||||||
status={display.status}
|
status={$display?.status ?? null}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- Right Controls -->
|
<!-- Right Controls -->
|
||||||
<div class="flex flex-row h-full items-center gap-2 pr-3">
|
<div class="flex flex-row h-full items-center gap-2 pr-3">
|
||||||
<DNDGrip
|
<DNDGrip
|
||||||
bg={get_selectable_color_classes(is_selected(display.id, $selected_display_ids), {
|
bg={get_selectable_color_classes(is_selected(display_id_object.id, $selected_display_ids), {
|
||||||
bg: true
|
bg: true
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
@@ -125,16 +127,16 @@
|
|||||||
>
|
>
|
||||||
<Button
|
<Button
|
||||||
bg="bg-transparent"
|
bg="bg-transparent"
|
||||||
hover_bg={get_selectable_color_classes(is_selected(display.id, $selected_display_ids), {
|
hover_bg={get_selectable_color_classes(is_selected(display_id_object.id, $selected_display_ids), {
|
||||||
bg: true
|
bg: true
|
||||||
})}
|
})}
|
||||||
active_bg={get_selectable_color_classes(is_selected(display.id, $selected_display_ids), {
|
active_bg={get_selectable_color_classes(is_selected(display_id_object.id, $selected_display_ids), {
|
||||||
bg: true
|
bg: true
|
||||||
})}
|
})}
|
||||||
click_function={(e) => {
|
click_function={(e) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
}}
|
}}
|
||||||
menu_options={get_display_menu_options(display.id)}
|
menu_options={get_display_menu_options(display_id_object.id)}
|
||||||
>
|
>
|
||||||
<Menu />
|
<Menu />
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
type Inode,
|
type Inode,
|
||||||
get_file_primary_key,
|
get_file_primary_key,
|
||||||
type FileOnDisplay,
|
type FileOnDisplay,
|
||||||
type FileLoadingData
|
type CompleteFileLoadingData
|
||||||
} from '$lib/ts/types';
|
} from '$lib/ts/types';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
import RefreshPlay from '../svgs/RefreshPlay.svelte';
|
import RefreshPlay from '../svgs/RefreshPlay.svelte';
|
||||||
import { get_file_size_display_string, get_file_type } from '$lib/ts/utils';
|
import { get_file_size_display_string, get_file_type } from '$lib/ts/utils';
|
||||||
import { open_file } from '$lib/ts/api_handler';
|
import { open_file } from '$lib/ts/api_handler';
|
||||||
import { run_on_all_selected_displays } from '$lib/ts/stores/displays';
|
import { get_display_by_id, run_on_all_selected_displays } from '$lib/ts/stores/displays';
|
||||||
import { get_thumbnail_url } from '$lib/ts/stores/thumbnails';
|
import { get_thumbnail_url } from '$lib/ts/stores/thumbnails';
|
||||||
import { liveQuery, type Observable } from 'dexie';
|
import { liveQuery, type Observable } from 'dexie';
|
||||||
import { db } from '$lib/ts/database';
|
import { db } from '$lib/ts/database';
|
||||||
@@ -45,12 +45,7 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
let loading_data:
|
let loading_data:
|
||||||
| Observable<{
|
| Observable<CompleteFileLoadingData>
|
||||||
is_loading: boolean;
|
|
||||||
total_percentage: number;
|
|
||||||
total_seconds_until_finish: number;
|
|
||||||
display_data: FileLoadingData[];
|
|
||||||
}>
|
|
||||||
| undefined = $state();
|
| undefined = $state();
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
const d = $selected_display_ids;
|
const d = $selected_display_ids;
|
||||||
@@ -197,12 +192,7 @@
|
|||||||
async function get_loading_data(
|
async function get_loading_data(
|
||||||
file_primary_key: string,
|
file_primary_key: string,
|
||||||
selected_display_ids: string[]
|
selected_display_ids: string[]
|
||||||
): Promise<{
|
): Promise<CompleteFileLoadingData> {
|
||||||
is_loading: boolean;
|
|
||||||
total_percentage: number;
|
|
||||||
total_seconds_until_finish: number;
|
|
||||||
display_data: FileLoadingData[];
|
|
||||||
}> {
|
|
||||||
const file_on_display_data: FileOnDisplay[] = await db.files_on_display
|
const file_on_display_data: FileOnDisplay[] = await db.files_on_display
|
||||||
.where('file_primary_key')
|
.where('file_primary_key')
|
||||||
.equals(file_primary_key)
|
.equals(file_primary_key)
|
||||||
@@ -225,7 +215,17 @@
|
|||||||
if (!is_loading) is_loading = true;
|
if (!is_loading) is_loading = true;
|
||||||
percentage_sum += fod.loading_data.percentage;
|
percentage_sum += fod.loading_data.percentage;
|
||||||
total_seconds_until_finish += fod.loading_data.seconds_until_finish;
|
total_seconds_until_finish += fod.loading_data.seconds_until_finish;
|
||||||
display_data.push(fod.loading_data);
|
const display = await get_display_by_id(fod.display_id);
|
||||||
|
if (!display) continue;
|
||||||
|
const display_data_element = {
|
||||||
|
loading_data: fod.loading_data,
|
||||||
|
display_name: display.name
|
||||||
|
};
|
||||||
|
if (fod.loading_data.type === 'sync_download') {
|
||||||
|
display_data.unshift(display_data_element); // insert sync_download element at beginning
|
||||||
|
} else {
|
||||||
|
display_data.push(display_data_element);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
percentage_sum += 100;
|
percentage_sum += 100;
|
||||||
}
|
}
|
||||||
@@ -303,12 +303,10 @@
|
|||||||
class="{get_main_classes()} relative transition-colors duration-200 gap-4 flex flex-row justify-between group w-full min-w-0"
|
class="{get_main_classes()} relative transition-colors duration-200 gap-4 flex flex-row justify-between group w-full min-w-0"
|
||||||
>
|
>
|
||||||
{#if $loading_data?.is_loading}
|
{#if $loading_data?.is_loading}
|
||||||
<!-- <div class="pointer-events-none absolute inset-0"> -->
|
|
||||||
<div
|
<div
|
||||||
class="absolute pointer-events-none inset-y-0 left-0 transition-[width] duration-200 bg-stone-600 rounded-r-lg"
|
class="absolute pointer-events-none inset-y-0 left-0 transition-[width] duration-200 bg-stone-600 rounded-r-lg"
|
||||||
style={`width: ${$loading_data.total_percentage}%;`}
|
style={`width: ${Math.min($loading_data.total_percentage, 100)}%;`}
|
||||||
></div>
|
></div>
|
||||||
<!-- </div> -->
|
|
||||||
{/if}
|
{/if}
|
||||||
<div class="flex flex-row gap-2 min-w-0 w-full z-10">
|
<div class="flex flex-row gap-2 min-w-0 w-full z-10">
|
||||||
<div class="aspect-square rounded-md flex justify-center items-center">
|
<div class="aspect-square rounded-md flex justify-center items-center">
|
||||||
|
|||||||
@@ -0,0 +1,66 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import type { NumberSetting } from '$lib/ts/types';
|
||||||
|
import { ChevronDown, ChevronUp, Minus, Plus } from 'lucide-svelte';
|
||||||
|
import Button from './Button.svelte';
|
||||||
|
|
||||||
|
let {
|
||||||
|
number_setting,
|
||||||
|
on_change,
|
||||||
|
className = '',
|
||||||
|
disabled = false,
|
||||||
|
}: {
|
||||||
|
number_setting: NumberSetting;
|
||||||
|
on_change: (new_value: number) => void;
|
||||||
|
className?: string;
|
||||||
|
disabled?: boolean;
|
||||||
|
} = $props();
|
||||||
|
|
||||||
|
let el: HTMLInputElement | null = null;
|
||||||
|
|
||||||
|
function increase() {
|
||||||
|
if (!el) return;
|
||||||
|
el.stepUp();
|
||||||
|
el.dispatchEvent(new Event('input', { bubbles: true }));
|
||||||
|
on_change(Number(el.value));
|
||||||
|
}
|
||||||
|
|
||||||
|
function decrease() {
|
||||||
|
if (!el) return;
|
||||||
|
el.stepDown();
|
||||||
|
el.dispatchEvent(new Event('input', { bubbles: true }));
|
||||||
|
on_change(Number(el.value));
|
||||||
|
}
|
||||||
|
|
||||||
|
function on_blur() {
|
||||||
|
if (!el) return;
|
||||||
|
let value = Number(el.value);
|
||||||
|
if (value > number_setting.max) value = number_setting.max;
|
||||||
|
else if (value < number_setting.min) value = number_setting.min;
|
||||||
|
el.value = String(value);
|
||||||
|
on_change(value);
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="flex flex-row {className}">
|
||||||
|
<Button click_function={increase} className="rounded-r-none" disabled={disabled}>
|
||||||
|
<ChevronUp />
|
||||||
|
</Button>
|
||||||
|
<input
|
||||||
|
bind:this={el}
|
||||||
|
class="bg-stone-700 focus:bg-stone-550 focus:outline-none transition-colors duration-200 py-2 px-4 w-15 text-center
|
||||||
|
{disabled ? 'text-stone-500 cursor-not-allowed' : 'hover:bg-stone-600'}
|
||||||
|
[appearance:textfield]
|
||||||
|
[&::-webkit-outer-spin-button]:appearance-none
|
||||||
|
[&::-webkit-inner-spin-button]:appearance-none"
|
||||||
|
type="number"
|
||||||
|
disabled={disabled}
|
||||||
|
max={number_setting.max}
|
||||||
|
min={number_setting.min}
|
||||||
|
value={number_setting.now}
|
||||||
|
step={number_setting.step}
|
||||||
|
onblur={on_blur}
|
||||||
|
/>
|
||||||
|
<Button click_function={decrease} className="rounded-l-none" disabled={disabled}>
|
||||||
|
<ChevronDown />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function handle_keydown(event: KeyboardEvent) {
|
function handle_keydown(event: KeyboardEvent) {
|
||||||
if (event.key !== 'Enter') return;
|
if (event.key !== 'Enter' || !current_valid) return;
|
||||||
|
|
||||||
if (enter_mode === 'focus_next') {
|
if (enter_mode === 'focus_next') {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|||||||
@@ -22,7 +22,10 @@ export async function open_file(ip: string, path_to_file: string): Promise<void>
|
|||||||
await request_display(ip, get_sanitized_file_url(path_to_file), options);
|
await request_display(ip, get_sanitized_file_url(path_to_file), options);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function send_keyboard_input(ip: string, inputs: { key: string; action: 'press' | 'release'}[]): Promise<void> {
|
export async function send_keyboard_input(
|
||||||
|
ip: string,
|
||||||
|
inputs: { key: string; action: 'press' | 'release' }[]
|
||||||
|
): Promise<void> {
|
||||||
const options = {
|
const options = {
|
||||||
method: 'PATCH',
|
method: 'PATCH',
|
||||||
headers: { 'content-type': 'application/json' },
|
headers: { 'content-type': 'application/json' },
|
||||||
@@ -33,7 +36,7 @@ export async function send_keyboard_input(ip: string, inputs: { key: string; act
|
|||||||
await request_display(ip, '/keyboardInput', options);
|
await request_display(ip, '/keyboardInput', options);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function show_html(ip: string, html: string) {
|
export async function show_html(ip: string, html: string): Promise<void> {
|
||||||
const options = {
|
const options = {
|
||||||
method: 'PATCH',
|
method: 'PATCH',
|
||||||
headers: { 'content-type': 'application/json' },
|
headers: { 'content-type': 'application/json' },
|
||||||
@@ -69,6 +72,7 @@ export async function get_file_data(
|
|||||||
const json_response = raw_response.json as ShellCommandResponse;
|
const json_response = raw_response.json as ShellCommandResponse;
|
||||||
if (json_response.exitCode === 0 && json_response.stdout.trim() === '') return [];
|
if (json_response.exitCode === 0 && json_response.stdout.trim() === '') return [];
|
||||||
if (handle_shell_error(ip, json_response, command, true)) return null;
|
if (handle_shell_error(ip, json_response, command, true)) return null;
|
||||||
|
if (json_response.stdout.trim() === '') return null;
|
||||||
|
|
||||||
const response: FileInfo[] = json_response.stdout
|
const response: FileInfo[] = json_response.stdout
|
||||||
.trim()
|
.trim()
|
||||||
@@ -106,16 +110,8 @@ export async function get_file_tree_data(ip: string, path: string): Promise<Tree
|
|||||||
return tree_element?.contents || null;
|
return tree_element?.contents || null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function create_folders(
|
export async function create_path(ip: string, path: string): Promise<void> {
|
||||||
ip: string,
|
const command = `mkdir -p ".${path}"`;
|
||||||
path: string,
|
|
||||||
folder_names: string[]
|
|
||||||
): Promise<void> {
|
|
||||||
let command = `cd ".${path}"`;
|
|
||||||
|
|
||||||
for (const part of folder_names) {
|
|
||||||
command += ` && mkdir "${part}" && cd "${part}/"`;
|
|
||||||
}
|
|
||||||
|
|
||||||
const raw_response = await run_shell_command(ip, command);
|
const raw_response = await run_shell_command(ip, command);
|
||||||
if (!raw_response.ok || !raw_response.json) return;
|
if (!raw_response.ok || !raw_response.json) return;
|
||||||
@@ -239,7 +235,11 @@ async function request(
|
|||||||
error_description += '\nCould not parse error description';
|
error_description += '\nCould not parse error description';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
notifications.push('error', `Fehler ${response.status} bei API-Anfrage`, error_description);
|
notifications.push(
|
||||||
|
'error',
|
||||||
|
`Fehler bei API-Anfrage`,
|
||||||
|
`\nHTTP: ${response.status}\n${error_description}`
|
||||||
|
);
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
if (error instanceof TypeError && /fetch|NetworkError/i.test(error.message)) {
|
if (error instanceof TypeError && /fetch|NetworkError/i.test(error.message)) {
|
||||||
if (dev) {
|
if (dev) {
|
||||||
@@ -273,12 +273,11 @@ function handle_shell_error(
|
|||||||
console.error(shell_response);
|
console.error(shell_response);
|
||||||
notifications.push(
|
notifications.push(
|
||||||
'error',
|
'error',
|
||||||
`Fehler ${shell_response.exitCode} in API-Shell`,
|
`Fehler in API-Shell`,
|
||||||
`${ip}\n${shell_command}\nFehler: ${shell_response.stderr}`
|
`${ip}\n${shell_command}\nFehler (${shell_response.exitCode}): ${shell_response.stderr}`
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (shell_response.stdout.trim() === '') return true;
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -294,7 +293,7 @@ async function run_shell_command(ip: string, command: string): Promise<RequestRe
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function shutdown(ip: string): Promise<RequestResponse> {
|
export async function shutdown(ip: string): Promise<RequestResponse> {
|
||||||
return await run_shell_command(ip, 'shutdown -h now');
|
return await run_shell_command(ip, 'xfce4-session-logout --halt');
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function startup(mac: string): Promise<RequestResponse> {
|
export async function startup(mac: string): Promise<RequestResponse> {
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
import { db } from './database';
|
import { db } from './database';
|
||||||
import { get_display_by_id } from './stores/displays';
|
import { get_display_by_id } from './stores/displays';
|
||||||
import {
|
import {
|
||||||
get_current_folder_elements,
|
create_path_on_all_selected_displays,
|
||||||
|
get_folder_elements,
|
||||||
get_file_by_id,
|
get_file_by_id,
|
||||||
remove_all_files_without_display,
|
remove_all_files_without_display,
|
||||||
remove_file_from_display
|
remove_file_from_display_recusively
|
||||||
} from './stores/files';
|
} from './stores/files';
|
||||||
import { notifications } from './stores/notification';
|
import { notifications } from './stores/notification';
|
||||||
import { generate_thumbnail } from './stores/thumbnails';
|
import { generate_thumbnail } from './stores/thumbnails';
|
||||||
@@ -28,8 +29,10 @@ export async function add_upload(
|
|||||||
) {
|
) {
|
||||||
if (file_list.length === 0) return console.warn('Upload canceled: no selected files');
|
if (file_list.length === 0) return console.warn('Upload canceled: no selected files');
|
||||||
|
|
||||||
|
await create_path_on_all_selected_displays(current_file_path, selected_display_ids);
|
||||||
|
|
||||||
const used_file_names: string[] = await (
|
const used_file_names: string[] = await (
|
||||||
await get_current_folder_elements(current_file_path, selected_display_ids)
|
await get_folder_elements(current_file_path, selected_display_ids)
|
||||||
).map((e) => e.name);
|
).map((e) => e.name);
|
||||||
|
|
||||||
for (const file of file_list) {
|
for (const file of file_list) {
|
||||||
@@ -86,13 +89,32 @@ export async function add_upload(
|
|||||||
await start_task_processing();
|
await start_task_processing();
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function add_sync(selected_file_id: string, selected_display_ids: string[]) {
|
export async function add_sync_recursively(
|
||||||
|
selected_file_id: string,
|
||||||
|
selected_display_ids: string[]
|
||||||
|
) {
|
||||||
const file_data = await find_file_data_on_active_selected_display(
|
const file_data = await find_file_data_on_active_selected_display(
|
||||||
selected_file_id,
|
selected_file_id,
|
||||||
selected_display_ids
|
selected_display_ids
|
||||||
);
|
);
|
||||||
if (!file_data) return console.warn('Sync canceled: no file_data');
|
if (!file_data) return console.warn('Sync canceled: no file_data');
|
||||||
|
|
||||||
|
if (file_data.file.type === 'inode/directory') {
|
||||||
|
const new_path = file_data.file.path + file_data.file.name + '/';
|
||||||
|
const elements_in_folder = await get_folder_elements(new_path, selected_display_ids);
|
||||||
|
if (elements_in_folder.length === 0) {
|
||||||
|
await create_path_on_all_selected_displays(new_path, selected_display_ids);
|
||||||
|
} else {
|
||||||
|
for (const el of elements_in_folder) {
|
||||||
|
await add_sync_recursively(get_file_primary_key(el), selected_display_ids);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return; // cannot sync folder
|
||||||
|
}
|
||||||
|
|
||||||
|
if (file_data.short_displays_without_file.length === 0) return; // file is present on all selected displays
|
||||||
|
await create_path_on_all_selected_displays(file_data.file.path, selected_display_ids);
|
||||||
|
|
||||||
tasks.push({
|
tasks.push({
|
||||||
data: {
|
data: {
|
||||||
type: 'sync',
|
type: 'sync',
|
||||||
@@ -114,18 +136,21 @@ export async function add_sync(selected_file_id: string, selected_display_ids: s
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
const display_ids_without_file = file_data.short_displays_without_file.map((d) => d.id);
|
const display_ids_without_file = file_data.short_displays_without_file.map((d) => d.id);
|
||||||
await db.files_on_display
|
const new_file_loading_data: FileLoadingData = {
|
||||||
.where('file_primary_key')
|
|
||||||
.equals(selected_file_id)
|
|
||||||
.filter((e) => display_ids_without_file.includes(e.display_id))
|
|
||||||
.modify({
|
|
||||||
loading_data: {
|
|
||||||
type: 'sync_upload',
|
type: 'sync_upload',
|
||||||
percentage: 0,
|
percentage: 0,
|
||||||
bytes_per_second: 0,
|
bytes_per_second: 0,
|
||||||
seconds_until_finish: -1
|
seconds_until_finish: -1
|
||||||
}
|
};
|
||||||
});
|
const new_fods: FileOnDisplay[] = display_ids_without_file.map((display_id) => ({
|
||||||
|
display_id,
|
||||||
|
file_primary_key: selected_file_id,
|
||||||
|
date_created: new Date(),
|
||||||
|
loading_data: new_file_loading_data
|
||||||
|
}));
|
||||||
|
console.log("TEST", new_fods)
|
||||||
|
await db.files_on_display.bulkPut(new_fods);
|
||||||
|
|
||||||
await start_task_processing();
|
await start_task_processing();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -199,19 +224,10 @@ function generate_valid_file_name(original_file_name: string, used_file_names: s
|
|||||||
|
|
||||||
async function upload(task: FileTransferTask): Promise<void> {
|
async function upload(task: FileTransferTask): Promise<void> {
|
||||||
const task_data = task.data;
|
const task_data = task.data;
|
||||||
if (task_data.type !== 'upload' || !task_data.file) return console.warn('Task cancelled: wrong task type:', task);
|
if (task_data.type !== 'upload' || !task_data.file)
|
||||||
|
return console.warn('Task cancelled: wrong task type:', task);
|
||||||
|
|
||||||
await upload_file_via_xhr(task, task.display, task_data.file);
|
await upload_file_via_xhr(task, task.display, task_data.file);
|
||||||
|
|
||||||
// Generate Thumbnail if not done already
|
|
||||||
setTimeout(async () => {
|
|
||||||
const inode_element: Inode | undefined = await db.files.get(
|
|
||||||
JSON.parse(task.file_primary_key) as [string, string, number, string]
|
|
||||||
);
|
|
||||||
if (!!inode_element && inode_element.thumbnail === null) {
|
|
||||||
await generate_thumbnail(task.display.ip, task.path, inode_element);
|
|
||||||
}
|
|
||||||
}, 10);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function sync(task: FileTransferTask) {
|
export async function sync(task: FileTransferTask) {
|
||||||
@@ -253,6 +269,10 @@ export async function sync(task: FileTransferTask) {
|
|||||||
}
|
}
|
||||||
await writable.close();
|
await writable.close();
|
||||||
|
|
||||||
|
await db.files_on_display.update([task.display.id, task.file_primary_key], {
|
||||||
|
loading_data: null
|
||||||
|
});
|
||||||
|
|
||||||
// 02 - send downloaded file to every destination_display
|
// 02 - send downloaded file to every destination_display
|
||||||
const temp_file = await file_handle.getFile();
|
const temp_file = await file_handle.getFile();
|
||||||
|
|
||||||
@@ -271,7 +291,8 @@ export async function download_file(selected_file_id: string, selected_display_i
|
|||||||
selected_file_id,
|
selected_file_id,
|
||||||
selected_display_ids
|
selected_display_ids
|
||||||
);
|
);
|
||||||
if (!file_data || file_data.file.type === 'inode/directory') return console.warn('Download cancelled: is folder');
|
if (!file_data || file_data.file.type === 'inode/directory')
|
||||||
|
return console.warn('Download cancelled: is folder');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const url = `http://${file_data.short_display_with_file.ip}:1323/api${get_sanitized_file_url(file_data.file.path + file_data.file.name)}`;
|
const url = `http://${file_data.short_display_with_file.ip}:1323/api${get_sanitized_file_url(file_data.file.path + file_data.file.name)}`;
|
||||||
@@ -301,12 +322,10 @@ async function start_task_processing() {
|
|||||||
|
|
||||||
async function start_task_loop() {
|
async function start_task_loop() {
|
||||||
while (tasks.length > 0) {
|
while (tasks.length > 0) {
|
||||||
console.log('NOCH', tasks.length, 'ZU TUN');
|
|
||||||
const current_task = tasks[0];
|
const current_task = tasks[0];
|
||||||
if (current_task.data.type === 'upload') {
|
if (current_task.data.type === 'upload') {
|
||||||
await upload(current_task);
|
await upload(current_task);
|
||||||
}
|
} else if (current_task.data.type === 'sync') {
|
||||||
else if (current_task.data.type === 'sync') {
|
|
||||||
await sync(current_task);
|
await sync(current_task);
|
||||||
}
|
}
|
||||||
tasks.shift(); // Remove current_task from tasks
|
tasks.shift(); // Remove current_task from tasks
|
||||||
@@ -314,8 +333,13 @@ async function start_task_loop() {
|
|||||||
is_processing = false;
|
is_processing = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function upload_file_via_xhr(task: FileTransferTask, current_short_display: ShortDisplay, current_file: File) {
|
async function upload_file_via_xhr(
|
||||||
|
task: FileTransferTask,
|
||||||
|
current_short_display: ShortDisplay,
|
||||||
|
current_file: File
|
||||||
|
) {
|
||||||
const start_time = new Date();
|
const start_time = new Date();
|
||||||
|
const loading_type = task.data.type === 'upload' ? 'upload' : 'sync_upload';
|
||||||
|
|
||||||
return new Promise<void>((resolve) => {
|
return new Promise<void>((resolve) => {
|
||||||
const xhr = new XMLHttpRequest();
|
const xhr = new XMLHttpRequest();
|
||||||
@@ -328,7 +352,13 @@ async function upload_file_via_xhr(task: FileTransferTask, current_short_display
|
|||||||
|
|
||||||
xhr.upload.onprogress = (e) => {
|
xhr.upload.onprogress = (e) => {
|
||||||
const apply = async () => {
|
const apply = async () => {
|
||||||
await update_current_loading_data(task.data.type === 'upload' ? 'upload' : 'sync_upload', task, e.loaded, start_time, current_short_display.id);
|
await update_current_loading_data(
|
||||||
|
loading_type,
|
||||||
|
task,
|
||||||
|
e.loaded,
|
||||||
|
start_time,
|
||||||
|
current_short_display.id
|
||||||
|
);
|
||||||
};
|
};
|
||||||
apply();
|
apply();
|
||||||
};
|
};
|
||||||
@@ -341,9 +371,20 @@ async function upload_file_via_xhr(task: FileTransferTask, current_short_display
|
|||||||
xhr.onreadystatechange = async () => {
|
xhr.onreadystatechange = async () => {
|
||||||
if (xhr.readyState === 4) {
|
if (xhr.readyState === 4) {
|
||||||
if (xhr.status == 200) {
|
if (xhr.status == 200) {
|
||||||
await db.files_on_display.update([current_short_display.ip, task.file_primary_key], {
|
// set loading_data to 100%
|
||||||
|
await db.files_on_display.update([current_short_display.id, task.file_primary_key], {
|
||||||
|
date_created: new Date(),
|
||||||
loading_data: null
|
loading_data: null
|
||||||
}); // TODO: Stattdessen update machen und gucken, ob die Datei wirklich da ist
|
});
|
||||||
|
// Generate Thumbnail if not done already
|
||||||
|
setTimeout(async () => {
|
||||||
|
const inode_element: Inode | undefined = await db.files.get(
|
||||||
|
JSON.parse(task.file_primary_key) as [string, string, number, string]
|
||||||
|
);
|
||||||
|
if (!!inode_element && inode_element.thumbnail === null) {
|
||||||
|
await generate_thumbnail(task.display.ip, task.path, inode_element);
|
||||||
|
}
|
||||||
|
}, 10);
|
||||||
} else {
|
} else {
|
||||||
await show_error(task, `HTTP ${xhr.status}`);
|
await show_error(task, `HTTP ${xhr.status}`);
|
||||||
}
|
}
|
||||||
@@ -352,21 +393,33 @@ async function upload_file_via_xhr(task: FileTransferTask, current_short_display
|
|||||||
};
|
};
|
||||||
|
|
||||||
xhr.send(current_file);
|
xhr.send(current_file);
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function update_current_loading_data(type: FileLoadingData['type'], task: FileTransferTask, current_bytes: number, start_time: Date, other_display_id: string | null = null) {
|
async function update_current_loading_data(
|
||||||
const current_percentage = task.bytes_total > 0 ? Math.round((current_bytes / task.bytes_total) * 100) : 1;
|
type: FileLoadingData['type'],
|
||||||
|
task: FileTransferTask,
|
||||||
|
current_bytes: number,
|
||||||
|
start_time: Date,
|
||||||
|
other_display_id: string | null = null
|
||||||
|
) {
|
||||||
|
const current_percentage = Math.min(
|
||||||
|
task.bytes_total > 0 ? Math.round((current_bytes / task.bytes_total) * 100) : 1,
|
||||||
|
99
|
||||||
|
); // calculate percantage, but maximum value is 99%
|
||||||
const prognosed_data = get_prognosed_data(start_time, current_bytes, task.bytes_total);
|
const prognosed_data = get_prognosed_data(start_time, current_bytes, task.bytes_total);
|
||||||
|
|
||||||
await db.files_on_display.update([other_display_id ? other_display_id : task.display.id, task.file_primary_key], {
|
await db.files_on_display.update(
|
||||||
|
[other_display_id ? other_display_id : task.display.id, task.file_primary_key],
|
||||||
|
{
|
||||||
loading_data: {
|
loading_data: {
|
||||||
type,
|
type,
|
||||||
percentage: current_percentage,
|
percentage: current_percentage,
|
||||||
bytes_per_second: prognosed_data.bytes_per_second,
|
bytes_per_second: prognosed_data.bytes_per_second,
|
||||||
seconds_until_finish: prognosed_data.seconds_until_finish
|
seconds_until_finish: prognosed_data.seconds_until_finish
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_prognosed_data(
|
function get_prognosed_data(
|
||||||
@@ -390,11 +443,11 @@ async function show_error(task: FileTransferTask, error: ProgressEvent | string)
|
|||||||
`Datei: "${task.file_name}", Display-IP: ${task.display.ip}\nFehler: ${error}`
|
`Datei: "${task.file_name}", Display-IP: ${task.display.ip}\nFehler: ${error}`
|
||||||
);
|
);
|
||||||
if (task_data.type === 'upload') {
|
if (task_data.type === 'upload') {
|
||||||
await remove_file_from_display(task.display.id, task.file_primary_key);
|
await remove_file_from_display_recusively(task.display.id, task.file_primary_key);
|
||||||
await remove_all_files_without_display();
|
await remove_all_files_without_display();
|
||||||
} else if (task_data.type === 'sync') {
|
} else if (task_data.type === 'sync') {
|
||||||
for (const display_id of task_data.destination_displays.map((e) => e.id)) {
|
for (const display_id of task_data.destination_displays.map((e) => e.id)) {
|
||||||
await remove_file_from_display(display_id, task.file_primary_key);
|
await remove_file_from_display_recusively(display_id, task.file_primary_key);
|
||||||
}
|
}
|
||||||
await remove_all_files_without_display();
|
await remove_all_files_without_display();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,26 +5,59 @@ import { update_folder_elements_recursively } from './stores/files';
|
|||||||
import { db } from './database';
|
import { db } from './database';
|
||||||
|
|
||||||
const update_display_status_interval_seconds = 20;
|
const update_display_status_interval_seconds = 20;
|
||||||
|
const update_display_loading_status_interval_seconds = 2;
|
||||||
|
|
||||||
export async function on_start() {
|
const loading_display_ids: string[] = [];
|
||||||
|
|
||||||
|
export async function on_app_start() {
|
||||||
await db.files.clear();
|
await db.files.clear();
|
||||||
await db.files_on_display.clear();
|
await db.files_on_display.clear();
|
||||||
await update_all_display_status();
|
await update_all_display_status(false);
|
||||||
await setInterval(update_all_display_status, update_display_status_interval_seconds * 1000);
|
await setInterval(
|
||||||
|
() => update_all_display_status(false),
|
||||||
|
update_display_status_interval_seconds * 1000
|
||||||
|
);
|
||||||
|
await setInterval(
|
||||||
|
() => update_all_display_status(true),
|
||||||
|
update_display_loading_status_interval_seconds * 1000
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function update_all_display_status() {
|
async function update_all_display_status(only_loading_displays: boolean) {
|
||||||
const all_displays: Display[] = await db.displays.toArray();
|
const not_loading_displays: Display[] = await db.displays
|
||||||
for (const display of all_displays) {
|
.filter((d) =>
|
||||||
|
only_loading_displays
|
||||||
|
? loading_display_ids.includes(d.id)
|
||||||
|
: !loading_display_ids.includes(d.id)
|
||||||
|
)
|
||||||
|
.toArray();
|
||||||
|
for (const display of not_loading_displays) {
|
||||||
|
await update_display_status(display);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function update_display_status(display: Display) {
|
||||||
const new_status = await ping_ip(display.ip);
|
const new_status = await ping_ip(display.ip);
|
||||||
if (new_status === null && display.status !== null) continue;
|
if (new_status === null && display.status !== null) return;
|
||||||
if (new_status === 'app_online' && display.status !== 'app_online') {
|
if (new_status !== display.status) {
|
||||||
|
// status change
|
||||||
|
if (new_status === 'app_offline') {
|
||||||
|
loading_display_ids.push(display.id);
|
||||||
|
} else {
|
||||||
|
remove_display_from_loading_displays(display.id);
|
||||||
|
if (new_status === 'app_online') {
|
||||||
on_display_start(display);
|
on_display_start(display);
|
||||||
}
|
}
|
||||||
if (new_status !== display.status) {
|
}
|
||||||
display.status = new_status;
|
display.status = new_status;
|
||||||
await db.displays.put(display); // save
|
await db.displays.put(display); // save
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function remove_display_from_loading_displays(display_id: string) {
|
||||||
|
const index = loading_display_ids.indexOf(display_id);
|
||||||
|
if (index !== -1) {
|
||||||
|
loading_display_ids.splice(index, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,21 @@
|
|||||||
import { get } from 'svelte/store';
|
import { get, writable, type Writable } from 'svelte/store';
|
||||||
import type { Display, DisplayGroup, DisplayStatus } from '../types';
|
import type {
|
||||||
|
Display,
|
||||||
|
DisplayGroup,
|
||||||
|
DisplayIdGroup,
|
||||||
|
DisplayIdObject,
|
||||||
|
DisplayStatus
|
||||||
|
} from '../types';
|
||||||
import { is_selected, select, selected_display_ids } from './select';
|
import { is_selected, select, selected_display_ids } from './select';
|
||||||
import { get_uuid, image_content_hash } from '../utils';
|
import { get_uuid, image_content_hash } from '../utils';
|
||||||
import { get_screenshot } from '../api_handler';
|
import { get_screenshot } from '../api_handler';
|
||||||
import { delete_and_deselect_unique_files_from_display } from './files';
|
import { delete_and_deselect_unique_files_from_display } from './files';
|
||||||
import { db } from '../database';
|
import { db } from '../database';
|
||||||
|
import { dev } from '$app/environment';
|
||||||
|
import { remove_display_from_loading_displays } from '../main';
|
||||||
|
import { preview_settings } from './ui_behavior';
|
||||||
|
|
||||||
|
export const local_displays: Writable<DisplayIdGroup[]> = writable<DisplayIdGroup[]>([]);
|
||||||
|
|
||||||
export async function is_display_name_taken(name: string): Promise<boolean> {
|
export async function is_display_name_taken(name: string): Promise<boolean> {
|
||||||
const exists = await db.displays.where('name').equals(name).first();
|
const exists = await db.displays.where('name').equals(name).first();
|
||||||
@@ -16,8 +27,8 @@ export async function add_display(
|
|||||||
mac: string | null,
|
mac: string | null,
|
||||||
name: string,
|
name: string,
|
||||||
status: DisplayStatus
|
status: DisplayStatus
|
||||||
) {
|
): Promise<Display | null> {
|
||||||
if (await is_display_name_taken(name)) return;
|
if (await is_display_name_taken(name)) return null;
|
||||||
const new_id = get_uuid();
|
const new_id = get_uuid();
|
||||||
const group = await db.display_groups.toCollection().first();
|
const group = await db.display_groups.toCollection().first();
|
||||||
let group_id: string;
|
let group_id: string;
|
||||||
@@ -29,7 +40,7 @@ export async function add_display(
|
|||||||
}
|
}
|
||||||
const element_count_in_group = (await db.displays.where('group_id').equals(group_id).toArray())
|
const element_count_in_group = (await db.displays.where('group_id').equals(group_id).toArray())
|
||||||
.length;
|
.length;
|
||||||
await db.displays.put({
|
const display = {
|
||||||
id: new_id,
|
id: new_id,
|
||||||
ip,
|
ip,
|
||||||
mac,
|
mac,
|
||||||
@@ -38,7 +49,9 @@ export async function add_display(
|
|||||||
group_id: group_id,
|
group_id: group_id,
|
||||||
name,
|
name,
|
||||||
status
|
status
|
||||||
});
|
};
|
||||||
|
await db.displays.put(display);
|
||||||
|
return display;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function edit_display_data(
|
export async function edit_display_data(
|
||||||
@@ -46,11 +59,12 @@ export async function edit_display_data(
|
|||||||
ip: string,
|
ip: string,
|
||||||
mac: string | null,
|
mac: string | null,
|
||||||
name: string
|
name: string
|
||||||
) {
|
): Promise<Display | null> {
|
||||||
let display = await db.displays.get(display_id);
|
let display = await db.displays.get(display_id);
|
||||||
if (!display) return;
|
if (!display) return null;
|
||||||
display = { ...display, ip: ip, mac: mac, name: name };
|
display = { ...display, ip: ip, mac: mac, name: name };
|
||||||
await db.displays.put(display); // save
|
await db.displays.put(display); // save
|
||||||
|
return display;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function remove_display(display_id: string) {
|
export async function remove_display(display_id: string) {
|
||||||
@@ -62,6 +76,7 @@ export async function remove_display(display_id: string) {
|
|||||||
if (group_id && (await db.displays.where('group_id').equals(group_id).toArray()).length === 0) {
|
if (group_id && (await db.displays.where('group_id').equals(group_id).toArray()).length === 0) {
|
||||||
await db.display_groups.delete(group_id); // delete empty group
|
await db.display_groups.delete(group_id); // delete empty group
|
||||||
}
|
}
|
||||||
|
await remove_display_from_loading_displays(display_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function all_displays_of_group_selected(
|
export async function all_displays_of_group_selected(
|
||||||
@@ -103,7 +118,13 @@ export async function get_display_by_id(display_id: string): Promise<Display | n
|
|||||||
return (await db.displays.get(display_id)) ?? null;
|
return (await db.displays.get(display_id)) ?? null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function screenshot_loop(display_id: string, initial_retry_count: number = 5) {
|
export async function screenshot_loop(display_id: string) {
|
||||||
|
const settings = get(preview_settings);
|
||||||
|
if (settings.mode === 'never') return;
|
||||||
|
|
||||||
|
const initial_retry_count = settings.retry_count.now;
|
||||||
|
const retry_seconds = get(preview_settings).retry_seconds.now;
|
||||||
|
|
||||||
const display = await db.displays.get(display_id);
|
const display = await db.displays.get(display_id);
|
||||||
if (!display || display.preview.currently_updating) return;
|
if (!display || display.preview.currently_updating) return;
|
||||||
|
|
||||||
@@ -114,7 +135,7 @@ export async function screenshot_loop(display_id: string, initial_retry_count: n
|
|||||||
|
|
||||||
let retry_count = initial_retry_count;
|
let retry_count = initial_retry_count;
|
||||||
while (retry_count > 0) {
|
while (retry_count > 0) {
|
||||||
retry_count -= 1;
|
if (settings.mode !== 'always') retry_count -= 1;
|
||||||
|
|
||||||
const new_blob = await get_screenshot(display.ip);
|
const new_blob = await get_screenshot(display.ip);
|
||||||
if (!new_blob) {
|
if (!new_blob) {
|
||||||
@@ -135,7 +156,7 @@ export async function screenshot_loop(display_id: string, initial_retry_count: n
|
|||||||
retry_count = initial_retry_count;
|
retry_count = initial_retry_count;
|
||||||
}
|
}
|
||||||
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, 2000)); // sleep 2s
|
await new Promise((resolve) => setTimeout(resolve, retry_seconds * 1000)); // sleep
|
||||||
}
|
}
|
||||||
|
|
||||||
display.preview.currently_updating = false;
|
display.preview.currently_updating = false;
|
||||||
@@ -168,30 +189,63 @@ export async function get_display_groups(): Promise<DisplayGroup[]> {
|
|||||||
return await db.display_groups.orderBy('position').toArray();
|
return await db.display_groups.orderBy('position').toArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function get_display_ids_in_group(display_group_id: string): Promise<Display[]> {
|
export async function update_local_displays() {
|
||||||
const displays: Display[] = await db.displays
|
const display_groups = await db.display_groups.orderBy('position').toArray();
|
||||||
.where('group_id')
|
const displays = await db.displays.orderBy('position').toArray();
|
||||||
.equals(display_group_id)
|
const out: DisplayIdGroup[] = [];
|
||||||
.sortBy('position');
|
for (const group of display_groups) {
|
||||||
return displays;
|
out.push({
|
||||||
|
id: group.id,
|
||||||
|
displays: (await displays).filter((d) => d.group_id === group.id).map((d) => ({ id: d.id }))
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function set_new_display_order(new_ordered_items: Display[]) {
|
export async function update_db_displays() {
|
||||||
for (let i = 0; i < new_ordered_items.length; i++) {
|
local_displays.update((groups) => groups.filter((g) => g.displays.length !== 0));
|
||||||
new_ordered_items[i].position = i;
|
const filtered_local_display_groups = get(local_displays)
|
||||||
await db.displays.put(new_ordered_items[i]);
|
const db_display_group_ids = (await db.display_groups.toArray()).map((group) => group.id);
|
||||||
|
const local_display_group_ids = filtered_local_display_groups.map((group) => group.id);
|
||||||
|
|
||||||
|
const display_group_ids_to_delete = db_display_group_ids.filter(
|
||||||
|
(group) => !local_display_group_ids.includes(group)
|
||||||
|
);
|
||||||
|
await db.display_groups.where('id').anyOf(display_group_ids_to_delete).delete();
|
||||||
|
|
||||||
|
for (let i = 0; i < filtered_local_display_groups.length; i++) {
|
||||||
|
const group = filtered_local_display_groups[i];
|
||||||
|
if (db_display_group_ids.includes(group.id)) {
|
||||||
|
await db.display_groups.update(group.id, { position: i });
|
||||||
|
} else {
|
||||||
|
await db.display_groups.put({
|
||||||
|
id: group.id,
|
||||||
|
position: i
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
for (let j = 0; j < group.displays.length; j++) {
|
||||||
|
const display_id = group.displays[j].id;
|
||||||
|
await db.displays.update(display_id, { position: j, group_id: group.id });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function set_new_display_group_order(new_ordered_items: DisplayGroup[]) {
|
export function set_new_display_order(display_id_group_id: string, new_data: DisplayIdObject[]) {
|
||||||
for (let i = 0; i < new_ordered_items.length; i++) {
|
local_displays.update((local_displays: DisplayIdGroup[]) => {
|
||||||
new_ordered_items[i].position = i;
|
for (const display_id_group of local_displays) {
|
||||||
await db.display_groups.put(new_ordered_items[i]);
|
if (display_id_group.id === display_id_group_id) {
|
||||||
|
display_id_group.displays = new_data;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
return local_displays;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
setTimeout(add_testing_displays, 0);
|
if (dev) {
|
||||||
async function add_testing_displays() {
|
setTimeout(add_testing_displays, 0);
|
||||||
|
async function add_testing_displays() {
|
||||||
await add_display('127.0.0.1', '00:1A:2B:3C:4D:5E', 'PC', 'host_offline');
|
await add_display('127.0.0.1', '00:1A:2B:3C:4D:5E', 'PC', 'host_offline');
|
||||||
// await add_display("192.168.178.111", "D4:81:D7:C0:DF:3C", "Laptop", "host_offline");
|
// await add_display("192.168.178.111", "D4:81:D7:C0:DF:3C", "Laptop", "host_offline");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
} from '../types';
|
} from '../types';
|
||||||
import { get_display_by_id } from './displays';
|
import { get_display_by_id } from './displays';
|
||||||
import { is_selected, select, selected_display_ids, selected_file_ids } from './select';
|
import { is_selected, select, selected_display_ids, selected_file_ids } from './select';
|
||||||
import { create_folders, get_file_data, get_file_tree_data } from '../api_handler';
|
import { create_path, get_file_data, get_file_tree_data } from '../api_handler';
|
||||||
import { deactivate_old_thumbnail_urls, generate_thumbnail } from './thumbnails';
|
import { deactivate_old_thumbnail_urls, generate_thumbnail } from './thumbnails';
|
||||||
import { db } from '../database';
|
import { db } from '../database';
|
||||||
|
|
||||||
@@ -42,16 +42,38 @@ export async function delete_and_deselect_unique_files_from_display(display_id:
|
|||||||
.equals(display_id)
|
.equals(display_id)
|
||||||
.toArray();
|
.toArray();
|
||||||
for (const file of files_on_display) {
|
for (const file of files_on_display) {
|
||||||
await remove_file_from_display(display_id, file.file_primary_key);
|
await remove_file_from_display_recusively(display_id, file.file_primary_key);
|
||||||
}
|
}
|
||||||
await remove_all_files_without_display();
|
await remove_all_files_without_display();
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function remove_file_from_display(display_id: string, file_primary_key: string) {
|
export async function remove_file_from_display_recusively(
|
||||||
|
display_id: string,
|
||||||
|
file_primary_key: string
|
||||||
|
) {
|
||||||
const found = await db.files_on_display.get([display_id, file_primary_key]);
|
const found = await db.files_on_display.get([display_id, file_primary_key]);
|
||||||
if (!found) return;
|
if (!found) return;
|
||||||
select(selected_file_ids, file_primary_key, 'deselect');
|
select(selected_file_ids, file_primary_key, 'deselect');
|
||||||
await db.files_on_display.delete([display_id, file_primary_key]);
|
await db.files_on_display.delete([display_id, file_primary_key]);
|
||||||
|
|
||||||
|
const inode_element = await get_file_by_id(found.file_primary_key);
|
||||||
|
if (!inode_element) return;
|
||||||
|
if (inode_element.type === 'inode/directory') {
|
||||||
|
const path_inside_folder = inode_element.path + inode_element.name + `/`;
|
||||||
|
const primary_file_keys_in_folder = (
|
||||||
|
await db.files.where('path').equals(path_inside_folder).toArray()
|
||||||
|
).map((e) => get_file_primary_key(e));
|
||||||
|
const primary_file_keys_in_folder_on_display = (
|
||||||
|
await db.files_on_display
|
||||||
|
.where('file_primary_key')
|
||||||
|
.anyOf(primary_file_keys_in_folder)
|
||||||
|
.filter((file) => file.display_id === display_id)
|
||||||
|
.toArray()
|
||||||
|
).map((e) => e.file_primary_key);
|
||||||
|
for (const file_key of primary_file_keys_in_folder_on_display) {
|
||||||
|
await remove_file_from_display_recusively(display_id, file_key);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function remove_all_files_without_display() {
|
export async function remove_all_files_without_display() {
|
||||||
@@ -111,12 +133,11 @@ async function get_display_ids_where_file_is_missing(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function get_displays_where_path_exists(
|
export async function get_displays_where_path_not_exists(
|
||||||
path: string,
|
path: string,
|
||||||
selected_display_ids: string[],
|
selected_display_ids: string[]
|
||||||
invert: boolean
|
|
||||||
): Promise<Display[]> {
|
): Promise<Display[]> {
|
||||||
if (path === '/') return [];
|
if (path === '/') return await db.displays.where('id').anyOf(selected_display_ids).toArray();
|
||||||
const last_path_part =
|
const last_path_part =
|
||||||
path
|
path
|
||||||
.slice(0, path.length - 1)
|
.slice(0, path.length - 1)
|
||||||
@@ -125,20 +146,19 @@ export async function get_displays_where_path_exists(
|
|||||||
const path_without_last_part = path.slice(0, path.length - (last_path_part.length + 1));
|
const path_without_last_part = path.slice(0, path.length - (last_path_part.length + 1));
|
||||||
|
|
||||||
const folders_of_current_path = await db.files
|
const folders_of_current_path = await db.files
|
||||||
.where('[path+name+type]')
|
.where('name')
|
||||||
.equals([path_without_last_part, last_path_part, 'inode/directory'])
|
.equals(last_path_part)
|
||||||
|
.filter((inode) => inode.path === path_without_last_part && inode.type === 'inode/directory')
|
||||||
.first();
|
.first();
|
||||||
if (!folders_of_current_path)
|
if (!folders_of_current_path) return [];
|
||||||
return await db.displays.where('id').anyOf(selected_display_ids).toArray();
|
|
||||||
const folder_primary_key = get_file_primary_key(folders_of_current_path);
|
const folder_primary_key = get_file_primary_key(folders_of_current_path);
|
||||||
|
|
||||||
const display_ids = selected_display_ids.filter(async (display_id) => {
|
const display_ids_with_folder = (
|
||||||
const folder_exists = await db.files_on_display.get([display_id, folder_primary_key]);
|
await db.files_on_display.where('file_primary_key').equals(folder_primary_key).toArray()
|
||||||
if (invert) {
|
).map((fod) => fod.display_id);
|
||||||
return !folder_exists;
|
|
||||||
} else {
|
const display_ids = selected_display_ids.filter((display_id) => {
|
||||||
return folder_exists;
|
return !display_ids_with_folder.includes(display_id);
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return (await db.displays.bulkGet(display_ids)).filter((e) => e !== undefined);
|
return (await db.displays.bulkGet(display_ids)).filter((e) => e !== undefined);
|
||||||
@@ -211,17 +231,30 @@ export async function update_folder_elements_recursively(
|
|||||||
const new_folder_elements = await get_file_data(display.ip, file_path);
|
const new_folder_elements = await get_file_data(display.ip, file_path);
|
||||||
if (!new_folder_elements) return;
|
if (!new_folder_elements) return;
|
||||||
|
|
||||||
const existing_file_keys_on_display_in_path: [string, string, number, string][] = (
|
const existing_files_on_display_in_path: FileOnDisplay[] = await db.files_on_display
|
||||||
await db.files_on_display.where('display_id').equals(display.id).toArray()
|
.where('display_id')
|
||||||
).map((e) => JSON.parse(e.file_primary_key) as [string, string, number, string]);
|
.equals(display.id)
|
||||||
const existing_files_on_display_in_path: Inode[] = await db.files
|
.toArray();
|
||||||
|
const existing_file_keys_on_display_in_path: [string, string, number, string][] =
|
||||||
|
existing_files_on_display_in_path.map(
|
||||||
|
(e) => JSON.parse(e.file_primary_key) as [string, string, number, string]
|
||||||
|
);
|
||||||
|
const existing_files: Inode[] = await db.files
|
||||||
.where('[path+name+size+type]')
|
.where('[path+name+size+type]')
|
||||||
.anyOf(existing_file_keys_on_display_in_path)
|
.anyOf(existing_file_keys_on_display_in_path)
|
||||||
.filter((e) => e.path === file_path)
|
.filter((e) => e.path === file_path)
|
||||||
.toArray();
|
.toArray();
|
||||||
|
|
||||||
|
const existing_files_with_loading_state: { folder_element: Inode; is_loading: boolean }[] =
|
||||||
|
existing_files.map((folder_element) => ({
|
||||||
|
folder_element,
|
||||||
|
is_loading: !!existing_files_on_display_in_path.find(
|
||||||
|
(e) => e.file_primary_key === get_file_primary_key(folder_element)
|
||||||
|
)?.loading_data
|
||||||
|
}));
|
||||||
|
|
||||||
const diff = get_folder_elements_difference(
|
const diff = get_folder_elements_difference(
|
||||||
existing_files_on_display_in_path,
|
existing_files_with_loading_state,
|
||||||
new_folder_elements
|
new_folder_elements
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -255,28 +288,30 @@ export async function update_folder_elements_recursively(
|
|||||||
if (diff.deleted.length > 0) {
|
if (diff.deleted.length > 0) {
|
||||||
// Remove old Folder-Elements
|
// Remove old Folder-Elements
|
||||||
for (const old_element of diff.deleted) {
|
for (const old_element of diff.deleted) {
|
||||||
remove_file_from_display(display.id, get_file_primary_key(old_element));
|
remove_file_from_display_recusively(display.id, get_file_primary_key(old_element));
|
||||||
}
|
}
|
||||||
await remove_all_files_without_display();
|
await remove_all_files_without_display();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_folder_elements_difference(
|
function get_folder_elements_difference(
|
||||||
old_elements: Inode[],
|
old_elements: { folder_element: Inode; is_loading: boolean }[],
|
||||||
new_elements: { folder_element: Inode; date_created: Date }[]
|
new_elements: { folder_element: Inode; date_created: Date }[]
|
||||||
): { deleted: Inode[]; new: { folder_element: Inode; date_created: Date }[] } {
|
): { deleted: Inode[]; new: { folder_element: Inode; date_created: Date }[] } {
|
||||||
const old_keys = new Set(old_elements.map((e) => get_file_primary_key(e)));
|
const old_keys = new Set(old_elements.map((e) => get_file_primary_key(e.folder_element)));
|
||||||
const new_keys = new Set(new_elements.map((e) => get_file_primary_key(e.folder_element)));
|
const new_keys = new Set(new_elements.map((e) => get_file_primary_key(e.folder_element)));
|
||||||
|
|
||||||
const only_in_old = old_elements.filter((e) => !new_keys.has(get_file_primary_key(e)));
|
const only_in_old = old_elements
|
||||||
|
.filter((e) => !new_keys.has(get_file_primary_key(e.folder_element)) && !e.is_loading)
|
||||||
|
.map((e) => e.folder_element);
|
||||||
const only_in_new = new_elements.filter(
|
const only_in_new = new_elements.filter(
|
||||||
(e) => !old_keys.has(get_file_primary_key(e.folder_element))
|
(e) => !old_keys.has(get_file_primary_key(e.folder_element))
|
||||||
);
|
);
|
||||||
return { deleted: only_in_old, new: only_in_new };
|
return { deleted: only_in_old, new: only_in_new };
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function get_current_folder_elements(
|
export async function get_folder_elements(
|
||||||
current_file_path: string,
|
file_path: string,
|
||||||
selected_display_ids: string[]
|
selected_display_ids: string[]
|
||||||
): Promise<Inode[]> {
|
): Promise<Inode[]> {
|
||||||
const existing_file_keys_on_selected_displays: [string, string, number, string][] = (
|
const existing_file_keys_on_selected_displays: [string, string, number, string][] = (
|
||||||
@@ -285,7 +320,7 @@ export async function get_current_folder_elements(
|
|||||||
const existing_files_on_selected_displays_in_path: Inode[] = await db.files
|
const existing_files_on_selected_displays_in_path: Inode[] = await db.files
|
||||||
.where('[path+name+size+type]')
|
.where('[path+name+size+type]')
|
||||||
.anyOf(existing_file_keys_on_selected_displays)
|
.anyOf(existing_file_keys_on_selected_displays)
|
||||||
.filter((e) => e.path === current_file_path)
|
.filter((e) => e.path === file_path)
|
||||||
.toArray();
|
.toArray();
|
||||||
|
|
||||||
return sort_files(existing_files_on_selected_displays_in_path);
|
return sort_files(existing_files_on_selected_displays_in_path);
|
||||||
@@ -358,32 +393,32 @@ export async function create_folder_on_all_selected_displays(
|
|||||||
path: string,
|
path: string,
|
||||||
selected_display_ids: string[]
|
selected_display_ids: string[]
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const path_parts = path
|
const path_with_folder_name = (path += folder_name + '/');
|
||||||
.slice(1, path.length - 1)
|
await create_path_on_all_selected_displays(path_with_folder_name, selected_display_ids);
|
||||||
.split('/')
|
}
|
||||||
.filter((e) => e.length !== 0);
|
|
||||||
let remaining_display_ids = [...selected_display_ids];
|
|
||||||
|
|
||||||
const getDisplaysForPath = async (currentPath: string): Promise<Display[]> => {
|
export async function create_path_on_all_selected_displays(
|
||||||
if (currentPath === '/') {
|
path: string,
|
||||||
const displays = await db.displays.bulkGet(remaining_display_ids);
|
selected_display_ids: string[]
|
||||||
return displays.filter((d): d is Display => !!d);
|
) {
|
||||||
|
const displays_without_path = await get_displays_where_path_not_exists(
|
||||||
|
path,
|
||||||
|
selected_display_ids
|
||||||
|
);
|
||||||
|
if (displays_without_path.length === 0) return;
|
||||||
|
for (const display of displays_without_path) {
|
||||||
|
await create_path(display.ip, path);
|
||||||
}
|
}
|
||||||
return get_displays_where_path_exists(currentPath, remaining_display_ids, false);
|
setTimeout(async () => {
|
||||||
};
|
for (const display of displays_without_path) {
|
||||||
|
const changed_paths = await get_changed_directory_paths(display, '/');
|
||||||
for (let depth = path_parts.length; depth >= 0 && remaining_display_ids.length; depth--) {
|
if (!changed_paths) continue;
|
||||||
const currentPath = depth === 0 ? '/' : `/${path_parts.slice(0, depth).join('/')}/`;
|
console.debug('Update file system from', display.name, ':', changed_paths);
|
||||||
|
for (const path of changed_paths) {
|
||||||
const displays = await getDisplaysForPath(currentPath);
|
await update_folder_elements_recursively(display, path);
|
||||||
if (!displays.length) continue;
|
|
||||||
|
|
||||||
const folders_to_create = [...path_parts.slice(depth), folder_name];
|
|
||||||
for (const display of displays) {
|
|
||||||
await create_folders(display.ip, currentPath, folders_to_create);
|
|
||||||
remaining_display_ids = remaining_display_ids.filter((id) => id !== display.id);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function get_date_mapping(file_primary_key: string): Promise<Record<string, Date>> {
|
export async function get_date_mapping(file_primary_key: string): Promise<Record<string, Date>> {
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { writable, type Writable } from "svelte/store";
|
import { writable, type Writable } from 'svelte/store';
|
||||||
|
import type { NumberSetting } from '../types';
|
||||||
|
|
||||||
export const dnd_flip_duration_ms = 300;
|
export const dnd_flip_duration_ms = 300;
|
||||||
|
|
||||||
@@ -6,26 +7,48 @@ const heights_options: Record<string, { min: number; max: number; step: number }
|
|||||||
display: {
|
display: {
|
||||||
min: 15,
|
min: 15,
|
||||||
max: 40,
|
max: 40,
|
||||||
step: 5,
|
step: 5
|
||||||
},
|
},
|
||||||
file: {
|
file: {
|
||||||
min: 10,
|
min: 10,
|
||||||
max: 20,
|
max: 20,
|
||||||
step: 5,
|
step: 5
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export const current_height: Writable<Record<string, number>> = writable<Record<string, number>>({
|
export const current_height: Writable<Record<string, number>> = writable<Record<string, number>>({
|
||||||
display: 25,
|
display: 25,
|
||||||
file: 10,
|
file: 10
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
export const is_group_drag: Writable<boolean> = writable<boolean>(false);
|
export const is_group_drag: Writable<boolean> = writable<boolean>(false);
|
||||||
export const is_display_drag: Writable<boolean> = writable<boolean>(false);
|
export const is_display_drag: Writable<boolean> = writable<boolean>(false);
|
||||||
|
|
||||||
export const pinned_display_id: Writable<string | null> = writable<string | null>(null);
|
export const preview_settings: Writable<{
|
||||||
|
mode: 'never' | 'normal' | 'always';
|
||||||
|
retry_seconds: NumberSetting;
|
||||||
|
retry_count: NumberSetting;
|
||||||
|
}> = writable<{
|
||||||
|
mode: 'never' | 'normal' | 'always';
|
||||||
|
retry_seconds: NumberSetting;
|
||||||
|
retry_count: NumberSetting;
|
||||||
|
}>({
|
||||||
|
mode: 'normal',
|
||||||
|
retry_seconds: {
|
||||||
|
max: 10,
|
||||||
|
min: 0.5,
|
||||||
|
now: 2,
|
||||||
|
step: 0.5
|
||||||
|
},
|
||||||
|
retry_count: {
|
||||||
|
max: 10,
|
||||||
|
min: 1,
|
||||||
|
now: 5,
|
||||||
|
step: 1
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
export const pinned_display_id: Writable<string | null> = writable<string | null>(null);
|
||||||
|
|
||||||
export function change_height(key: 'display' | 'file', factor: number) {
|
export function change_height(key: 'display' | 'file', factor: number) {
|
||||||
current_height.update((height) => {
|
current_height.update((height) => {
|
||||||
@@ -34,8 +57,12 @@ export function change_height(key: 'display' | 'file', factor: number) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export function next_height_step_size(key: 'display' | 'file', current_height_array: Record<string, number>, factor: number): number {
|
export function next_height_step_size(
|
||||||
const new_size = current_height_array[key] + (factor * heights_options[key].step);
|
key: 'display' | 'file',
|
||||||
|
current_height_array: Record<string, number>,
|
||||||
|
factor: number
|
||||||
|
): number {
|
||||||
|
const new_size = current_height_array[key] + factor * heights_options[key].step;
|
||||||
if (new_size > heights_options[key].max || new_size < heights_options[key].min) {
|
if (new_size > heights_options[key].max || new_size < heights_options[key].min) {
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
@@ -43,9 +70,6 @@ export function next_height_step_size(key: 'display' | 'file', current_height_ar
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export function get_selectable_color_classes(
|
export function get_selectable_color_classes(
|
||||||
selected: boolean,
|
selected: boolean,
|
||||||
returning_classes: { bg?: boolean; hover?: boolean; active?: boolean; text?: boolean } = {},
|
returning_classes: { bg?: boolean; hover?: boolean; active?: boolean; text?: boolean } = {},
|
||||||
|
|||||||
@@ -37,20 +37,20 @@ export type FileTransferTask = {
|
|||||||
bytes_total: number; // if type === 'sync' -> bytes_total = file_size * 2 (1x download + 1x upload)
|
bytes_total: number; // if type === 'sync' -> bytes_total = file_size * 2 (1x download + 1x upload)
|
||||||
};
|
};
|
||||||
|
|
||||||
export type FileTransferTaskData = {
|
export type FileTransferTaskData =
|
||||||
type: 'upload',
|
| {
|
||||||
file: File,
|
type: 'upload';
|
||||||
} | {
|
file: File;
|
||||||
type: "sync",
|
}
|
||||||
destination_displays: ShortDisplay[],
|
| {
|
||||||
}
|
type: 'sync';
|
||||||
|
destination_displays: ShortDisplay[];
|
||||||
|
};
|
||||||
|
|
||||||
export type ShortDisplay = {
|
export type ShortDisplay = {
|
||||||
id: string;
|
id: string;
|
||||||
ip: string;
|
ip: string;
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
export type FileOnDisplay = {
|
export type FileOnDisplay = {
|
||||||
display_id: string;
|
display_id: string;
|
||||||
@@ -64,7 +64,14 @@ export type FileLoadingData = {
|
|||||||
percentage: number;
|
percentage: number;
|
||||||
bytes_per_second: number;
|
bytes_per_second: number;
|
||||||
seconds_until_finish: number;
|
seconds_until_finish: number;
|
||||||
}
|
};
|
||||||
|
|
||||||
|
export type CompleteFileLoadingData = {
|
||||||
|
is_loading: boolean;
|
||||||
|
total_percentage: number;
|
||||||
|
total_seconds_until_finish: number;
|
||||||
|
display_data: { loading_data: FileLoadingData; display_name: string }[];
|
||||||
|
};
|
||||||
|
|
||||||
export type Inode = {
|
export type Inode = {
|
||||||
path: string;
|
path: string;
|
||||||
@@ -101,6 +108,15 @@ export type DisplayGroup = {
|
|||||||
position: number;
|
position: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type DisplayIdGroup = {
|
||||||
|
id: string;
|
||||||
|
displays: DisplayIdObject[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export type DisplayIdObject = {
|
||||||
|
id: string;
|
||||||
|
};
|
||||||
|
|
||||||
export type PreviewObject = {
|
export type PreviewObject = {
|
||||||
currently_updating: boolean;
|
currently_updating: boolean;
|
||||||
url: string | null;
|
url: string | null;
|
||||||
@@ -125,6 +141,13 @@ export type PopupContent = {
|
|||||||
closable?: boolean;
|
closable?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type NumberSetting = {
|
||||||
|
max: number,
|
||||||
|
min: number,
|
||||||
|
now: number,
|
||||||
|
step: number
|
||||||
|
}
|
||||||
|
|
||||||
export type DisplayStatus = 'host_offline' | 'app_offline' | 'app_online' | null;
|
export type DisplayStatus = 'host_offline' | 'app_offline' | 'app_online' | null;
|
||||||
|
|
||||||
export function to_display_status(value: string): DisplayStatus {
|
export function to_display_status(value: string): DisplayStatus {
|
||||||
|
|||||||
@@ -1,10 +1,29 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import '../app.css';
|
import '../app.css';
|
||||||
import Notification from './Notification.svelte';
|
import Notification from './Notification.svelte';
|
||||||
|
import SplashScreen from './../../../../shared/splash_screen.html?raw';
|
||||||
|
import version from './../../../../shared/version.txt?raw';
|
||||||
|
import { dev } from '$app/environment';
|
||||||
|
|
||||||
let { children } = $props();
|
let { children } = $props();
|
||||||
|
|
||||||
|
let versionSplashScreen = SplashScreen.replaceAll('%%APP-VERSION%%', version.trim());
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<svelte:head>
|
||||||
|
<title>PLG MuDiCS Control</title>
|
||||||
|
</svelte:head>
|
||||||
|
|
||||||
|
{#if !dev}
|
||||||
|
{@html versionSplashScreen}
|
||||||
|
{/if}
|
||||||
|
|
||||||
{@render children()}
|
{@render children()}
|
||||||
|
|
||||||
<Notification />
|
<Notification />
|
||||||
|
|
||||||
|
<style>
|
||||||
|
:root {
|
||||||
|
--splash-fade-out-delay: 3.5s !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@@ -1,11 +1,24 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Monitor, Plus, Radio, Settings, Trash2, X } from 'lucide-svelte';
|
import {
|
||||||
|
Monitor,
|
||||||
|
Plus,
|
||||||
|
Radio,
|
||||||
|
Settings,
|
||||||
|
Trash2,
|
||||||
|
Menu,
|
||||||
|
ChevronDown,
|
||||||
|
icons,
|
||||||
|
SquareCheckBig,
|
||||||
|
Square,
|
||||||
|
X,
|
||||||
|
Info
|
||||||
|
} from 'lucide-svelte';
|
||||||
import Button from '$lib/components/Button.svelte';
|
import Button from '$lib/components/Button.svelte';
|
||||||
import FileView from './FileView.svelte';
|
import FileView from './FileView.svelte';
|
||||||
import ControlView from './ControlView.svelte';
|
import ControlView from './ControlView.svelte';
|
||||||
import DisplayView from './DisplayView.svelte';
|
import DisplayView from './DisplayView.svelte';
|
||||||
import PopUp from '$lib/components/PopUp.svelte';
|
import PopUp from '$lib/components/PopUp.svelte';
|
||||||
import { type PopupContent } from '$lib/ts/types';
|
import { type Display, type PopupContent } from '$lib/ts/types';
|
||||||
import TextInput from '$lib/components/TextInput.svelte';
|
import TextInput from '$lib/components/TextInput.svelte';
|
||||||
import {
|
import {
|
||||||
add_display,
|
add_display,
|
||||||
@@ -17,9 +30,11 @@
|
|||||||
import { notifications } from '$lib/ts/stores/notification';
|
import { notifications } from '$lib/ts/stores/notification';
|
||||||
import { ping_ip } from '$lib/ts/api_handler';
|
import { ping_ip } from '$lib/ts/api_handler';
|
||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
import { on_start } from '$lib/ts/main';
|
import { on_app_start, update_display_status } from '$lib/ts/main';
|
||||||
import { display_status_to_info } from '$lib/ts/utils';
|
import { display_status_to_info } from '$lib/ts/utils';
|
||||||
import HighlightedText from '$lib/components/HighlightedText.svelte';
|
import HighlightedText from '$lib/components/HighlightedText.svelte';
|
||||||
|
import { preview_settings } from '$lib/ts/stores/ui_behavior';
|
||||||
|
import NumberSettingInput from '$lib/components/NumberSettingInput.svelte';
|
||||||
|
|
||||||
const ip_regex =
|
const ip_regex =
|
||||||
/^(?:(?:10|127)\.(?:25[0-5]|2[0-4]\d|1?\d?\d)\.(?:25[0-5]|2[0-4]\d|1?\d?\d)\.(?:25[0-5]|2[0-4]\d|1?\d?\d)|192\.168\.(?:25[0-5]|2[0-4]\d|1?\d?\d)\.(?:25[0-5]|2[0-4]\d|1?\d?\d)|172\.(?:1[6-9]|2\d|3[0-1])\.(?:25[0-5]|2[0-4]\d|1?\d?\d)\.(?:25[0-5]|2[0-4]\d|1?\d?\d))$/;
|
/^(?:(?:10|127)\.(?:25[0-5]|2[0-4]\d|1?\d?\d)\.(?:25[0-5]|2[0-4]\d|1?\d?\d)\.(?:25[0-5]|2[0-4]\d|1?\d?\d)|192\.168\.(?:25[0-5]|2[0-4]\d|1?\d?\d)\.(?:25[0-5]|2[0-4]\d|1?\d?\d)|172\.(?:1[6-9]|2\d|3[0-1])\.(?:25[0-5]|2[0-4]\d|1?\d?\d)\.(?:25[0-5]|2[0-4]\d|1?\d?\d))$/;
|
||||||
@@ -55,11 +70,26 @@
|
|||||||
const ip = text_inputs_valid.ip.value;
|
const ip = text_inputs_valid.ip.value;
|
||||||
const mac = text_inputs_valid.mac.value === '' ? null : text_inputs_valid.mac.value;
|
const mac = text_inputs_valid.mac.value === '' ? null : text_inputs_valid.mac.value;
|
||||||
const name = text_inputs_valid.name.value;
|
const name = text_inputs_valid.name.value;
|
||||||
|
let display: Display | null = null;
|
||||||
if (!!existing_display_id) {
|
if (!!existing_display_id) {
|
||||||
await edit_display_data(existing_display_id, ip, mac, name);
|
display = await edit_display_data(existing_display_id, ip, mac, name);
|
||||||
} else {
|
} else {
|
||||||
const status = await ping_ip(text_inputs_valid.ip.value);
|
const status = await ping_ip(text_inputs_valid.ip.value);
|
||||||
await add_display(ip, mac, name, status);
|
display = await add_display(ip, mac, name, status);
|
||||||
|
}
|
||||||
|
if (!!display) {
|
||||||
|
await update_display_status(display);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function get_display_preview_mode(mode: 'never' | 'normal' | 'always') {
|
||||||
|
switch (mode) {
|
||||||
|
case 'never':
|
||||||
|
return 'Nie';
|
||||||
|
case 'normal':
|
||||||
|
return 'Normal';
|
||||||
|
case 'always':
|
||||||
|
return 'Dauerhaft';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,6 +105,19 @@
|
|||||||
title: 'Neuen Bildschirm hinzufügen',
|
title: 'Neuen Bildschirm hinzufügen',
|
||||||
title_icon: Monitor,
|
title_icon: Monitor,
|
||||||
title_class: '!text-xl',
|
title_class: '!text-xl',
|
||||||
|
window_class: 'w-3xl',
|
||||||
|
closable: true
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const show_settings_popup = () => {
|
||||||
|
popup_content = {
|
||||||
|
open: true,
|
||||||
|
snippet: settings_popup,
|
||||||
|
title: 'Einstellungen',
|
||||||
|
title_icon: Settings,
|
||||||
|
title_class: '!text-xl',
|
||||||
|
window_class: 'w-3xl',
|
||||||
closable: true
|
closable: true
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -111,9 +154,63 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
onMount(on_start);
|
onMount(on_app_start);
|
||||||
|
|
||||||
|
const show_about_popup = () => {
|
||||||
|
popup_content = {
|
||||||
|
open: true,
|
||||||
|
snippet: about_popup,
|
||||||
|
title: 'Über PLG MuDiCS',
|
||||||
|
title_icon: Info,
|
||||||
|
title_class: '!text-xl',
|
||||||
|
closable: true
|
||||||
|
};
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
{#snippet about_popup(_: string)}
|
||||||
|
<div class="px-2">
|
||||||
|
<h3 class="text-lg font-bold mt-4">Entwickler</h3>
|
||||||
|
<p>
|
||||||
|
<a target="_blank" class="link" href="https://github.com/programmer-44">E44</a>
|
||||||
|
<a target="_blank" class="link" href="https://codeberg.org/2mal3">2mal3</a>,
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<h3 class="text-lg font-bold mt-4">Lizenz</h3>
|
||||||
|
<a
|
||||||
|
target="_blank"
|
||||||
|
class="link"
|
||||||
|
href="https://github.com/PLG-Development/PLG-MuDiCS/blob/main/LICENSE.txt"
|
||||||
|
>
|
||||||
|
GNU Affero General Public License v3 (AGPL-3.0)
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<h3 class="text-lg font-bold mt-4">Verwendete Bibliotheken</h3>
|
||||||
|
<ul class="list-disc list-inside">
|
||||||
|
<li><a target="_blank" href="https://svelte.dev/" class="link">Svelte & SvelteKit</a></li>
|
||||||
|
<li><a target="_blank" href="https://tailwindcss.com/" class="link">TailwindCSS</a></li>
|
||||||
|
<li><a target="_blank" href="https://lucide.dev/" class="link">Lucide Icons</a></li>
|
||||||
|
<li><a target="_blank" href="https://tiptap.dev/" class="link">Tiptap</a></li>
|
||||||
|
<li><a target="_blank" href="https://dexie.org/" class="link">Dexie.js</a></li>
|
||||||
|
<li>
|
||||||
|
<a target="_blank" href="https://github.com/orefalo/svelte-splitpanes" class="link"
|
||||||
|
>svelte-splitpanes</a
|
||||||
|
>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a target="_blank" href="https://github.com/thisux/sveltednd" class="link"
|
||||||
|
>@thisux/sveltednd</a
|
||||||
|
>
|
||||||
|
</li>
|
||||||
|
<li><a target="_blank" href="https://echo.labstack.com/" class="link">Echo</a></li>
|
||||||
|
<li><a target="_blank" href="https://github.com/mdlayher/wol" class="link">wol</a></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="flex justify-end pt-2">
|
||||||
|
<Button click_function={popup_close_function} className="px-4">Schließen</Button>
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
|
||||||
{#snippet remove_display_popup(display_id: string)}
|
{#snippet remove_display_popup(display_id: string)}
|
||||||
<div class="max-w-prose px-2">
|
<div class="max-w-prose px-2">
|
||||||
Soll der Bildschirm <HighlightedText>{remove_display_name}</HighlightedText> wirklich gelöscht werden?
|
Soll der Bildschirm <HighlightedText>{remove_display_name}</HighlightedText> wirklich gelöscht werden?
|
||||||
@@ -185,7 +282,7 @@
|
|||||||
<TextInput
|
<TextInput
|
||||||
bind:current_value={text_inputs_valid.mac.value}
|
bind:current_value={text_inputs_valid.mac.value}
|
||||||
bind:current_valid={text_inputs_valid.mac.valid}
|
bind:current_valid={text_inputs_valid.mac.valid}
|
||||||
title="MAC-Adresse (optional)"
|
title="MAC-Adresse (optional, wird zum aufwecken des Displays benötigt)"
|
||||||
placeholder="z.B. D4:81:A6:C4:BF:3F"
|
placeholder="z.B. D4:81:A6:C4:BF:3F"
|
||||||
is_valid_function={(input: string) => {
|
is_valid_function={(input: string) => {
|
||||||
return input === ''
|
return input === ''
|
||||||
@@ -220,9 +317,55 @@
|
|||||||
</div>
|
</div>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
|
||||||
<main class="bg-stone-900 h-dvh w-dvw text-stone-200 px-4 py-2 gap-2 grid grid-rows-[3rem_auto]">
|
{#snippet settings_popup()}
|
||||||
<!-- {@html SplashScreen} -->
|
<div class="flex flex-col gap-2 pl-1">
|
||||||
|
<span class="font-bold text-lg">Vorschau-Verhalten</span>
|
||||||
|
<div class="flex flex-col gap-2 ml-2">
|
||||||
|
<span class="text-stone-400 text-sm max-w-prose"
|
||||||
|
>Die Vorschau eines Bildschirms ist das Bild, welches links neben dem Display-Namen zu sehen
|
||||||
|
ist. Es zeigt relativ aktuell das an, was auf dem jeweiligen Bildschirm zu sehen ist.</span
|
||||||
|
>
|
||||||
|
<div class="flex flex-row justify-between items-center">
|
||||||
|
<span>Aktualisierungs-Verhalten</span>
|
||||||
|
<Button
|
||||||
|
className="gap-3 pl-4 pr-3 w-35"
|
||||||
|
menu_options={(['never', 'normal', 'always'] as const).map((mode) => ({
|
||||||
|
icon: mode === $preview_settings.mode ? SquareCheckBig : Square,
|
||||||
|
name: get_display_preview_mode(mode),
|
||||||
|
on_select: () => {
|
||||||
|
$preview_settings.mode = mode;
|
||||||
|
}
|
||||||
|
}))}>{get_display_preview_mode($preview_settings.mode)} <ChevronDown /></Button
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-row justify-between items-center">
|
||||||
|
<span>Intervall zwischen den Aktualisierungs-Anfragen</span>
|
||||||
|
<NumberSettingInput
|
||||||
|
disabled={$preview_settings.mode === 'never'}
|
||||||
|
number_setting={$preview_settings.retry_seconds}
|
||||||
|
on_change={(new_value: number) => {
|
||||||
|
$preview_settings.retry_seconds.now = new_value;
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-row justify-between items-center max-w-full gap-8">
|
||||||
|
<span class="">Anzahl der änderungslosen Aktualisierungen bis pausiert wird</span>
|
||||||
|
<NumberSettingInput
|
||||||
|
disabled={$preview_settings.mode !== 'normal'}
|
||||||
|
number_setting={$preview_settings.retry_count}
|
||||||
|
on_change={(new_value: number) => {
|
||||||
|
$preview_settings.retry_count.now = new_value;
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="flex justify-end pt-4">
|
||||||
|
<Button click_function={popup_close_function} className="px-4">Schließen</Button>
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
|
||||||
|
<main class="bg-stone-900 h-dvh w-dvw text-stone-200 px-4 py-2 gap-2 grid grid-rows-[3rem_auto]">
|
||||||
<div class="w-[calc(100dvw-(8*var(--spacing)))] flex justify-between">
|
<div class="w-[calc(100dvw-(8*var(--spacing)))] flex justify-between">
|
||||||
<span class="text-4xl font-bold content-center pl-1"> PLG MuDiCS </span>
|
<span class="text-4xl font-bold content-center pl-1"> PLG MuDiCS </span>
|
||||||
<Button
|
<Button
|
||||||
@@ -236,11 +379,17 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
icon: Settings,
|
icon: Settings,
|
||||||
name: 'Weitere Einstellungen'
|
name: 'Einstellungen',
|
||||||
|
on_select: show_settings_popup
|
||||||
|
},
|
||||||
|
{
|
||||||
|
icon: Info,
|
||||||
|
name: 'Über',
|
||||||
|
on_select: show_about_popup
|
||||||
}
|
}
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<Settings></Settings>
|
<Menu />
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-[calc(100dvw-(8*var(--spacing)))] grid grid-cols-2 gap-2">
|
<div class="w-[calc(100dvw-(8*var(--spacing)))] grid grid-cols-2 gap-2">
|
||||||
|
|||||||
@@ -9,17 +9,32 @@
|
|||||||
Presentation,
|
Presentation,
|
||||||
SquareTerminal,
|
SquareTerminal,
|
||||||
TextAlignStart,
|
TextAlignStart,
|
||||||
TrafficCone
|
TrafficCone,
|
||||||
|
Globe
|
||||||
} from 'lucide-svelte';
|
} from 'lucide-svelte';
|
||||||
import Button from '$lib/components/Button.svelte';
|
import Button from '$lib/components/Button.svelte';
|
||||||
import PopUp from '$lib/components/PopUp.svelte';
|
import PopUp from '$lib/components/PopUp.svelte';
|
||||||
import type { PopupContent } from '$lib/ts/types';
|
import type { PopupContent } from '$lib/ts/types';
|
||||||
import KeyInput from './KeyInput.svelte';
|
import KeyInput from './KeyInput.svelte';
|
||||||
import { send_keyboard_input, show_blackscreen, shutdown, startup } from '$lib/ts/api_handler';
|
import {
|
||||||
|
send_keyboard_input,
|
||||||
|
show_blackscreen,
|
||||||
|
shutdown,
|
||||||
|
startup,
|
||||||
|
show_html
|
||||||
|
} from '$lib/ts/api_handler';
|
||||||
import { get_display_by_id, run_on_all_selected_displays } from '$lib/ts/stores/displays';
|
import { get_display_by_id, run_on_all_selected_displays } from '$lib/ts/stores/displays';
|
||||||
import { selected_display_ids } from '$lib/ts/stores/select';
|
import { selected_display_ids } from '$lib/ts/stores/select';
|
||||||
import TipTapInput from './TipTapInput.svelte';
|
import TipTapInput from './TipTapInput.svelte';
|
||||||
import { db } from '$lib/ts/database';
|
import { db } from '$lib/ts/database';
|
||||||
|
import { liveQuery, type Observable } from 'dexie';
|
||||||
|
import TextInput from '$lib/components/TextInput.svelte';
|
||||||
|
|
||||||
|
let all_display_states: Observable<'on' | 'off' | 'mixed'> | undefined = $state();
|
||||||
|
$effect(() => {
|
||||||
|
const ids = $selected_display_ids;
|
||||||
|
all_display_states = liveQuery(() => all_state(ids));
|
||||||
|
});
|
||||||
|
|
||||||
let popup_content: PopupContent = $state({
|
let popup_content: PopupContent = $state({
|
||||||
open: false,
|
open: false,
|
||||||
@@ -53,6 +68,17 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const show_website_popup = () => {
|
||||||
|
popup_content = {
|
||||||
|
open: true,
|
||||||
|
snippet: website_popup,
|
||||||
|
title: 'Webseite anzeigen',
|
||||||
|
window_class: 'w-xl',
|
||||||
|
title_icon: Globe,
|
||||||
|
closable: true
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
async function all_state(selected_display_ids: string[]): Promise<'on' | 'off' | 'mixed'> {
|
async function all_state(selected_display_ids: string[]): Promise<'on' | 'off' | 'mixed'> {
|
||||||
const selected_displays = await Promise.all(
|
const selected_displays = await Promise.all(
|
||||||
selected_display_ids.map(async (id) => await get_display_by_id(id))
|
selected_display_ids.map(async (id) => await get_display_by_id(id))
|
||||||
@@ -109,13 +135,56 @@
|
|||||||
10
|
10
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
let website_url = $state('');
|
||||||
|
let website_url_valid = $state(false);
|
||||||
|
|
||||||
|
function validate_website_url(url: string): [boolean, string] {
|
||||||
|
if (url === '') return [true, ''];
|
||||||
|
const regex = /^https?:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/;
|
||||||
|
if (regex.test(url)) {
|
||||||
|
return [true, ''];
|
||||||
|
}
|
||||||
|
return [false, 'Ungültige URL'];
|
||||||
|
}
|
||||||
|
|
||||||
|
async function send_website() {
|
||||||
|
popup_content.open = false;
|
||||||
|
await run_on_all_selected_displays((d) =>
|
||||||
|
show_html(d.ip, `<iframe src="${website_url}"></iframe>`)
|
||||||
|
);
|
||||||
|
website_url = '';
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
{#snippet website_popup()}
|
||||||
|
<div class="flex flex-col gap-2">
|
||||||
|
<TextInput
|
||||||
|
title="URL"
|
||||||
|
placeholder="https://example.com"
|
||||||
|
bind:current_value={website_url}
|
||||||
|
bind:current_valid={website_url_valid}
|
||||||
|
is_valid_function={validate_website_url}
|
||||||
|
enter_mode="submit"
|
||||||
|
enter_function={send_website}
|
||||||
|
/>
|
||||||
|
<div class="flex flex-row justify-end gap-2">
|
||||||
|
<Button className="button space font-bold" click_function={popup_close_function}>
|
||||||
|
Abbrechen
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
click_function={send_website}
|
||||||
|
disabled={!website_url_valid || website_url === ''}
|
||||||
|
className="button success space">Anzeigen</Button
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
|
||||||
{#snippet ask_shutdonw_popup()}
|
{#snippet ask_shutdonw_popup()}
|
||||||
<p>Bist du sicher, dass du alle ausgewählten Displays herunterfahren möchtest?</p>
|
<p>Bist du sicher, dass du alle ausgewählten Displays herunterfahren möchtest?</p>
|
||||||
|
|
||||||
<div class="flex flex-row justify-end gap-2">
|
<div class="flex flex-row justify-end gap-2">
|
||||||
<Button className="button space" click_function={() => (popup_content.open = false)}>
|
<Button className="button space font-bold" click_function={() => (popup_content.open = false)}>
|
||||||
Abbrechen
|
Abbrechen
|
||||||
</Button>
|
</Button>
|
||||||
<Button click_function={shutdown_action} className="button error space">Herunterfahren</Button>
|
<Button click_function={shutdown_action} className="button error space">Herunterfahren</Button>
|
||||||
@@ -162,11 +231,19 @@
|
|||||||
}}><ArrowBigRight /></Button
|
}}><ArrowBigRight /></Button
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
className="px-3 flex gap-3 w-75 justify-normal"
|
className="px-3 flex gap-3 w-75 justify-normal"
|
||||||
disabled={$selected_display_ids.length === 0}
|
disabled={$selected_display_ids.length === 0}
|
||||||
click_function={show_text_popup}><TextAlignStart /> Text anzeigen</Button
|
click_function={show_text_popup}><TextAlignStart /> Text anzeigen</Button
|
||||||
>
|
>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
className="px-3 flex gap-3 w-75 justify-normal"
|
||||||
|
disabled={$selected_display_ids.length === 0}
|
||||||
|
click_function={show_website_popup}><Globe /> Webseite anzeigen</Button
|
||||||
|
>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
className="px-3 flex gap-3 w-75 justify-normal"
|
className="px-3 flex gap-3 w-75 justify-normal"
|
||||||
disabled={$selected_display_ids.length === 0}
|
disabled={$selected_display_ids.length === 0}
|
||||||
@@ -174,14 +251,14 @@
|
|||||||
await run_on_all_selected_displays((d) => show_blackscreen(d.ip));
|
await run_on_all_selected_displays((d) => show_blackscreen(d.ip));
|
||||||
}}><Presentation />Blackout</Button
|
}}><Presentation />Blackout</Button
|
||||||
>
|
>
|
||||||
|
|
||||||
<div class="flex flex-row justify-normal">
|
<div class="flex flex-row justify-normal">
|
||||||
<Button
|
<Button className="rounded-r-none pl-3 flex gap-3 grow w-65 justify-normal" disabled>
|
||||||
className="rounded-r-none pl-3 flex gap-3 grow w-65 justify-normal"
|
<TrafficCone /> Fallback-Bild anzeigen
|
||||||
disabled={$selected_display_ids.length === 0}
|
</Button>
|
||||||
><TrafficCone /> Fallback-Bild anzeigen</Button
|
<Button className="rounded-l-none flex grow-0 w-10" disabled><ChevronDown /></Button>
|
||||||
>
|
|
||||||
<Button className="rounded-l-none flex grow-0 w-10"><ChevronDown /></Button>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
className="px-3 flex gap-3 w-75 justify-normal"
|
className="px-3 flex gap-3 w-75 justify-normal"
|
||||||
disabled={$selected_display_ids.length === 0}
|
disabled={$selected_display_ids.length === 0}
|
||||||
@@ -190,10 +267,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col gap-2 justify-between">
|
<div class="flex flex-col gap-2 justify-between">
|
||||||
<div class="flex flex-col gap-2">
|
<div class="flex flex-col gap-2">
|
||||||
{#await all_state($selected_display_ids) then all}
|
|
||||||
<Button
|
<Button
|
||||||
className="px-3 flex gap-3 w-full xl:w-75 justify-normal"
|
className="px-3 flex gap-3 w-full xl:w-75 justify-normal"
|
||||||
disabled={all === 'on' || $selected_display_ids.length === 0}
|
disabled={$all_display_states === 'on' || $selected_display_ids.length === 0}
|
||||||
click_function={startup_action}
|
click_function={startup_action}
|
||||||
>
|
>
|
||||||
<Power /> PC hochfahren
|
<Power /> PC hochfahren
|
||||||
@@ -201,18 +277,16 @@
|
|||||||
|
|
||||||
<Button
|
<Button
|
||||||
className="px-3 flex gap-3 w-full xl:w-75 justify-normal"
|
className="px-3 flex gap-3 w-full xl:w-75 justify-normal"
|
||||||
disabled={all === 'off' || $selected_display_ids.length === 0}
|
disabled={$all_display_states === 'off' || $selected_display_ids.length === 0}
|
||||||
click_function={ask_shutdonw}
|
click_function={ask_shutdonw}
|
||||||
>
|
>
|
||||||
<PowerOff /> PC herunterfahren</Button
|
<PowerOff /> PC herunterfahren</Button
|
||||||
>
|
>
|
||||||
{/await}
|
|
||||||
</div>
|
</div>
|
||||||
<Button
|
<Button className="px-3 flex gap-3 w-full xl:w-75 justify-normal" disabled>
|
||||||
className="px-3 flex gap-3 w-full xl:w-75 justify-normal"
|
<SquareTerminal />
|
||||||
disabled={$selected_display_ids.length === 0}
|
Shell-Befehl ausführen
|
||||||
><SquareTerminal /> Shell-Befehl ausführen</Button
|
</Button>
|
||||||
>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<PopUp
|
<PopUp
|
||||||
|
|||||||
@@ -3,9 +3,11 @@
|
|||||||
import {
|
import {
|
||||||
all_displays_of_group_selected,
|
all_displays_of_group_selected,
|
||||||
get_display_by_id,
|
get_display_by_id,
|
||||||
get_display_groups,
|
|
||||||
set_select_for_group,
|
set_select_for_group,
|
||||||
set_new_display_group_order
|
local_displays,
|
||||||
|
update_local_displays,
|
||||||
|
update_db_displays,
|
||||||
|
get_display_groups
|
||||||
} from '$lib/ts/stores/displays';
|
} from '$lib/ts/stores/displays';
|
||||||
import {
|
import {
|
||||||
change_height,
|
change_height,
|
||||||
@@ -19,15 +21,16 @@
|
|||||||
import { type Display, type DisplayGroup, type MenuOption } from '$lib/ts/types';
|
import { type Display, type DisplayGroup, type MenuOption } from '$lib/ts/types';
|
||||||
import Button from '$lib/components/Button.svelte';
|
import Button from '$lib/components/Button.svelte';
|
||||||
import OnlineState from '../lib/components/OnlineState.svelte';
|
import OnlineState from '../lib/components/OnlineState.svelte';
|
||||||
import { cubicOut } from 'svelte/easing';
|
import { Menu, Pencil, PinOff, Trash2, VideoOff, ZoomIn, ZoomOut } from 'lucide-svelte';
|
||||||
import { Menu, Pencil, PinOff, Settings, Trash2, VideoOff, ZoomIn, ZoomOut } from 'lucide-svelte';
|
|
||||||
import { selected_display_ids } from '$lib/ts/stores/select';
|
import { selected_display_ids } from '$lib/ts/stores/select';
|
||||||
import { dragHandleZone } from 'svelte-dnd-action';
|
import { dragHandleZone } from 'svelte-dnd-action';
|
||||||
import { flip } from 'svelte/animate';
|
|
||||||
import DisplayGroupObject from '../lib/components/DisplayGroupObject.svelte';
|
import DisplayGroupObject from '../lib/components/DisplayGroupObject.svelte';
|
||||||
import { Pane, Splitpanes } from 'svelte-splitpanes';
|
import { Pane, Splitpanes } from 'svelte-splitpanes';
|
||||||
import HighlightedText from '$lib/components/HighlightedText.svelte';
|
import HighlightedText from '$lib/components/HighlightedText.svelte';
|
||||||
import { liveQuery, type Observable } from 'dexie';
|
import { liveQuery, type Observable } from 'dexie';
|
||||||
|
import { onMount } from 'svelte';
|
||||||
|
import { flip } from 'svelte/animate';
|
||||||
|
import { cubicOut } from 'svelte/easing';
|
||||||
|
|
||||||
let {
|
let {
|
||||||
handle_display_deletion,
|
handle_display_deletion,
|
||||||
@@ -43,7 +46,16 @@
|
|||||||
const pdi = $pinned_display_id;
|
const pdi = $pinned_display_id;
|
||||||
pinned_display = liveQuery(() => get_display_by_id(pdi || ''));
|
pinned_display = liveQuery(() => get_display_by_id(pdi || ''));
|
||||||
});
|
});
|
||||||
|
|
||||||
let display_groups = liveQuery(() => get_display_groups());
|
let display_groups = liveQuery(() => get_display_groups());
|
||||||
|
let display_id_groups = liveQuery(() => update_local_displays());
|
||||||
|
$effect(() => {
|
||||||
|
const current_displays = $display_id_groups;
|
||||||
|
if (!$is_group_drag && !$is_display_drag && current_displays) {
|
||||||
|
$local_displays = current_displays;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
let all_groups_selected: Observable<boolean> | undefined = $state();
|
let all_groups_selected: Observable<boolean> | undefined = $state();
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
const d = $display_groups;
|
const d = $display_groups;
|
||||||
@@ -234,51 +246,50 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="min-h-0 overflow-y-auto" bind:this={displays_scroll_box}>
|
<div class="min-h-0 overflow-y-auto overflow-x-hidden" bind:this={displays_scroll_box}>
|
||||||
|
{#if $local_displays.length === 0}
|
||||||
|
<div class="text-stone-500 px-10 py-6 leading-relaxed text-center">
|
||||||
|
Es wurden noch keine Bildschirme hinzugefügt. Klicke oben rechts auf
|
||||||
|
<HighlightedText fg="text-stone-450" className="p-1!">
|
||||||
|
<Menu class="inline pb-1" />
|
||||||
|
</HighlightedText>
|
||||||
|
und
|
||||||
|
<HighlightedText fg="text-stone-450">Neuen Bildschirm hinzufügen</HighlightedText>.
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
<div
|
<div
|
||||||
class="min-h-full p-2 flex flex-col gap-4"
|
class="min-h-full p-2 flex flex-col gap-4"
|
||||||
use:dragHandleZone={{
|
use:dragHandleZone={{
|
||||||
items: $display_groups || [],
|
items: $local_displays,
|
||||||
type: 'group',
|
type: 'group',
|
||||||
flipDurationMs: dnd_flip_duration_ms,
|
flipDurationMs: dnd_flip_duration_ms,
|
||||||
dropFromOthersDisabled: true,
|
dropFromOthersDisabled: true,
|
||||||
dropTargetStyle: { outline: 'none' }
|
dropTargetStyle: { outline: 'none' }
|
||||||
}}
|
}}
|
||||||
onconsider={async (e: CustomEvent) => {
|
onconsider={(e: CustomEvent) => {
|
||||||
$is_group_drag = true;
|
$is_group_drag = true;
|
||||||
await set_new_display_group_order(e.detail.items);
|
$local_displays = e.detail.items;
|
||||||
}}
|
}}
|
||||||
onfinalize={async (e: CustomEvent) => {
|
onfinalize={async (e: CustomEvent) => {
|
||||||
await set_new_display_group_order(e.detail.items);
|
$local_displays = e.detail.items;
|
||||||
|
await update_db_displays();
|
||||||
$is_group_drag = false;
|
$is_group_drag = false;
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{#if ($display_groups || []).length === 0}
|
{#each $local_displays as display_id_group (display_id_group.id)}
|
||||||
<div class="text-stone-500 px-10 py-6 leading-relaxed text-center">
|
|
||||||
Es wurden noch keine Bildschirme hinzugefügt. Klicke oben rechts auf
|
|
||||||
<HighlightedText fg="text-stone-450" className="p-1!"
|
|
||||||
><Settings class="inline pb-1" /></HighlightedText
|
|
||||||
>
|
|
||||||
und
|
|
||||||
<HighlightedText fg="text-stone-450">Neuen Bildschirm hinzufügen</HighlightedText>.
|
|
||||||
</div>
|
|
||||||
{:else}
|
|
||||||
{#each $display_groups || [] as display_group (display_group.id)}
|
|
||||||
<!-- Each Group -->
|
<!-- Each Group -->
|
||||||
<section
|
<section class="outline-none">
|
||||||
out:scale={{ duration: dnd_flip_duration_ms, easing: cubicOut }}
|
<!-- out:scale={{ duration: dnd_flip_duration_ms, easing: cubicOut }}
|
||||||
animate:flip={{ duration: dnd_flip_duration_ms, easing: cubicOut }}
|
animate:flip={{ duration: dnd_flip_duration_ms, easing: cubicOut }} -->
|
||||||
class="outline-none"
|
|
||||||
>
|
|
||||||
<DisplayGroupObject
|
<DisplayGroupObject
|
||||||
display_group_id={display_group.id}
|
{display_id_group}
|
||||||
{get_display_menu_options}
|
{get_display_menu_options}
|
||||||
{close_pinned_display}
|
{close_pinned_display}
|
||||||
/>
|
/>
|
||||||
</section>
|
</section>
|
||||||
{/each}
|
{/each}
|
||||||
{/if}
|
|
||||||
</div>
|
</div>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Pane>
|
</Pane>
|
||||||
|
|||||||
@@ -17,11 +17,11 @@
|
|||||||
import { selected_display_ids, selected_file_ids } from '$lib/ts/stores/select';
|
import { selected_display_ids, selected_file_ids } from '$lib/ts/stores/select';
|
||||||
import {
|
import {
|
||||||
current_file_path,
|
current_file_path,
|
||||||
get_current_folder_elements,
|
get_folder_elements,
|
||||||
get_file_by_id,
|
get_file_by_id,
|
||||||
run_for_selected_files_on_selected_displays,
|
run_for_selected_files_on_selected_displays,
|
||||||
update_current_folder_on_selected_displays,
|
update_current_folder_on_selected_displays,
|
||||||
get_displays_where_path_exists,
|
get_displays_where_path_not_exists,
|
||||||
create_folder_on_all_selected_displays
|
create_folder_on_all_selected_displays
|
||||||
} from '$lib/ts/stores/files';
|
} from '$lib/ts/stores/files';
|
||||||
import { slide } from 'svelte/transition';
|
import { slide } from 'svelte/transition';
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
import { delete_files, rename_file } from '$lib/ts/api_handler';
|
import { delete_files, rename_file } from '$lib/ts/api_handler';
|
||||||
import HighlightedText from '$lib/components/HighlightedText.svelte';
|
import HighlightedText from '$lib/components/HighlightedText.svelte';
|
||||||
import { liveQuery, type Observable } from 'dexie';
|
import { liveQuery, type Observable } from 'dexie';
|
||||||
import { download_file, add_upload } from '$lib/ts/file_transfer_handler';
|
import { download_file, add_upload, add_sync_recursively } from '$lib/ts/file_transfer_handler';
|
||||||
|
|
||||||
let current_name: string = $state('');
|
let current_name: string = $state('');
|
||||||
let current_valid: boolean = $state(false);
|
let current_valid: boolean = $state(false);
|
||||||
@@ -52,15 +52,15 @@
|
|||||||
$effect(() => {
|
$effect(() => {
|
||||||
const path = $current_file_path,
|
const path = $current_file_path,
|
||||||
display_ids = $selected_display_ids;
|
display_ids = $selected_display_ids;
|
||||||
current_folder_elements = liveQuery(() => get_current_folder_elements(path, display_ids));
|
current_folder_elements = liveQuery(() => get_folder_elements(path, display_ids));
|
||||||
});
|
});
|
||||||
let one_file_selected: Observable<boolean> | undefined = $state();
|
let one_file_selected: Observable<boolean> | undefined = $state();
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
const s = $selected_file_ids;
|
const s = $selected_file_ids;
|
||||||
one_file_selected = liveQuery(async () => {
|
one_file_selected = liveQuery(async () => {
|
||||||
return s.length === 1 && (await get_file_by_id(s[0]))?.type !== 'inode/directory';
|
return s.length === 1 && (await get_file_by_id(s[0]))?.type !== 'inode/directory';
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
let popup_content: PopupContent = $state({
|
let popup_content: PopupContent = $state({
|
||||||
open: false,
|
open: false,
|
||||||
@@ -128,7 +128,7 @@
|
|||||||
current_name = '';
|
current_name = '';
|
||||||
current_valid = false;
|
current_valid = false;
|
||||||
display_names_where_path_does_not_exist = (
|
display_names_where_path_does_not_exist = (
|
||||||
await get_displays_where_path_exists($current_file_path, $selected_display_ids, true)
|
await get_displays_where_path_not_exists($current_file_path, $selected_display_ids)
|
||||||
).map((display) => display.name);
|
).map((display) => display.name);
|
||||||
popup_content = {
|
popup_content = {
|
||||||
open: true,
|
open: true,
|
||||||
@@ -148,6 +148,21 @@
|
|||||||
closable: true
|
closable: true
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
async function sync_selected_files(
|
||||||
|
selected_file_ids: string[],
|
||||||
|
selected_display_ids: string[],
|
||||||
|
current_folder_elements: Inode[]
|
||||||
|
) {
|
||||||
|
if (selected_file_ids.length === 0 && current_folder_elements.length > 0) {
|
||||||
|
selected_file_ids = current_folder_elements.map((inode) => get_file_primary_key(inode));
|
||||||
|
}
|
||||||
|
if (selected_file_ids.length === 0) return;
|
||||||
|
// Mit For-Schleife über ausgewählte Elemente gehen
|
||||||
|
for (const file_id of selected_file_ids) {
|
||||||
|
await add_sync_recursively(file_id, selected_display_ids);
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#snippet new_folder_popup()}
|
{#snippet new_folder_popup()}
|
||||||
@@ -232,7 +247,7 @@
|
|||||||
<span class="text-stone-400 px-1"
|
<span class="text-stone-400 px-1"
|
||||||
>{`${$selected_file_ids.length === 1 ? 'Folgendes Objekt' : `Folgende ${$selected_file_ids.length} Objekte`} löschen? (Wiederherstellung nicht möglich)`}</span
|
>{`${$selected_file_ids.length === 1 ? 'Folgendes Objekt' : `Folgende ${$selected_file_ids.length} Objekte`} löschen? (Wiederherstellung nicht möglich)`}</span
|
||||||
>
|
>
|
||||||
<div class="flex flex-col gap-2 overflow-auto h-full min-h-0 grow-0">
|
<div class="flex flex-col gap-2 overflow-y-auto h-full min-h-0 grow-0">
|
||||||
{#each $selected_files || [] as file}
|
{#each $selected_files || [] as file}
|
||||||
<InodeElement {file} not_interactable />
|
<InodeElement {file} not_interactable />
|
||||||
{/each}
|
{/each}
|
||||||
@@ -320,13 +335,20 @@
|
|||||||
<Button
|
<Button
|
||||||
title="Ausgewählte Datei herunterladen"
|
title="Ausgewählte Datei herunterladen"
|
||||||
className="px-3 flex"
|
className="px-3 flex"
|
||||||
click_function={() => (download_file($selected_file_ids[0], $selected_display_ids))}
|
click_function={async () =>
|
||||||
|
await download_file($selected_file_ids[0], $selected_display_ids)}
|
||||||
disabled={!$one_file_selected}><Download /></Button
|
disabled={!$one_file_selected}><Download /></Button
|
||||||
>
|
>
|
||||||
<div class="border border-stone-700 my-1"></div>
|
<div class="border border-stone-700 my-1"></div>
|
||||||
<Button
|
<Button
|
||||||
title="Aktuellen Ordner / Ausgewählte Datei(en) zwischen Bildschirmen synchronisieren"
|
title="Aktuellen Ordner / Ausgewählte Datei(en) zwischen Bildschirmen synchronisieren"
|
||||||
className="px-3 flex gap-3"
|
className="px-3 flex gap-3"
|
||||||
|
click_function={async () =>
|
||||||
|
await sync_selected_files(
|
||||||
|
$selected_file_ids,
|
||||||
|
$selected_display_ids,
|
||||||
|
$current_folder_elements ?? []
|
||||||
|
)}
|
||||||
disabled={$selected_display_ids.length === 0}
|
disabled={$selected_display_ids.length === 0}
|
||||||
><RefreshCcw />
|
><RefreshCcw />
|
||||||
<span class="hidden 2xl:flex">Synchronisieren</span>
|
<span class="hidden 2xl:flex">Synchronisieren</span>
|
||||||
@@ -363,7 +385,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="min-h-0 h-full overflow-y-auto bg-stone-750 rounded-xl">
|
<div class="min-h-0 h-full overflow-y-auto overflow-x-hidden bg-stone-750 rounded-xl">
|
||||||
<div class="flex flex-col gap-2 p-2 min-h-0 max-w-full">
|
<div class="flex flex-col gap-2 p-2 min-h-0 max-w-full">
|
||||||
{#if $selected_display_ids.length === 0}
|
{#if $selected_display_ids.length === 0}
|
||||||
<span class="text-stone-450 px-10 py-6 leading-relaxed text-center">
|
<span class="text-stone-450 px-10 py-6 leading-relaxed text-center">
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<span class="whitespace-break-spaces max-h-[60vh] overflow-y-auto">{n.message}</span>
|
<span class="max-h-[60vh] overflow-y-auto overflow-x-hidden whitespace-pre-line max-w-full break-normal wrap-anywhere">{n.message}</span>
|
||||||
|
|
||||||
<div class="absolute inset-x-0 bottom-0 h-1 bg-white/25">
|
<div class="absolute inset-x-0 bottom-0 h-1 bg-white/25">
|
||||||
<div class="block h-full w-full bg-white/80 origin-left animate-progress-bar"></div>
|
<div class="block h-full w-full bg-white/80 origin-left animate-progress-bar"></div>
|
||||||
|
|||||||
@@ -66,12 +66,6 @@
|
|||||||
is_selected: () => editor_state.editor?.isActive('strike') ?? false,
|
is_selected: () => editor_state.editor?.isActive('strike') ?? false,
|
||||||
title: 'Durchgestrichen',
|
title: 'Durchgestrichen',
|
||||||
icon: Strikethrough
|
icon: Strikethrough
|
||||||
},
|
|
||||||
{
|
|
||||||
onclick: () => {},
|
|
||||||
is_selected: () => false,
|
|
||||||
title: 'QR-Code anfügen',
|
|
||||||
icon: QrCode
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
|
|||||||
@@ -216,6 +216,6 @@ module.exports = {
|
|||||||
'active:bg-red-500',
|
'active:bg-red-500',
|
||||||
|
|
||||||
'hover:bg-stone-600/70',
|
'hover:bg-stone-600/70',
|
||||||
'active:bg-stone-500/80',
|
'active:bg-stone-500/80'
|
||||||
],
|
]
|
||||||
}
|
};
|
||||||
|
|||||||
+7
-7
@@ -3,7 +3,7 @@ module plg-mudics/control
|
|||||||
go 1.24.5
|
go 1.24.5
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/labstack/echo/v4 v4.13.4
|
github.com/labstack/echo/v4 v4.15.0
|
||||||
github.com/mdlayher/wol v0.0.0-20220221231636-b763a792253a
|
github.com/mdlayher/wol v0.0.0-20220221231636-b763a792253a
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -17,10 +17,10 @@ require (
|
|||||||
github.com/mdlayher/socket v0.2.1 // indirect
|
github.com/mdlayher/socket v0.2.1 // indirect
|
||||||
github.com/valyala/bytebufferpool v1.0.0 // indirect
|
github.com/valyala/bytebufferpool v1.0.0 // indirect
|
||||||
github.com/valyala/fasttemplate v1.2.2 // indirect
|
github.com/valyala/fasttemplate v1.2.2 // indirect
|
||||||
golang.org/x/crypto v0.38.0 // indirect
|
golang.org/x/crypto v0.46.0 // indirect
|
||||||
golang.org/x/net v0.40.0 // indirect
|
golang.org/x/net v0.48.0 // indirect
|
||||||
golang.org/x/sync v0.14.0 // indirect
|
golang.org/x/sync v0.19.0 // indirect
|
||||||
golang.org/x/sys v0.33.0 // indirect
|
golang.org/x/sys v0.39.0 // indirect
|
||||||
golang.org/x/text v0.25.0 // indirect
|
golang.org/x/text v0.32.0 // indirect
|
||||||
golang.org/x/time v0.11.0 // indirect
|
golang.org/x/time v0.14.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ github.com/josharian/native v1.0.0 h1:Ts/E8zCSEsG17dUqv7joXJFybuMLjQfWE04tsBODTx
|
|||||||
github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
|
github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
|
||||||
github.com/labstack/echo/v4 v4.13.4 h1:oTZZW+T3s9gAu5L8vmzihV7/lkXGZuITzTQkTEhcXEA=
|
github.com/labstack/echo/v4 v4.13.4 h1:oTZZW+T3s9gAu5L8vmzihV7/lkXGZuITzTQkTEhcXEA=
|
||||||
github.com/labstack/echo/v4 v4.13.4/go.mod h1:g63b33BZ5vZzcIUF8AtRH40DrTlXnx4UMC8rBdndmjQ=
|
github.com/labstack/echo/v4 v4.13.4/go.mod h1:g63b33BZ5vZzcIUF8AtRH40DrTlXnx4UMC8rBdndmjQ=
|
||||||
|
github.com/labstack/echo/v4 v4.15.0 h1:hoRTKWcnR5STXZFe9BmYun9AMTNeSbjHi2vtDuADJ24=
|
||||||
|
github.com/labstack/echo/v4 v4.15.0/go.mod h1:xmw1clThob0BSVRX1CRQkGQ/vjwcpOMjQZSZa9fKA/c=
|
||||||
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
|
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
|
||||||
github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
|
github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
|
||||||
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
|
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
|
||||||
@@ -34,13 +36,18 @@ github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
|
|||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
|
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
|
||||||
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
|
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
|
||||||
|
golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
|
||||||
|
golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
|
||||||
golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
|
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
|
||||||
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
|
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
|
||||||
|
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
|
||||||
|
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
|
||||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
|
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
|
||||||
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
||||||
|
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
@@ -48,11 +55,16 @@ golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBc
|
|||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
|
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
|
||||||
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||||
|
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
|
||||||
|
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
|
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
|
||||||
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
|
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
|
||||||
|
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
|
||||||
|
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
|
||||||
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
|
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
|
||||||
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
|
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
|
||||||
|
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
+8
-2
@@ -37,6 +37,9 @@ func main() {
|
|||||||
|
|
||||||
e := echo.New()
|
e := echo.New()
|
||||||
|
|
||||||
|
// Allow requests from everywhere
|
||||||
|
e.Use(middleware.CORS())
|
||||||
|
|
||||||
// Serve the embedded SvelteKit frontend
|
// Serve the embedded SvelteKit frontend
|
||||||
e.Use(middleware.StaticWithConfig(middleware.StaticConfig{
|
e.Use(middleware.StaticWithConfig(middleware.StaticConfig{
|
||||||
Filesystem: http.FS(frontend.BuildDirFS),
|
Filesystem: http.FS(frontend.BuildDirFS),
|
||||||
@@ -61,7 +64,7 @@ func main() {
|
|||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
err = shared.OpenBrowserWindow("http://localhost:"+port, false, false)
|
err = shared.OpenBrowserWindow("http://localhost:"+port, false, "control")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Failed to open browser window", "error", err)
|
slog.Error("Failed to open browser window", "error", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
@@ -105,14 +108,17 @@ func wakeOnLanRoute(ctx echo.Context) error {
|
|||||||
}
|
}
|
||||||
mac, err := net.ParseMAC(data.MACAddress)
|
mac, err := net.ParseMAC(data.MACAddress)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
slog.Warn("Invalid MAC address provided", "mac_address", data.MACAddress, "error", err)
|
||||||
return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: "Invalid MAC address"})
|
return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: "Invalid MAC address"})
|
||||||
}
|
}
|
||||||
|
|
||||||
client, err := wol.NewClient()
|
client, err := wol.NewClient()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
slog.Error("Failed to create Wake-on-LAN client", "error", err)
|
||||||
return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Failed to create Wake-on-LAN client"})
|
return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Failed to create Wake-on-LAN client"})
|
||||||
}
|
}
|
||||||
if err := client.Wake("255.255.255.255", mac); err != nil {
|
if err := client.Wake("255.255.255.255:7", mac); err != nil {
|
||||||
|
slog.Error("Failed to send Wake-on-LAN packet", "error", err)
|
||||||
return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Failed to send Wake-on-LAN packet"})
|
return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Failed to send Wake-on-LAN packet"})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+10
-10
@@ -4,10 +4,10 @@ go 1.24.4
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/a-h/templ v0.3.960
|
github.com/a-h/templ v0.3.960
|
||||||
github.com/labstack/echo/v4 v4.13.4
|
github.com/gabriel-vasile/mimetype v1.4.11
|
||||||
|
github.com/labstack/echo/v4 v4.15.0
|
||||||
github.com/micmonay/keybd_event v1.1.2
|
github.com/micmonay/keybd_event v1.1.2
|
||||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
|
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
|
||||||
github.com/gabriel-vasile/mimetype v1.4.11
|
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
@@ -23,14 +23,14 @@ require (
|
|||||||
github.com/natefinch/atomic v1.0.1 // indirect
|
github.com/natefinch/atomic v1.0.1 // indirect
|
||||||
github.com/valyala/bytebufferpool v1.0.0 // indirect
|
github.com/valyala/bytebufferpool v1.0.0 // indirect
|
||||||
github.com/valyala/fasttemplate v1.2.2 // indirect
|
github.com/valyala/fasttemplate v1.2.2 // indirect
|
||||||
golang.org/x/crypto v0.40.0 // indirect
|
golang.org/x/crypto v0.46.0 // indirect
|
||||||
golang.org/x/mod v0.26.0 // indirect
|
golang.org/x/mod v0.30.0 // indirect
|
||||||
golang.org/x/net v0.42.0 // indirect
|
golang.org/x/net v0.48.0 // indirect
|
||||||
golang.org/x/sync v0.16.0 // indirect
|
golang.org/x/sync v0.19.0 // indirect
|
||||||
golang.org/x/sys v0.34.0 // indirect
|
golang.org/x/sys v0.39.0 // indirect
|
||||||
golang.org/x/text v0.27.0 // indirect
|
golang.org/x/text v0.32.0 // indirect
|
||||||
golang.org/x/time v0.11.0 // indirect
|
golang.org/x/time v0.14.0 // indirect
|
||||||
golang.org/x/tools v0.35.0 // indirect
|
golang.org/x/tools v0.39.0 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
tool github.com/a-h/templ/cmd/templ
|
tool github.com/a-h/templ/cmd/templ
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
|||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
github.com/labstack/echo/v4 v4.13.4 h1:oTZZW+T3s9gAu5L8vmzihV7/lkXGZuITzTQkTEhcXEA=
|
github.com/labstack/echo/v4 v4.13.4 h1:oTZZW+T3s9gAu5L8vmzihV7/lkXGZuITzTQkTEhcXEA=
|
||||||
github.com/labstack/echo/v4 v4.13.4/go.mod h1:g63b33BZ5vZzcIUF8AtRH40DrTlXnx4UMC8rBdndmjQ=
|
github.com/labstack/echo/v4 v4.13.4/go.mod h1:g63b33BZ5vZzcIUF8AtRH40DrTlXnx4UMC8rBdndmjQ=
|
||||||
|
github.com/labstack/echo/v4 v4.15.0 h1:hoRTKWcnR5STXZFe9BmYun9AMTNeSbjHi2vtDuADJ24=
|
||||||
|
github.com/labstack/echo/v4 v4.15.0/go.mod h1:xmw1clThob0BSVRX1CRQkGQ/vjwcpOMjQZSZa9fKA/c=
|
||||||
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
|
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
|
||||||
github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
|
github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
|
||||||
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
|
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
|
||||||
@@ -36,26 +38,43 @@ github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1
|
|||||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
|
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
|
||||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||||
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
|
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
|
||||||
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
|
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
|
||||||
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
|
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
|
||||||
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
|
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
|
||||||
golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
|
golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
|
||||||
golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
|
golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
|
||||||
|
golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
|
||||||
|
golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
|
||||||
golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
|
golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
|
||||||
golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
|
golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
|
||||||
|
golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
|
||||||
|
golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
|
||||||
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
|
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
|
||||||
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
|
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
|
||||||
|
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
|
||||||
|
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
|
||||||
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
|
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
|
||||||
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
||||||
|
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
|
||||||
|
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
|
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
|
||||||
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||||
|
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
|
||||||
|
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||||
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
|
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
|
||||||
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
|
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
|
||||||
|
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
|
||||||
|
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
|
||||||
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
|
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
|
||||||
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
|
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
|
||||||
|
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
|
||||||
|
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
|
||||||
golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
|
golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
|
||||||
golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
|
golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
|
||||||
|
golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
|
||||||
|
golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
+2
-4
@@ -9,8 +9,6 @@ import (
|
|||||||
"plg-mudics/shared"
|
"plg-mudics/shared"
|
||||||
)
|
)
|
||||||
|
|
||||||
const VERSION = "0.1.0"
|
|
||||||
|
|
||||||
//go:generate go tool templ generate
|
//go:generate go tool templ generate
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@@ -27,8 +25,8 @@ func main() {
|
|||||||
|
|
||||||
// the order is important, the open browser command exitsts as soon as the winodw is closed
|
// the order is important, the open browser command exitsts as soon as the winodw is closed
|
||||||
// and since its the last action in the main go func all other goroutines (e.g. the webserver) are killed
|
// and since its the last action in the main go func all other goroutines (e.g. the webserver) are killed
|
||||||
go web.StartWebServer(VERSION, port)
|
go web.StartWebServer(shared.Version, port)
|
||||||
err = shared.OpenBrowserWindow("http://localhost:"+port, true, true)
|
err = shared.OpenBrowserWindow("http://localhost:"+port, true, "display")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Failed to open browser window", "error", err)
|
slog.Error("Failed to open browser window", "error", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package pkg
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
|
||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
@@ -100,7 +99,6 @@ func TakeScreenshot() (string, error) {
|
|||||||
if commandOutput.ExitCode == 0 {
|
if commandOutput.ExitCode == 0 {
|
||||||
return tempFilePath, nil
|
return tempFilePath, nil
|
||||||
}
|
}
|
||||||
slog.Warn("Screenshot error", "error", commandOutput.Stderr)
|
|
||||||
}
|
}
|
||||||
return "", errors.New("no screenshot utility found or all failed")
|
return "", errors.New("no screenshot utility found or all failed")
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-3
@@ -15,6 +15,7 @@ import (
|
|||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
shared "plg-mudics/shared"
|
shared "plg-mudics/shared"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/gabriel-vasile/mimetype"
|
"github.com/gabriel-vasile/mimetype"
|
||||||
"github.com/labstack/echo/v4"
|
"github.com/labstack/echo/v4"
|
||||||
@@ -35,7 +36,9 @@ func StartWebServer(v string, port string) {
|
|||||||
e.GET("/", indexRoute)
|
e.GET("/", indexRoute)
|
||||||
e.GET("/sse", sseRoute)
|
e.GET("/sse", sseRoute)
|
||||||
e.GET("/splash", func(ctx echo.Context) error {
|
e.GET("/splash", func(ctx echo.Context) error {
|
||||||
return ctx.HTML(http.StatusOK, shared.SplashScreenTemplate)
|
html := shared.SplashScreenTemplate
|
||||||
|
html = strings.ReplaceAll(html, "%%APP-VERSION%%", version)
|
||||||
|
return ctx.HTML(http.StatusOK, html)
|
||||||
})
|
})
|
||||||
e.GET("/qr", qrRoute)
|
e.GET("/qr", qrRoute)
|
||||||
|
|
||||||
@@ -325,7 +328,6 @@ func openFileRoute(ctx echo.Context) error {
|
|||||||
err = resetView()
|
err = resetView()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Failed to reset view", "error", err)
|
slog.Error("Failed to reset view", "error", err)
|
||||||
return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Failed to reset view"})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mType, err := mimetype.DetectFile(fullPath)
|
mType, err := mimetype.DetectFile(fullPath)
|
||||||
@@ -372,7 +374,6 @@ func showHTMLRoute(ctx echo.Context) error {
|
|||||||
err := resetView()
|
err := resetView()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Failed to reset view", "error", err)
|
slog.Error("Failed to reset view", "error", err)
|
||||||
return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Failed to reset view"})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sseConnection <- request.HTML
|
sseConnection <- request.HTML
|
||||||
|
|||||||
+25
-22
@@ -1,13 +1,12 @@
|
|||||||
package web
|
package web
|
||||||
|
|
||||||
templ indexTemplate() {
|
templ indexTemplate() {
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
|
<head>
|
||||||
<head>
|
<meta charset="UTF-8"/>
|
||||||
<meta charset="UTF-8" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<title>PLG MuDiCS Display</title>
|
||||||
<title>PLG Connect Display</title>
|
|
||||||
<script src="/static/htmx.min.js"></script>
|
<script src="/static/htmx.min.js"></script>
|
||||||
<script src="/static/htmx-ext-sse.min.js"></script>
|
<script src="/static/htmx-ext-sse.min.js"></script>
|
||||||
<style>
|
<style>
|
||||||
@@ -33,6 +32,7 @@ templ indexTemplate() {
|
|||||||
background-color: var(--background-color);
|
background-color: var(--background-color);
|
||||||
color: var(--foreground-color);
|
color: var(--foreground-color);
|
||||||
font-family: ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
|
font-family: ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
|
||||||
|
cursor: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
video,
|
video,
|
||||||
@@ -75,42 +75,45 @@ templ indexTemplate() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<bod>
|
<bod>
|
||||||
<div hx-get="/splash" hx-trigger="load"></div>
|
<div hx-get="/splash" hx-trigger="load"></div>
|
||||||
<main hx-ext="sse" sse-connect="/sse" sse-swap="message"></main>
|
<main hx-ext="sse" sse-connect="/sse" sse-swap="message"></main>
|
||||||
</bod>
|
</bod>
|
||||||
|
</html>
|
||||||
</html>
|
|
||||||
}
|
}
|
||||||
|
|
||||||
templ videoTemplate(path string) {
|
templ videoTemplate(path string) {
|
||||||
<video autoplay>
|
<video autoplay>
|
||||||
<source src={ "/api/file/" + path } type="video/mp4" />
|
<source src={ "/api/file/" + path } type="video/mp4"/>
|
||||||
</video>
|
</video>
|
||||||
}
|
}
|
||||||
|
|
||||||
templ imageTemplate(path string) {
|
templ imageTemplate(path string) {
|
||||||
<img src={ "/api/file/" + path } />
|
<img src={ "/api/file/" + path }/>
|
||||||
}
|
}
|
||||||
|
|
||||||
templ deviceInfoTemplate(ip string, mac string, showQR bool) {
|
templ deviceInfoTemplate(ip string, mac string, showQR bool) {
|
||||||
<div style="width: 100vw; height: 100vh; display: flex; flex-direction: row; justify-content: space-between;">
|
<div style="width: 100vw; height: 100vh; display: flex; flex-direction: row; justify-content: space-between;">
|
||||||
<div
|
<div
|
||||||
style="display: flex; flex-direction: column; gap: 1rem; justify-content: end; padding: 2rem; font-size: 4rem;">
|
style="display: flex; flex-direction: column; gap: 1rem; justify-content: end; padding: 2rem; font-size: 4rem;"
|
||||||
|
>
|
||||||
{ ip }
|
{ ip }
|
||||||
<span style="text-transform: uppercase;">{ mac }</span>
|
<span style="text-transform: uppercase;">{ mac }</span>
|
||||||
</div>
|
</div>
|
||||||
if showQR {
|
if showQR {
|
||||||
<div style="display: flex; justify-content: end; align-items: end; padding: 2rem;">
|
<div style="display: flex; justify-content: end; align-items: end; padding: 2rem;">
|
||||||
<div style="padding: 1rem; background-color: var(--foreground-color); border-radius: 1rem;">
|
<div style="padding: 1rem; background-color: var(--foreground-color); border-radius: 1rem;">
|
||||||
<img style="height: 30vh; width: auto; image-rendering: pixelated; image-rendering: crisp-edges;"
|
<img
|
||||||
src={ "/qr?data=http://" + ip + ":8080" } alt="QR-Code" />
|
style="height: 30vh; width: auto; image-rendering: pixelated; image-rendering: crisp-edges;"
|
||||||
|
src={ "/qr?data=http://" + ip + ":8080" }
|
||||||
|
alt="QR-Code"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
<style>
|
<style>
|
||||||
:root {
|
:root {
|
||||||
--splash-bg: transparent !important;
|
--splash-bg: transparent !important;
|
||||||
--splash-fade-out-state: paused !important;
|
--splash-fade-out-state: paused !important;
|
||||||
|
|||||||
+5
-14
@@ -1,24 +1,15 @@
|
|||||||
github.com/a-h/htmlformat v0.0.0-20250209131833-673be874c677/go.mod h1:FMIm5afKmEfarNbIXOaPHFY8X7fo+fRQB6I9MPG2nB0=
|
github.com/a-h/htmlformat v0.0.0-20250209131833-673be874c677/go.mod h1:FMIm5afKmEfarNbIXOaPHFY8X7fo+fRQB6I9MPG2nB0=
|
||||||
github.com/a-h/templ v0.3.960 h1:trshEpGa8clF5cdI39iY4ZrZG8Z/QixyzEyUnA7feTM=
|
|
||||||
github.com/a-h/templ v0.3.960/go.mod h1:oCZcnKRf5jjsGpf2yELzQfodLphd2mwecwG4Crk5HBo=
|
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
|
||||||
github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
|
github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
|
||||||
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||||
golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
|
|
||||||
golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
|
|
||||||
golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
|
golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
|
||||||
golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
|
|
||||||
golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
|
golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
|
||||||
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
|
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
|
||||||
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
|
|
||||||
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
|
||||||
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
|
|
||||||
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
|
||||||
golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
|
golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
|
||||||
golang.org/x/telemetry v0.0.0-20250710130107-8d8967aff50b/go.mod h1:4ZwOYna0/zsOKwuR5X/m0QFOJpSZvAxFfkQT+Erd9D4=
|
golang.org/x/telemetry v0.0.0-20250710130107-8d8967aff50b/go.mod h1:4ZwOYna0/zsOKwuR5X/m0QFOJpSZvAxFfkQT+Erd9D4=
|
||||||
|
golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54/go.mod h1:hKdjCMrbv9skySur+Nek8Hd0uJ0GuxJIoIX2payrIdQ=
|
||||||
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
|
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
|
||||||
golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
|
golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
|
||||||
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
|
golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
|
||||||
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
|
|
||||||
golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
|
golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
|
||||||
golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
|||||||
+15
-2
@@ -86,7 +86,6 @@
|
|||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# Programs
|
# Programs
|
||||||
libreoffice
|
libreoffice
|
||||||
#rustdesk
|
|
||||||
ungoogled-chromium
|
ungoogled-chromium
|
||||||
xfce.thunar-archive-plugin
|
xfce.thunar-archive-plugin
|
||||||
git
|
git
|
||||||
@@ -94,6 +93,8 @@
|
|||||||
unzip
|
unzip
|
||||||
iputils
|
iputils
|
||||||
xreader
|
xreader
|
||||||
|
tree
|
||||||
|
jq
|
||||||
|
|
||||||
# Libraries
|
# Libraries
|
||||||
imagemagick
|
imagemagick
|
||||||
@@ -115,7 +116,7 @@
|
|||||||
after = ["network-online.target"];
|
after = ["network-online.target"];
|
||||||
wants = ["network-online.target"];
|
wants = ["network-online.target"];
|
||||||
path = config.environment.systemPackages;
|
path = config.environment.systemPackages;
|
||||||
script = "nu ${./update.sh}";
|
script = "nu ${./update.nu}";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
WorkingDirectory = "/home/mudics/mudics";
|
WorkingDirectory = "/home/mudics/mudics";
|
||||||
User = "mudics";
|
User = "mudics";
|
||||||
@@ -137,6 +138,7 @@
|
|||||||
environment = {
|
environment = {
|
||||||
DISPLAY = ":0";
|
DISPLAY = ":0";
|
||||||
XDG_RUNTIME_DIR = "/run/user/1000";
|
XDG_RUNTIME_DIR = "/run/user/1000";
|
||||||
|
XDG_DATA_DIRS = "/run/current-system/sw/share";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -150,6 +152,17 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
systemd.services.enable-wol = {
|
||||||
|
wantedBy = ["multi-user.target"];
|
||||||
|
after = ["network.target"];
|
||||||
|
path = with pkgs; [ethtool nushell];
|
||||||
|
script = "nu ${./wol.nu}";
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
User = "root";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"d /home/mudics/mudics 0755 mudics - -"
|
"d /home/mudics/mudics 0755 mudics - -"
|
||||||
];
|
];
|
||||||
|
|||||||
Generated
+8
-8
@@ -7,32 +7,32 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763992789,
|
"lastModified": 1767910483,
|
||||||
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
|
"narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
|
"rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.05",
|
"ref": "release-25.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761999846,
|
"lastModified": 1767799921,
|
||||||
"narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=",
|
"narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31",
|
"rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-25.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-25.05";
|
url = "github:nix-community/home-manager/release-25.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
#!/usr/bin/env nu
|
||||||
|
|
||||||
|
ls /sys/class/net | get name | path basename | where $it != "lo" | each {|iface|
|
||||||
|
print $"Enabling WoL on ($iface)..."
|
||||||
|
try {
|
||||||
|
ethtool -s $iface wol g
|
||||||
|
print $"Successfully enabled WoL on ($iface)"
|
||||||
|
} catch {
|
||||||
|
print $"Failed to enable WoL on ($iface). It might not be supported."
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,7 +2,12 @@ package shared
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
_ "embed"
|
_ "embed"
|
||||||
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed splash_screen.html
|
//go:embed splash_screen.html
|
||||||
var SplashScreenTemplate string
|
var SplashScreenTemplate string
|
||||||
|
|
||||||
|
//go:embed version.txt
|
||||||
|
var versionNotTrimmed string
|
||||||
|
var Version = strings.TrimSpace(versionNotTrimmed)
|
||||||
|
|||||||
+19
-10
@@ -5,23 +5,32 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
"path/filepath"
|
||||||
)
|
)
|
||||||
|
|
||||||
func OpenBrowserWindow(url string, fullscreen bool, temp bool) error {
|
func OpenBrowserWindow(url string, fullscreen bool, profile string) error {
|
||||||
bins := []string{"chromium", "chromium-browser"}
|
bins := []string{"chromium", "chromium-browser"}
|
||||||
|
|
||||||
args := []string{fmt.Sprintf("--app=%s", url), "--autoplay-policy=no-user-gesture-required"}
|
home, err := os.UserHomeDir()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("unable to determine user home directory: %w", err)
|
||||||
|
}
|
||||||
|
browserProfileDirPath := filepath.Join(home, ".local", "share", "plg-mudics", fmt.Sprintf("browser-%s", profile))
|
||||||
|
if err := os.MkdirAll(browserProfileDirPath, os.ModePerm); err != nil {
|
||||||
|
return fmt.Errorf("failed to create local config directory: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
args := []string{
|
||||||
|
fmt.Sprintf("--app=%s", url),
|
||||||
|
"--autoplay-policy=no-user-gesture-required",
|
||||||
|
fmt.Sprintf("--user-data-dir=%s", browserProfileDirPath),
|
||||||
|
"--disable-web-security",
|
||||||
|
"--allow-running-insecure-content",
|
||||||
|
"--disable-features=XFrameOptions",
|
||||||
|
}
|
||||||
if fullscreen {
|
if fullscreen {
|
||||||
args = append(args, "--start-fullscreen")
|
args = append(args, "--start-fullscreen")
|
||||||
}
|
}
|
||||||
if temp {
|
|
||||||
tempDirPath, err := os.MkdirTemp("", "plg-mudics-browser-")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
arg := fmt.Sprintf("--user-data-dir=%s", tempDirPath)
|
|
||||||
args = append(args, arg)
|
|
||||||
}
|
|
||||||
|
|
||||||
errs := []string{}
|
errs := []string{}
|
||||||
for _, bin := range bins {
|
for _, bin := range bins {
|
||||||
|
|||||||
+251
-32
@@ -1,5 +1,5 @@
|
|||||||
<div id="splash">
|
<div id="splash">
|
||||||
<svg id="splash-svg" viewBox="0 0 950 550">
|
<svg id="splash-svg" class="fade-in" viewBox="0 0 950 550">
|
||||||
<!-- Paths -->
|
<!-- Paths -->
|
||||||
<!-- Disabled Paths -->
|
<!-- Disabled Paths -->
|
||||||
<path class="splash-stroke" d="M 385 350 V 270 H 100 V 112.5" />
|
<path class="splash-stroke" d="M 385 350 V 270 H 100 V 112.5" />
|
||||||
@@ -8,30 +8,110 @@
|
|||||||
<path class="splash-stroke" d="M 565 350 V 270 H 850 V 112.5" />
|
<path class="splash-stroke" d="M 565 350 V 270 H 850 V 112.5" />
|
||||||
<!-- Masks -->
|
<!-- Masks -->
|
||||||
<defs>
|
<defs>
|
||||||
<mask id="m1" maskUnits="userSpaceOnUse" maskContentUnits="userSpaceOnUse">
|
<mask
|
||||||
<path class="splash-mask" pathLength="100" d="M 385 350 V 270 H 100 V 112.5" />
|
id="m1"
|
||||||
|
maskUnits="userSpaceOnUse"
|
||||||
|
maskContentUnits="userSpaceOnUse"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
class="splash-mask"
|
||||||
|
pathLength="100"
|
||||||
|
d="M 385 350 V 270 H 100 V 112.5"
|
||||||
|
/>
|
||||||
</mask>
|
</mask>
|
||||||
<mask id="m2" maskUnits="userSpaceOnUse" maskContentUnits="userSpaceOnUse">
|
<mask
|
||||||
<path class="splash-mask" pathLength="100" d="M 445 350 V 210 H 350 V 112.5" />
|
id="m2"
|
||||||
|
maskUnits="userSpaceOnUse"
|
||||||
|
maskContentUnits="userSpaceOnUse"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
class="splash-mask"
|
||||||
|
pathLength="100"
|
||||||
|
d="M 445 350 V 210 H 350 V 112.5"
|
||||||
|
/>
|
||||||
</mask>
|
</mask>
|
||||||
<mask id="m3" maskUnits="userSpaceOnUse" maskContentUnits="userSpaceOnUse">
|
<mask
|
||||||
<path class="splash-mask" pathLength="100" d="M 505 350 V 210 H 600 V 112.5" />
|
id="m3"
|
||||||
|
maskUnits="userSpaceOnUse"
|
||||||
|
maskContentUnits="userSpaceOnUse"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
class="splash-mask"
|
||||||
|
pathLength="100"
|
||||||
|
d="M 505 350 V 210 H 600 V 112.5"
|
||||||
|
/>
|
||||||
</mask>
|
</mask>
|
||||||
<mask id="m4" maskUnits="userSpaceOnUse" maskContentUnits="userSpaceOnUse">
|
<mask
|
||||||
<path class="splash-mask" pathLength="100" d="M 565 350 V 270 H 850 V 112.5" />
|
id="m4"
|
||||||
|
maskUnits="userSpaceOnUse"
|
||||||
|
maskContentUnits="userSpaceOnUse"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
class="splash-mask"
|
||||||
|
pathLength="100"
|
||||||
|
d="M 565 350 V 270 H 850 V 112.5"
|
||||||
|
/>
|
||||||
</mask>
|
</mask>
|
||||||
</defs>
|
</defs>
|
||||||
<!-- Active Paths -->
|
<!-- Active Paths -->
|
||||||
<path class="splash-stroke-active" mask="url(#m1)" d="M 385 350 V 270 H 100 V 112.5" />
|
<path
|
||||||
<path class="splash-stroke-active" mask="url(#m2)" d="M 445 350 V 210 H 350 V 112.5" />
|
class="splash-stroke-active"
|
||||||
<path class="splash-stroke-active" mask="url(#m3)" d="M 505 350 V 210 H 600 V 112.5" />
|
mask="url(#m1)"
|
||||||
<path class="splash-stroke-active" mask="url(#m4)" d="M 565 350 V 270 H 850 V 112.5" />
|
d="M 385 350 V 270 H 100 V 112.5"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
class="splash-stroke-active"
|
||||||
|
mask="url(#m2)"
|
||||||
|
d="M 445 350 V 210 H 350 V 112.5"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
class="splash-stroke-active"
|
||||||
|
mask="url(#m3)"
|
||||||
|
d="M 505 350 V 210 H 600 V 112.5"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
class="splash-stroke-active"
|
||||||
|
mask="url(#m4)"
|
||||||
|
d="M 565 350 V 270 H 850 V 112.5"
|
||||||
|
/>
|
||||||
|
|
||||||
<!-- Displays -->
|
<!-- Displays -->
|
||||||
<rect x="0" y="0" width="200" height="112.5" rx="8" ry="8" class="splash-monitor" />
|
<rect
|
||||||
<rect x="250" y="0" width="200" height="112.5" rx="8" ry="8" class="splash-monitor" />
|
x="0"
|
||||||
<rect x="500" y="0" width="200" height="112.5" rx="8" ry="8" class="splash-monitor" />
|
y="0"
|
||||||
<rect x="750" y="0" width="200" height="112.5" rx="8" ry="8" class="splash-monitor" />
|
width="200"
|
||||||
|
height="112.5"
|
||||||
|
rx="8"
|
||||||
|
ry="8"
|
||||||
|
class="splash-monitor"
|
||||||
|
/>
|
||||||
|
<rect
|
||||||
|
x="250"
|
||||||
|
y="0"
|
||||||
|
width="200"
|
||||||
|
height="112.5"
|
||||||
|
rx="8"
|
||||||
|
ry="8"
|
||||||
|
class="splash-monitor"
|
||||||
|
/>
|
||||||
|
<rect
|
||||||
|
x="500"
|
||||||
|
y="0"
|
||||||
|
width="200"
|
||||||
|
height="112.5"
|
||||||
|
rx="8"
|
||||||
|
ry="8"
|
||||||
|
class="splash-monitor"
|
||||||
|
/>
|
||||||
|
<rect
|
||||||
|
x="750"
|
||||||
|
y="0"
|
||||||
|
width="200"
|
||||||
|
height="112.5"
|
||||||
|
rx="8"
|
||||||
|
ry="8"
|
||||||
|
class="splash-monitor"
|
||||||
|
/>
|
||||||
|
|
||||||
<!-- Text -->
|
<!-- Text -->
|
||||||
<text class="splash-text" x="100" y="66.25" font-size="90">Mu</text>
|
<text class="splash-text" x="100" y="66.25" font-size="90">Mu</text>
|
||||||
@@ -40,29 +120,85 @@
|
|||||||
<text class="splash-text" x="850" y="66.25" font-size="90">S</text>
|
<text class="splash-text" x="850" y="66.25" font-size="90">S</text>
|
||||||
|
|
||||||
<!-- Controller -->
|
<!-- Controller -->
|
||||||
<rect x="325" y="350" width="300" height="168.75" rx="8" ry="8" class="splash-control-monitor" />
|
<rect
|
||||||
<rect x="335" y="390" width="135" height="120" rx="8" ry="8" class="splash-other-button" />
|
x="325"
|
||||||
<rect x="480" y="390" width="135" height="55" rx="8" ry="8" class="splash-other-button" />
|
y="350"
|
||||||
<rect x="480" y="455" width="135" height="55" rx="8" ry="8" class="splash-start-button" />
|
width="300"
|
||||||
|
height="168.75"
|
||||||
|
rx="8"
|
||||||
|
ry="8"
|
||||||
|
class="splash-control-monitor"
|
||||||
|
/>
|
||||||
|
<rect
|
||||||
|
x="335"
|
||||||
|
y="390"
|
||||||
|
width="135"
|
||||||
|
height="120"
|
||||||
|
rx="8"
|
||||||
|
ry="8"
|
||||||
|
class="splash-other-button"
|
||||||
|
/>
|
||||||
|
<rect
|
||||||
|
x="480"
|
||||||
|
y="390"
|
||||||
|
width="135"
|
||||||
|
height="55"
|
||||||
|
rx="8"
|
||||||
|
ry="8"
|
||||||
|
class="splash-other-button"
|
||||||
|
/>
|
||||||
|
<rect
|
||||||
|
x="480"
|
||||||
|
y="455"
|
||||||
|
width="135"
|
||||||
|
height="55"
|
||||||
|
rx="8"
|
||||||
|
ry="8"
|
||||||
|
class="splash-start-button"
|
||||||
|
/>
|
||||||
|
|
||||||
<!-- Window Controls -->
|
<!-- Window Controls -->
|
||||||
<path class="window-controls" d="M 600 360 L 615 375" />
|
<path class="window-controls" d="M 600 360 l 15 15" />
|
||||||
<path class="window-controls" d="M 600 375 L 615 360" />
|
<path class="window-controls" d="M 600 375 l 15 -15" />
|
||||||
<path class="window-controls" fill="none" d="M 575 360 H 590 V 375 H 575 V 360" />
|
<path
|
||||||
<path class="window-controls" d="M 550 375 H 565" />
|
class="window-controls"
|
||||||
|
fill="none"
|
||||||
|
d="M 575 360 h 15 v 15 h -15 v -15"
|
||||||
|
/>
|
||||||
|
<path class="window-controls" d="M 550 375 h 15" />
|
||||||
|
</svg>
|
||||||
|
|
||||||
<svg class="cursor" width="50" height="50" viewBox="0 0 24 24" x="510" y="480" aria-hidden="true">
|
<span id="version-label" aria-label="Version">%%APP-VERSION%%</span>
|
||||||
<g stroke="#ffffff" fill="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
|
||||||
|
<div class="fade-in">
|
||||||
|
<div
|
||||||
|
class="cursor-x"
|
||||||
|
style="
|
||||||
|
position: absolute;
|
||||||
|
left: calc(50cqw + var(--mouse-start-x));
|
||||||
|
top: calc(50cqh + var(--mouse-start-y));
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<svg class="cursor-y" width="50" height="50" viewBox="0 0 24 24">
|
||||||
|
<g
|
||||||
|
stroke="#ffffff"
|
||||||
|
fill="#000000"
|
||||||
|
stroke-width="2"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
>
|
||||||
<path stroke="#000000" d="M 6.5 10 H 18 V 19 H 6" />
|
<path stroke="#000000" d="M 6.5 10 H 18 V 19 H 6" />
|
||||||
<path d="M22 14a8 8 0 0 1-8 8" />
|
<path d="M22 14a8 8 0 0 1-8 8" />
|
||||||
<path d="M18 11v-1a2 2 0 0 0-2-2a2 2 0 0 0-2 2" />
|
<path d="M18 11v-1a2 2 0 0 0-2-2a2 2 0 0 0-2 2" />
|
||||||
<path d="M14 10V9a2 2 0 0 0-2-2a2 2 0 0 0-2 2v1" />
|
<path d="M14 10V9a2 2 0 0 0-2-2a2 2 0 0 0-2 2v1" />
|
||||||
<path d="M10 9.5V4a2 2 0 0 0-2-2a2 2 0 0 0-2 2v10" />
|
<path d="M10 9.5V4a2 2 0 0 0-2-2a2 2 0 0 0-2 2v10" />
|
||||||
<path
|
<path
|
||||||
d="M18 11a2 2 0 1 1 4 0v3a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.86-5.99-2.34l-3.6-3.6a2 2 0 0 1 2.83-2.82L7 15" />
|
d="M18 11a2 2 0 1 1 4 0v3a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.86-5.99-2.34l-3.6-3.6a2 2 0 0 1 2.83-2.82L7 15"
|
||||||
|
/>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
</svg>
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
@@ -83,11 +219,31 @@
|
|||||||
--other-button: oklch(55.3% 0.013 58.071);
|
--other-button: oklch(55.3% 0.013 58.071);
|
||||||
--splash-control-monitor: oklch(44.4% 0.011 73.639);
|
--splash-control-monitor: oklch(44.4% 0.011 73.639);
|
||||||
|
|
||||||
|
--version-color: oklch(55.3% 0.013 58.071);
|
||||||
|
|
||||||
|
--mouse-size: 50px;
|
||||||
|
--mouse-bounce-delay: 5s;
|
||||||
|
--mouse-start-x: calc((35 * 100vw) / 1920);
|
||||||
|
--mouse-start-y: calc((60 * 100vh) / 1080);
|
||||||
|
|
||||||
|
--dur-x: 16s;
|
||||||
|
--dur-y: 9s;
|
||||||
|
|
||||||
--stroke-strength: 8;
|
--stroke-strength: 8;
|
||||||
--dash: 16;
|
--dash: 16;
|
||||||
--gap: 20;
|
--gap: 20;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#version-label {
|
||||||
|
position: absolute;
|
||||||
|
right: 1rem;
|
||||||
|
top: 1rem;
|
||||||
|
display: block;
|
||||||
|
color: var(--version-color);
|
||||||
|
padding: 0.4rem 0.8rem;
|
||||||
|
font-size: 1.4rem;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
#splash {
|
#splash {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
@@ -98,7 +254,6 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
z-index: 9999;
|
z-index: 9999;
|
||||||
/* animation: splash-fade 1s ease 4s forwards; */
|
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
width: 100vw;
|
width: 100vw;
|
||||||
|
|
||||||
@@ -113,6 +268,10 @@
|
|||||||
#splash-svg {
|
#splash-svg {
|
||||||
max-height: 50vh;
|
max-height: 50vh;
|
||||||
max-width: 80vw;
|
max-width: 80vw;
|
||||||
|
transform: translateY(-12cqh);
|
||||||
|
}
|
||||||
|
|
||||||
|
.fade-in {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
animation: fade-in 1s ease 500ms forwards;
|
animation: fade-in 1s ease 500ms forwards;
|
||||||
}
|
}
|
||||||
@@ -183,8 +342,26 @@
|
|||||||
animation: start-button-hover-press 1s ease-in-out 450ms forwards;
|
animation: start-button-hover-press 1s ease-in-out 450ms forwards;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cursor {
|
.cursor-x {
|
||||||
animation: move-mouse 1s ease-in-out 0ms forwards;
|
animation-name: move-mouse, mouse-bounceX;
|
||||||
|
animation-duration: 1s, var(--dur-x);
|
||||||
|
animation-delay: 0s, var(--mouse-bounce-delay);
|
||||||
|
animation-iteration-count: 1, infinite;
|
||||||
|
animation-direction: normal, normal;
|
||||||
|
animation-timing-function: ease-in-out, linear;
|
||||||
|
animation-fill-mode: both, none;
|
||||||
|
will-change: transform;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cursor-y {
|
||||||
|
animation-name: mouse-bounceY;
|
||||||
|
animation-duration: var(--dur-y);
|
||||||
|
animation-delay: var(--mouse-bounce-delay);
|
||||||
|
animation-iteration-count: infinite;
|
||||||
|
animation-direction: normal;
|
||||||
|
animation-timing-function: linear;
|
||||||
|
animation-fill-mode: none;
|
||||||
|
will-change: transform;
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes fade-in {
|
@keyframes fade-in {
|
||||||
@@ -207,6 +384,38 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@keyframes mouse-bounceX {
|
||||||
|
0% {
|
||||||
|
transform: translateX(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
26% {
|
||||||
|
transform: translateX(calc(-50cqw - var(--mouse-start-x)));
|
||||||
|
}
|
||||||
|
|
||||||
|
76% {
|
||||||
|
transform: translateX(
|
||||||
|
calc(50cqw - var(--mouse-size) - var(--mouse-start-x))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes mouse-bounceY {
|
||||||
|
0% {
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
27% {
|
||||||
|
transform: translateY(calc(-50cqh - var(--mouse-start-y)));
|
||||||
|
}
|
||||||
|
|
||||||
|
77% {
|
||||||
|
transform: translateY(
|
||||||
|
calc(50cqh - var(--mouse-size) - var(--mouse-start-y))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@keyframes start-button-hover-press {
|
@keyframes start-button-hover-press {
|
||||||
0% {
|
0% {
|
||||||
fill: var(--start-button-inactive);
|
fill: var(--start-button-inactive);
|
||||||
@@ -265,3 +474,13 @@
|
|||||||
vector-effect: non-scaling-stroke;
|
vector-effect: non-scaling-stroke;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
const r =
|
||||||
|
Math.random() < 0.01
|
||||||
|
? 9 / 15.039473684
|
||||||
|
: 0.55 + (Math.random() - 0.5) * 0.18;
|
||||||
|
const tx = 13 + Math.random() * 5;
|
||||||
|
document.documentElement.style.setProperty("--dur-x", tx + "s");
|
||||||
|
document.documentElement.style.setProperty("--dur-y", tx * r + "s");
|
||||||
|
</script>
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
v0.0.15
|
||||||
Reference in New Issue
Block a user