Compare commits

..

75 Commits

Author SHA1 Message Date
E44 41d8c4755a chore: bump to version v0.1.6 2026-06-14 22:11:15 +02:00
E44 21cb07a465 chore(display): add ai generated pdf.js integration (#58)
Co-authored-by: E44 <129310925+programmer-44@users.noreply.github.com>
Reviewed-on: https://codeberg.org/PLG-Development/PLG-MuDiCS/pulls/58
2026-06-14 22:10:04 +02:00
E44 2dc46c186e chore(control): update files only of online displays when changing file path 2026-06-14 20:34:38 +02:00
E44 2dd390e815 chore(control): add select all files button
closes #25
2026-06-14 20:26:21 +02:00
E44 87eaf90c12 fix(control): use correct colors and include edge cases in select all displays button 2026-06-14 20:25:45 +02:00
E44 3174010e83 chore(control): improve startup behavoir
closes #22
2026-06-14 19:19:15 +02:00
E44 ec7c3b407c chore(control): improve error handling 2026-06-14 19:11:27 +02:00
E44 2dcf5a7758 fix(control): add error handler for shutdown
closes: #53
2026-06-14 19:09:20 +02:00
E44 5ecf2da8a9 feat(control): add File Drag and Drop
closes #51
2026-06-14 00:22:29 +02:00
E44 a49b842a4c feat(control): bind arrow keys to arrow buttons 2026-06-13 22:00:09 +02:00
E44 a3d444df20 fix: disable chrome translate
closes #56
2026-06-13 20:38:28 +02:00
E44 fb31f732af fix(control): ping response was wrong 2026-06-12 23:04:50 +02:00
E44 5ea7ff3ce0 chore: bump to version v0.1.5 2026-06-12 11:00:41 +02:00
E44 a827a3e588 feat(control): show display block version in control block
closes #54
2026-06-12 10:59:09 +02:00
2mal3 9284a8f72a display/TakeScreenshot: use .jpg smaller images
closes #44
2026-06-10 23:50:08 +02:00
E44 d969c041d0 refactor(control): use default instead of case null in display_status_to_info
hopefully will close#42
2026-06-10 22:16:06 +02:00
E44 0a9d3af3eb fix: shows media instead of downloading
closes #50
2026-06-10 22:11:02 +02:00
E44 b6150fdab0 fix(control): uploading file(s) to multiple displays
closes #41
2026-06-10 21:57:36 +02:00
E44 b6c637649f refactor(control): improve code quality 2026-06-10 21:16:36 +02:00
E44 a7582851b4 fix(display): display cursor movements adapts to window resizing
closes #49
2026-06-10 20:10:15 +02:00
E44 919bba7c2e refactor(control): implement ESLint -> remove unnecessary imports, improve general code quality 2026-06-09 22:00:36 +02:00
E44 64b8fcffe2 chore(control): add version to about page 2026-06-09 21:39:08 +02:00
2mal3 9e0d8762d9 chore: bump to version v0.1.4 2026-06-05 11:41:46 +02:00
2mal3 07c8d7ea3d chore: more error handling 2026-05-30 12:27:08 +02:00
2mal3 aedd9fce44 chore: just support for running scripts 2026-02-20 17:56:01 +01:00
2mal3 e74356f9a6 chore(control): remove e2e tests 2026-02-20 17:46:14 +01:00
2mal3 136bba25fe chore(nixos): remove unneeded dependencies 2026-02-20 17:34:01 +01:00
2mal3 9b70e9aae9 chore: update flake.nix with updated deps 2026-02-20 17:33:42 +01:00
2mal3 79d122ded7 fix(control): wrong right button text
fixes #33
2026-02-20 17:33:21 +01:00
2mal3 18d150c767 bump to v0.1.3 2026-01-30 15:28:50 +01:00
2mal3 71f152ef2a refactor(display): use chrome devtools protocol (#38) 2026-01-30 15:26:57 +01:00
2mal3 cbbf50e5a4 bump to v0.1.2 2026-01-29 20:31:46 +01:00
2mal3 934dd42866 fix(control): typo in credits 2026-01-24 11:26:51 +01:00
2mal3 d2add33a7c fix(control): couldn't upload same file multiple times 2026-01-24 11:15:23 +01:00
2mal3 b4f9215fd4 fix(control): could not upload odp files 2026-01-23 23:13:19 +01:00
2mal3 666f04e3c6 style: supported_file_types.json 2026-01-23 23:06:47 +01:00
2mal3 eea15c558f fix(nixos): xfce pop when connecting new display 2026-01-21 18:30:11 +01:00
E44 9a4e2d4919 fix(control): enable startup_button if needed 2026-01-20 17:56:15 +01:00
E44 1138842269 refactor(control): improve code structure through new function 2026-01-19 23:35:38 +01:00
E44 c7bf6fa6f7 chore(control): clear loggin messages 2026-01-19 23:31:45 +01:00
E44 befa83131b fix(control): download button wasn't enabled 2026-01-19 23:14:30 +01:00
E44 c865dbeeae fix(control): get_missing_colliding_display_ids 2026-01-19 23:11:19 +01:00
E44 a5ee1b28d9 fix(control): open_inode_action and icon is now correct 2026-01-19 23:10:53 +01:00
E44 9e325566c5 refactor(control): remove unnecessary logging 2026-01-19 22:48:20 +01:00
E44 168576db81 refactor(control): create new constantly updated list of selected_online_display_ids 2026-01-19 22:47:36 +01:00
E44 3a30aca1dc chore(control): Keyboard queue (#31)
Co-authored-by: 2mal3 <56305732+2mal3@users.noreply.github.com>
2026-01-19 22:28:24 +01:00
2mal3 f2a648b429 chore(display): cleaner file download handling (#30) 2026-01-19 21:48:09 +01:00
E44 203e48c31c bump to v0.0.18 2026-01-19 20:46:38 +01:00
E44 8b878b183b refactor(control): remove unnecessary small function 2026-01-19 20:28:07 +01:00
E44 a38827da54 fix(control): deselect file for sync 2026-01-19 20:24:45 +01:00
2mal3 25c0fe2b4b fix(display): libreoffice lock issues
libreoffice cli is bad documented and broken shit
2026-01-19 19:19:58 +01:00
E44 c96b8fe7e4 bump to version v0.0.17 2026-01-19 18:58:28 +01:00
E44 671c74f25d chore(control): save text and url 2026-01-19 18:57:56 +01:00
2mal3 4d5d9849da feat: support sending modifier keys (#18)
Co-authored-by: E44 <129310925+programmer-44@users.noreply.github.com>
2026-01-19 18:47:53 +01:00
E44 c8e21a64bf fix(control): fix warning in compile process 2026-01-19 18:36:33 +01:00
E44 2711d89f22 chore(control): show folder_size as sum of all folder_elements 2026-01-19 18:33:59 +01:00
E44 c09e4b2d8d chore(control): set size of all folders in db to 0 2026-01-19 17:57:32 +01:00
E44 209080db22 refactor(control): replace === 'inode/directory' with is_folder() 2026-01-19 17:54:47 +01:00
2mal3 4acbc96a58 chore(control): prevent closing popups by clicking outside (#20)
Multiple test users closed various popups accidentally by clicking outside and rarely used the feature to close the popup.
2026-01-19 17:40:53 +01:00
E44 99643f8029 chore(control): display transferring file correctly (still a few bugs) 2026-01-19 15:39:53 +01:00
2mal3 ef7dfa49fe chore(control/ping): increase timeout 2026-01-19 12:43:22 +01:00
E44 7cfa56a906 chore(control): set preview update mode in dev mode to never automatically 2026-01-18 22:34:43 +01:00
E44 63c7cea4ca bump to v0.0.16 2026-01-18 22:24:35 +01:00
E44 0e87ca3ae1 fix(control): screenshot_loop is no longer blocking, preview states are now consistently changed 2026-01-18 22:22:30 +01:00
2mal3 d61ef0fe94 fix: browser insecurity warning 2026-01-18 22:13:03 +01:00
E44 5d1f3e2d20 refactor(control): correct spelling 2026-01-18 19:11:24 +01:00
E44 6dfb29bbd1 chore(control): improve handling with offline displays 2026-01-18 19:05:15 +01:00
2mal3 49410bf372 chore(control): more user friendly open website pop up 2026-01-18 18:59:12 +01:00
2mal3 5d22f62a6e chore(control): german button names 2026-01-18 18:52:22 +01:00
2mal3 a31080c602 chore(control): rename keyboard input 2026-01-18 18:47:59 +01:00
2mal3 ea3cbcb8c6 chore(control): title case for buttons and headings 2026-01-18 18:46:21 +01:00
2mal3 a0cf45c8dc chore: consistent display naming 2026-01-18 18:41:23 +01:00
E44 97d2608adf fix(control): wrong url in not-dev-mode 2026-01-18 18:23:49 +01:00
E44 36d2887247 fix(control): unknown status at app_start 2026-01-18 18:23:01 +01:00
E44 1e9148bff2 fix(control): use local ip address only in dev mode 2026-01-18 18:17:04 +01:00
66 changed files with 2503 additions and 1650 deletions
+1
View File
@@ -1,2 +1,3 @@
.aider* .aider*
.env .env
/display/internal/pdfjs/node_modules
+2 -30
View File
@@ -3,7 +3,6 @@
"specifiers": { "specifiers": {
"npm:@eslint/compat@^1.4.1": "1.4.1_eslint@9.39.2", "npm:@eslint/compat@^1.4.1": "1.4.1_eslint@9.39.2",
"npm:@eslint/js@^9.39.2": "9.39.2", "npm:@eslint/js@^9.39.2": "9.39.2",
"npm:@playwright/test@1.56.1": "1.56.1",
"npm:@sveltejs/adapter-auto@^6.1.1": "6.1.1_@sveltejs+kit@2.49.3__@sveltejs+vite-plugin-svelte@6.2.3___svelte@5.46.1____acorn@8.15.0___vite@7.3.1____sass-embedded@1.97.2____picomatch@4.0.3___sass-embedded@1.97.2__svelte@5.46.1___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___sass-embedded@1.97.2___picomatch@4.0.3__acorn@8.15.0__sass-embedded@1.97.2_@sveltejs+vite-plugin-svelte@6.2.3__svelte@5.46.1___acorn@8.15.0__vite@7.3.1___sass-embedded@1.97.2___picomatch@4.0.3__sass-embedded@1.97.2_svelte@5.46.1__acorn@8.15.0_typescript@5.9.3_vite@7.3.1__sass-embedded@1.97.2__picomatch@4.0.3_sass-embedded@1.97.2", "npm:@sveltejs/adapter-auto@^6.1.1": "6.1.1_@sveltejs+kit@2.49.3__@sveltejs+vite-plugin-svelte@6.2.3___svelte@5.46.1____acorn@8.15.0___vite@7.3.1____sass-embedded@1.97.2____picomatch@4.0.3___sass-embedded@1.97.2__svelte@5.46.1___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___sass-embedded@1.97.2___picomatch@4.0.3__acorn@8.15.0__sass-embedded@1.97.2_@sveltejs+vite-plugin-svelte@6.2.3__svelte@5.46.1___acorn@8.15.0__vite@7.3.1___sass-embedded@1.97.2___picomatch@4.0.3__sass-embedded@1.97.2_svelte@5.46.1__acorn@8.15.0_typescript@5.9.3_vite@7.3.1__sass-embedded@1.97.2__picomatch@4.0.3_sass-embedded@1.97.2",
"npm:@sveltejs/adapter-static@^3.0.10": "3.0.10_@sveltejs+kit@2.49.3__@sveltejs+vite-plugin-svelte@6.2.3___svelte@5.46.1____acorn@8.15.0___vite@7.3.1____sass-embedded@1.97.2____picomatch@4.0.3___sass-embedded@1.97.2__svelte@5.46.1___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___sass-embedded@1.97.2___picomatch@4.0.3__acorn@8.15.0__sass-embedded@1.97.2_@sveltejs+vite-plugin-svelte@6.2.3__svelte@5.46.1___acorn@8.15.0__vite@7.3.1___sass-embedded@1.97.2___picomatch@4.0.3__sass-embedded@1.97.2_svelte@5.46.1__acorn@8.15.0_typescript@5.9.3_vite@7.3.1__sass-embedded@1.97.2__picomatch@4.0.3_sass-embedded@1.97.2", "npm:@sveltejs/adapter-static@^3.0.10": "3.0.10_@sveltejs+kit@2.49.3__@sveltejs+vite-plugin-svelte@6.2.3___svelte@5.46.1____acorn@8.15.0___vite@7.3.1____sass-embedded@1.97.2____picomatch@4.0.3___sass-embedded@1.97.2__svelte@5.46.1___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___sass-embedded@1.97.2___picomatch@4.0.3__acorn@8.15.0__sass-embedded@1.97.2_@sveltejs+vite-plugin-svelte@6.2.3__svelte@5.46.1___acorn@8.15.0__vite@7.3.1___sass-embedded@1.97.2___picomatch@4.0.3__sass-embedded@1.97.2_svelte@5.46.1__acorn@8.15.0_typescript@5.9.3_vite@7.3.1__sass-embedded@1.97.2__picomatch@4.0.3_sass-embedded@1.97.2",
"npm:@sveltejs/kit@^2.49.3": "2.49.3_@sveltejs+vite-plugin-svelte@6.2.3__svelte@5.46.1___acorn@8.15.0__vite@7.3.1___sass-embedded@1.97.2___picomatch@4.0.3__sass-embedded@1.97.2_svelte@5.46.1__acorn@8.15.0_typescript@5.9.3_vite@7.3.1__sass-embedded@1.97.2__picomatch@4.0.3_acorn@8.15.0_sass-embedded@1.97.2", "npm:@sveltejs/kit@^2.49.3": "2.49.3_@sveltejs+vite-plugin-svelte@6.2.3__svelte@5.46.1___acorn@8.15.0__vite@7.3.1___sass-embedded@1.97.2___picomatch@4.0.3__sass-embedded@1.97.2_svelte@5.46.1__acorn@8.15.0_typescript@5.9.3_vite@7.3.1__sass-embedded@1.97.2__picomatch@4.0.3_acorn@8.15.0_sass-embedded@1.97.2",
@@ -369,13 +368,6 @@
], ],
"scripts": true "scripts": true
}, },
"@playwright/test@1.56.1": {
"integrity": "sha512-vSMYtL/zOcFpvJCW71Q/OEGQb7KYBPAdKh35WNSkaZA75JlAO8ED8UN6GUNTm3drWomcbcqRPFqQbLae8yBTdg==",
"dependencies": [
"playwright"
],
"bin": true
},
"@polka/url@1.0.0-next.29": { "@polka/url@1.0.0-next.29": {
"integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==" "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww=="
}, },
@@ -1374,11 +1366,6 @@
"flatted@3.3.3": { "flatted@3.3.3": {
"integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==" "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg=="
}, },
"fsevents@2.3.2": {
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"os": ["darwin"],
"scripts": true
},
"fsevents@2.3.3": { "fsevents@2.3.3": {
"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
"os": ["darwin"], "os": ["darwin"],
@@ -1694,20 +1681,6 @@
"picomatch@4.0.3": { "picomatch@4.0.3": {
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==" "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="
}, },
"playwright-core@1.56.1": {
"integrity": "sha512-hutraynyn31F+Bifme+Ps9Vq59hKuUCz7H1kDOcBs+2oGguKkWTU50bBWrtz34OUWmIwpBTWDxaRPXrIXkgvmQ==",
"bin": true
},
"playwright@1.56.1": {
"integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==",
"dependencies": [
"playwright-core"
],
"optionalDependencies": [
"fsevents@2.3.2"
],
"bin": true
},
"postcss-load-config@3.1.4_postcss@8.5.6": { "postcss-load-config@3.1.4_postcss@8.5.6": {
"integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==", "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
"dependencies": [ "dependencies": [
@@ -1942,7 +1915,7 @@
"@rollup/rollup-win32-ia32-msvc", "@rollup/rollup-win32-ia32-msvc",
"@rollup/rollup-win32-x64-gnu", "@rollup/rollup-win32-x64-gnu",
"@rollup/rollup-win32-x64-msvc", "@rollup/rollup-win32-x64-msvc",
"fsevents@2.3.3" "fsevents"
], ],
"bin": true "bin": true
}, },
@@ -2291,7 +2264,7 @@
"tinyglobby" "tinyglobby"
], ],
"optionalDependencies": [ "optionalDependencies": [
"fsevents@2.3.3" "fsevents"
], ],
"optionalPeers": [ "optionalPeers": [
"sass-embedded" "sass-embedded"
@@ -2335,7 +2308,6 @@
"dependencies": [ "dependencies": [
"npm:@eslint/compat@^1.4.1", "npm:@eslint/compat@^1.4.1",
"npm:@eslint/js@^9.39.2", "npm:@eslint/js@^9.39.2",
"npm:@playwright/test@1.56.1",
"npm:@sveltejs/adapter-auto@^6.1.1", "npm:@sveltejs/adapter-auto@^6.1.1",
"npm:@sveltejs/adapter-static@^3.0.10", "npm:@sveltejs/adapter-static@^3.0.10",
"npm:@sveltejs/kit@^2.49.3", "npm:@sveltejs/kit@^2.49.3",
-39
View File
@@ -1,39 +0,0 @@
import { expect, test } from '@playwright/test';
test('page loads', async ({ page }) => {
await page.goto('/');
await expect(page.getByText('PLG MuDiCS')).toBeVisible();
});
test('page loads without problems', async ({ page }) => {
await page.goto('/');
await expect(page.getByText('PLG MuDiCS')).toBeVisible();
await expect(page.getByTestId('notification')).not.toBeVisible();
});
test('diplay click shows files', async ({ page }) => {
await page.goto('/');
await page.getByTestId('display').click();
await expect(page.getByTestId('inode').first()).toBeVisible();
});
test('show text', async ({ page }) => {
await page.goto('/');
await page.getByTestId('display').click();
const controlButton = page.getByText('Text anzeigen');
await expect(controlButton).toBeVisible();
await controlButton.click();
const textPopup = page.getByTestId('text-popup');
await expect(textPopup).toBeVisible();
const textArea = textPopup.getByRole('textbox');
await expect(textArea).toBeVisible();
await textArea.fill('Hello, world!');
const submitButton = textPopup.locator('button').filter({ hasText: 'Text anzeigen' });
await submitButton.click();
await expect(
page.locator('[data-testid="notification"]:not(:has-text("Fehler 500"))')
).not.toBeVisible();
});
-3
View File
@@ -5,9 +5,6 @@ import (
"io/fs" "io/fs"
) )
//go:generate deno install
//go:generate deno task build
//go:embed all:build //go:embed all:build
var buildDir embed.FS var buildDir embed.FS
+1 -4
View File
@@ -11,14 +11,11 @@
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"lint": "eslint . && prettier --check .", "lint": "eslint . && prettier --check .",
"format": "prettier --write .", "format": "prettier --write ."
"test:e2e": "playwright test",
"test": "deno task test:e2e"
}, },
"devDependencies": { "devDependencies": {
"@eslint/compat": "^1.4.1", "@eslint/compat": "^1.4.1",
"@eslint/js": "^9.39.2", "@eslint/js": "^9.39.2",
"@playwright/test": "1.56.1",
"@sveltejs/adapter-auto": "^6.1.1", "@sveltejs/adapter-auto": "^6.1.1",
"@sveltejs/adapter-static": "^3.0.10", "@sveltejs/adapter-static": "^3.0.10",
"@sveltejs/kit": "^2.49.3", "@sveltejs/kit": "^2.49.3",
-10
View File
@@ -1,10 +0,0 @@
import { defineConfig } from '@playwright/test';
export default defineConfig({
fullyParallel: true,
webServer: {
command: 'deno task build && deno task preview',
port: 4173
},
testDir: 'e2e'
});
@@ -1,6 +1,7 @@
<script lang="ts"> <script lang="ts">
import { get_shifted_color } from '$lib/ts/stores/ui_behavior'; import { get_shifted_color } from '$lib/ts/stores/ui_behavior';
import type { MenuOption } from '$lib/ts/types'; import type { MenuOption } from '$lib/ts/types';
import type { Snippet } from 'svelte';
import { fade } from 'svelte/transition'; import { fade } from 'svelte/transition';
let { let {
@@ -26,7 +27,7 @@
menu_options?: MenuOption[]; menu_options?: MenuOption[];
menu_class?: string; menu_class?: string;
div_class?: string; div_class?: string;
children?: any; children: Snippet;
} = $props(); } = $props();
let menu_shown = $state(false); let menu_shown = $state(false);
@@ -158,14 +159,14 @@
e.stopPropagation(); e.stopPropagation();
}} }}
> >
{#each menu_options as option} {#each menu_options as option, i (i)}
<button <button
disabled={option.disabled ?? false} disabled={option.disabled ?? false}
class="bg-white/15 {option.disabled class="bg-white/15 {option.disabled
? 'text-stone-500 cursor-not-allowed' ? 'text-stone-500 cursor-not-allowed'
: 'hover:bg-white/35 active:bg-white/60 cursor-pointer ' + : 'hover:bg-white/35 active:bg-white/60 cursor-pointer ' +
option.class} rounded-lg p-2 transition-colors duration-200 select-none flex flex-row gap-2 items-center" option.class} rounded-lg p-2 transition-colors duration-200 select-none flex flex-row gap-2 items-center"
onclick={async (e) => { onclick={async () => {
if (option.on_select) await option.on_select(); if (option.on_select) await option.on_select();
close_menu(); close_menu();
}} }}
@@ -3,11 +3,8 @@
import { import {
dnd_flip_duration_ms, dnd_flip_duration_ms,
get_selectable_color_classes, get_selectable_color_classes,
is_display_drag, is_display_drag
is_group_drag
} from '$lib/ts/stores/ui_behavior'; } from '$lib/ts/stores/ui_behavior';
import { cubicOut } from 'svelte/easing';
import { flip } from 'svelte/animate';
import DisplayObject from './DisplayObject.svelte'; import DisplayObject from './DisplayObject.svelte';
import { import {
all_displays_of_group_selected, all_displays_of_group_selected,
@@ -18,10 +15,9 @@
} 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 { Display, DisplayIdGroup, MenuOption } from '$lib/ts/types'; import type { 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'; import { get_uuid } from '$lib/ts/utils';
let { let {
@@ -30,7 +26,7 @@
close_pinned_display close_pinned_display
}: { }: {
display_id_group: DisplayIdGroup; display_id_group: DisplayIdGroup;
get_display_menu_options: (display_id: string) => MenuOption[]; get_display_menu_options: (display_id: string, display_version: string|undefined) => MenuOption[];
close_pinned_display: () => void; close_pinned_display: () => void;
} = $props(); } = $props();
@@ -8,7 +8,7 @@
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, DisplayIdObject, MenuOption } from '$lib/ts/types'; import type { 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 { get_display_by_id, 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';
@@ -20,7 +20,7 @@
close_pinned_display close_pinned_display
}: { }: {
display_id_object: DisplayIdObject; display_id_object: DisplayIdObject;
get_display_menu_options: (display_id: string) => MenuOption[]; get_display_menu_options: (display_id: string, display_version: string|undefined) => MenuOption[];
close_pinned_display: () => void; close_pinned_display: () => void;
} = $props(); } = $props();
@@ -41,7 +41,7 @@
} else { } else {
$pinned_display_id = display_id_object.id; $pinned_display_id = display_id_object.id;
} }
await screenshot_loop(display_id_object.id); screenshot_loop(display_id_object.id);
e.stopPropagation(); e.stopPropagation();
} }
</script> </script>
@@ -136,7 +136,7 @@
click_function={(e) => { click_function={(e) => {
e.stopPropagation(); e.stopPropagation();
}} }}
menu_options={get_display_menu_options(display_id_object.id)} menu_options={get_display_menu_options(display_id_object.id, $display?.version)}
> >
<Menu /> <Menu />
</Button> </Button>
@@ -0,0 +1,176 @@
<script lang="ts">
import { add_upload } from '$lib/ts/file_transfer_handler';
import { selected_online_display_ids } from '$lib/ts/stores/displays';
import { current_file_path } from '$lib/ts/stores/files';
import HighlightedText from './HighlightedText.svelte';
let { className } = $props();
let drop_zone: HTMLDivElement | undefined;
let is_dragging = $state(false);
let is_dragging_over_drop_zone = $state(false);
let is_dragging_multiple_files = $state(false);
let drag_counter = 0;
function contains_files(event: DragEvent): boolean {
return Array.from(event.dataTransfer?.types ?? []).includes('Files');
}
function reset_drag_vars(): void {
drag_counter = 0;
is_dragging = false;
is_dragging_over_drop_zone = false;
is_dragging_multiple_files = false;
}
function is_inside_drop_zone(event: DragEvent): boolean {
if (!drop_zone) return false;
const rect = drop_zone.getBoundingClientRect();
return (
event.clientX >= rect.left &&
event.clientX <= rect.right &&
event.clientY >= rect.top &&
event.clientY <= rect.bottom
);
}
function handle_window_drag_enter(event: DragEvent): void {
if (!contains_files(event)) return;
event.preventDefault();
drag_counter += 1;
is_dragging = true;
is_dragging_multiple_files =
(event.dataTransfer?.items.length ?? 0) > 1;
if (event.dataTransfer) {
event.dataTransfer.dropEffect = 'copy';
}
}
function handle_window_drag_over(event: DragEvent): void {
if (!contains_files(event)) return;
event.preventDefault();
is_dragging = true;
is_dragging_multiple_files =
(event.dataTransfer?.items.length ?? 0) > 1;
is_dragging_over_drop_zone =
$selected_online_display_ids.length > 0 &&
is_inside_drop_zone(event);
if (event.dataTransfer) {
event.dataTransfer.dropEffect = 'copy';
}
}
function handle_window_drag_leave(event: DragEvent): void {
if (!contains_files(event) && !is_dragging) return;
drag_counter = Math.max(0, drag_counter - 1);
if (drag_counter === 0) {
reset_drag_vars();
}
}
function handle_window_drop_capture(event: DragEvent): void {
if (!contains_files(event)) return;
event.preventDefault();
}
function handle_window_drop(event: DragEvent): void {
if (!contains_files(event)) return;
event.preventDefault();
reset_drag_vars();
}
async function handle_drop_zone_drop(
event: DragEvent
): Promise<void> {
if (!contains_files(event)) return;
event.preventDefault();
event.stopPropagation();
const may_import =
$selected_online_display_ids.length > 0 &&
is_inside_drop_zone(event);
const items = Array.from(event.dataTransfer?.items ?? []);
reset_drag_vars();
if (!may_import) return;
const transfer = new DataTransfer();
for (const item of items) {
if (item.kind !== 'file') continue;
const file = item.getAsFile();
const entry = item.webkitGetAsEntry?.();
if (file && (!entry || entry.isFile)) {
transfer.items.add(file);
}
}
if (transfer.files.length === 0) return;
await add_upload(
transfer.files,
$selected_online_display_ids,
$current_file_path
);
}
</script>
<svelte:window
ondragenter={handle_window_drag_enter}
ondragover={handle_window_drag_over}
ondragleave={handle_window_drag_leave}
ondrop={handle_window_drop}
ondropcapture={handle_window_drop_capture}
/>
<div
class="fixed {is_dragging
? 'bg-black/50 opacity-100'
: 'opacity-0'} pointer-events-none p-10 z-1000 inset-0 transition-all duration-100 flex items-center justify-center text-xl text-white font-bold select-none"
>
{$selected_online_display_ids.length === 0
? 'Für das Hochladen von Dateien müssen erreichbare Displays ausgewählt werden!'
: ''}
</div>
<div
bind:this={drop_zone}
aria-hidden="true"
ondrop={handle_drop_zone_drop}
class="{className} absolute p-6 inset-0 flex z-1001 justify-center items-center transition-all duration-200 {$selected_online_display_ids.length >
0 && is_dragging
? 'opacity-100'
: 'opacity-0 pointer-events-none'} {is_dragging_over_drop_zone
? 'bg-stone-500'
: 'bg-stone-700'}"
>
<p class="text-lg pointer-events-none">
Hier {is_dragging_multiple_files ? 'Dateien' : 'Datei'} ablegen, um sie auf {$selected_online_display_ids.length ===
1
? 'dem ausgewählten Display'
: 'den ausgewählten Displays'} in den Pfad <HighlightedText
className="transition-colors duration-200"
bg={is_dragging_over_drop_zone ? 'bg-stone-550' : 'bg-stone-750'}
>{$current_file_path}</HighlightedText
> hochzuladen
</p>
</div>
@@ -1,11 +1,13 @@
<script lang="ts"> <script lang="ts">
import type { Snippet } from "svelte";
let { let {
children, children,
bg = 'bg-stone-750', bg = 'bg-stone-750',
fg = 'text-stone-200', fg = 'text-stone-200',
className = '' className = ''
}: { }: {
children: any; children: Snippet;
bg?: string; bg?: string;
fg?: string; fg?: string;
className?: string; className?: string;
@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { ArrowRight, Ban, FileIcon, Folder, Play } from 'lucide-svelte'; import { ArrowRight, Ban, FileIcon, Folder, Play, TriangleAlert } from 'lucide-svelte';
import { import {
current_height, current_height,
get_selectable_color_classes, get_selectable_color_classes,
@@ -10,68 +10,79 @@
supported_file_type_icon, supported_file_type_icon,
type Inode, type Inode,
get_file_primary_key, get_file_primary_key,
type FileOnDisplay, type FileTransferTask,
type CompleteFileLoadingData is_folder
} from '$lib/ts/types'; } from '$lib/ts/types';
import { import {
is_selected, is_selected,
select, select,
selected_display_ids,
selected_file_ids selected_file_ids
} from '$lib/ts/stores/select'; } from '$lib/ts/stores/select';
import { import {
change_file_path, change_file_path,
current_file_path, current_file_path,
get_date_mapping, get_date_mapping,
get_folder_elements,
get_missing_colliding_display_ids get_missing_colliding_display_ids
} from '$lib/ts/stores/files'; } from '$lib/ts/stores/files';
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 { get_display_by_id, run_on_all_selected_displays } from '$lib/ts/stores/displays'; import {
run_on_all_selected_displays,
selected_online_display_ids
} 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 { add_sync_recursively, file_transfer_tasks } from '$lib/ts/file_transfer_handler';
let { file, not_interactable = false }: { file: Inode; not_interactable?: boolean } = $props(); let { file, not_interactable = false }: { file: Inode; not_interactable?: boolean } = $props();
let file_primary_key = $derived(get_file_primary_key(file));
let missing_colliding_displays_ids: let missing_colliding_displays_ids:
| Observable<{ missing: string[]; colliding: string[] }> | Observable<{ missing: string[]; colliding: string[] }>
| undefined = $state(); | undefined = $state();
$effect(() => { $effect(() => {
const s = $selected_file_ids; const f = file;
missing_colliding_displays_ids = liveQuery(() => get_missing_colliding_display_ids(file, s)); const s = $selected_online_display_ids;
missing_colliding_displays_ids = liveQuery(() => get_missing_colliding_display_ids(f, s));
}); });
let loading_data: let colliding_warning: boolean = $derived(
| Observable<CompleteFileLoadingData> !!$missing_colliding_displays_ids && $missing_colliding_displays_ids.colliding.length !== 0
| undefined = $state(); );
let file_size: Observable<number> | undefined = $state();
$effect(() => { $effect(() => {
const d = $selected_display_ids; const f = file;
loading_data = liveQuery(() => get_loading_data(get_file_primary_key(file), d)); file_size = liveQuery(() => get_size_recursively(f));
}); });
let file_transfer_task_list: FileTransferTask[] | null = $derived(
Object.hasOwn($file_transfer_tasks, file_primary_key)
? $file_transfer_tasks[file_primary_key]
: null
);
let loading_finished = $state(false); let loading_finished = $state(false);
let previous_loading_state = $state(false);
$effect(() => { $effect(() => {
if (!loading_data) return; const ftt = file_transfer_task_list;
let prev: boolean | undefined; if (previous_loading_state && !ftt) {
const sub = loading_data.subscribe((v) => {
if (prev === true && v.is_loading === false) {
loading_finished = true; loading_finished = true;
setTimeout(() => (loading_finished = false), 200); setTimeout(() => (loading_finished = false), 200);
} }
prev = v.is_loading; previous_loading_state = !!ftt;
});
return () => sub.unsubscribe();
}); });
let thumbnail_url = liveQuery(() => get_thumbnail_url(get_file_primary_key(file))); let thumbnail_url = liveQuery(() => get_thumbnail_url(file_primary_key));
let date_mapping: Observable<Record<string, Date>> = liveQuery(() => let date_mapping: Observable<Record<string, Date>> = liveQuery(() =>
get_date_mapping(get_file_primary_key(file)) get_date_mapping(file_primary_key)
); );
const is_folder = file.type === 'inode/directory'; const file_is_folder = $derived(is_folder(file));
function get_created_info(date_mapping: Record<string, Date> | undefined, full_string = false) { function get_created_info(date_mapping: Record<string, Date> | undefined, full_string = false) {
if (!date_mapping) return ''; if (!date_mapping) return '';
@@ -130,7 +141,7 @@
function get_grayed_out_text_color_strings(is_selected: boolean): string { function get_grayed_out_text_color_strings(is_selected: boolean): string {
if (not_interactable) return 'text-stone-400'; if (not_interactable) return 'text-stone-400';
if ($loading_data?.is_loading) return 'text-white/20'; if (file_transfer_task_list) return 'text-white/20';
const color = is_selected ? 'text-stone-600' : 'text-stone-400'; const color = is_selected ? 'text-stone-600' : 'text-stone-400';
const factor = is_selected ? -1 : 1; const factor = is_selected ? -1 : 1;
return `${color} group-hover:${get_shifted_color(color, factor * 100)} group-active:${get_shifted_color(color, factor * 150)}`; return `${color} group-hover:${get_shifted_color(color, factor * 100)} group-active:${get_shifted_color(color, factor * 150)}`;
@@ -138,21 +149,26 @@
function get_grayed_out_border_color_strings(is_selected: boolean): string { function get_grayed_out_border_color_strings(is_selected: boolean): string {
if (not_interactable) return 'border-stone-550'; if (not_interactable) return 'border-stone-550';
if ($loading_data?.is_loading) return 'border-white/10'; if (file_transfer_task_list) return 'border-white/10';
const color = is_selected ? 'border-stone-450' : 'border-stone-550'; const color = is_selected ? 'border-stone-450' : 'border-stone-550';
const factor = is_selected ? 1 : 1; const factor = is_selected ? 1 : 1;
return `${color} group-hover:${get_shifted_color(color, factor * 100)} group-active:${get_shifted_color(color, factor * 150)}`; return `${color} group-hover:${get_shifted_color(color, factor * 100)} group-active:${get_shifted_color(color, factor * 150)}`;
} }
function onclick(e: Event) { function onclick(e: Event) {
if (not_interactable || $loading_data?.is_loading) return; if (not_interactable || file_transfer_task_list) return;
select(selected_file_ids, get_file_primary_key(file), 'toggle'); select(selected_file_ids, file_primary_key, 'toggle');
e.stopPropagation(); e.stopPropagation();
} }
async function open() { async function open() {
if (is_folder) { if (file_is_folder) {
await change_file_path($current_file_path + file.name + '/'); await change_file_path($current_file_path + file.name + '/');
} else if (
!!$missing_colliding_displays_ids &&
$missing_colliding_displays_ids.missing.length !== 0
) {
await add_sync_recursively(get_file_primary_key(file), $selected_online_display_ids, true);
} else { } else {
const path_to_file = $current_file_path + file.name; const path_to_file = $current_file_path + file.name;
await run_on_all_selected_displays((d) => open_file(d.ip, path_to_file)); await run_on_all_selected_displays((d) => open_file(d.ip, path_to_file));
@@ -164,11 +180,11 @@
if (loading_finished) { if (loading_finished) {
out += 'bg-stone-500 text-white/30'; out += 'bg-stone-500 text-white/30';
} else if ($loading_data?.is_loading) { } else if (file_transfer_task_list) {
out += 'bg-stone-700 text-white/30'; out += 'bg-stone-700 text-white/30';
} else { } else {
out += get_selectable_color_classes( out += get_selectable_color_classes(
!not_interactable && is_selected(get_file_primary_key(file), $selected_file_ids), !not_interactable && is_selected(file_primary_key, $selected_file_ids),
{ {
bg: true, bg: true,
hover: !not_interactable, hover: !not_interactable,
@@ -180,7 +196,7 @@
if (not_interactable) { if (not_interactable) {
out += ' rounded-lg'; out += ' rounded-lg';
} else if ($loading_data?.is_loading) { } else if (file_transfer_task_list) {
out += ' rounded-r-lg'; out += ' rounded-r-lg';
} else { } else {
out += ' rounded-r-lg cursor-pointer'; out += ' rounded-r-lg cursor-pointer';
@@ -189,55 +205,46 @@
return out; return out;
} }
async function get_loading_data( function get_total_percentage(ftt_list: FileTransferTask[]): number {
file_primary_key: string,
selected_display_ids: string[]
): Promise<CompleteFileLoadingData> {
const file_on_display_data: FileOnDisplay[] = await db.files_on_display
.where('file_primary_key')
.equals(file_primary_key)
.filter((e) => selected_display_ids.includes(e.display_id))
.toArray();
if (file_on_display_data.length === 0) {
return {
is_loading: true,
total_percentage: 0,
total_seconds_until_finish: -1,
display_data: []
};
}
const display_data = [];
let is_loading = false;
let percentage_sum = 0; let percentage_sum = 0;
let total_seconds_until_finish = 0; for (const ftt of ftt_list) {
for (const fod of file_on_display_data) { percentage_sum += get_percentage(ftt);
if (!!fod.loading_data) { }
if (!is_loading) is_loading = true; return Math.round(percentage_sum / ftt_list.length);
percentage_sum += fod.loading_data.percentage; }
total_seconds_until_finish += fod.loading_data.seconds_until_finish;
const display = await get_display_by_id(fod.display_id);
if (!display) continue; function get_percentage(ftt: FileTransferTask): number {
const display_data_element = { let total_percentage: number;
loading_data: fod.loading_data, if (ftt.data.type === 'upload') {
display_name: display.name total_percentage = ftt.loading_data.percentage;
};
if (fod.loading_data.type === 'sync_download') {
display_data.unshift(display_data_element); // insert sync_download element at beginning
} else { } else {
display_data.push(display_data_element); const percentage_array = ftt.data.destination_display_data.map(
(dd) => dd.loading_data.percentage
);
total_percentage =
(ftt.loading_data.percentage + percentage_array.reduce((total, n) => total + n, 0)) /
(1 + percentage_array.length);
} }
return Math.min(total_percentage, 100);
}
async function get_size_recursively(file: Inode): Promise<number> {
if (is_folder(file)) {
const folder_elements = await get_folder_elements(
file.path + file.name + '/',
$selected_online_display_ids
);
let out: number = 0;
for (const el of folder_elements) {
out += await get_size_recursively(el);
}
return out;
} else { } else {
percentage_sum += 100; return file.size;
} }
} }
let total_percentage = percentage_sum / display_data.length;
return {
is_loading,
total_percentage,
total_seconds_until_finish,
display_data
};
}
</script> </script>
<div <div
@@ -249,28 +256,38 @@
{#if !not_interactable} {#if !not_interactable}
<div class="h-{$current_height.file} aspect-square max-w-15 flex"> <div class="h-{$current_height.file} aspect-square max-w-15 flex">
<Button <Button
disabled={!is_folder && get_file_type(file) === null} disabled={(!file_is_folder && get_file_type(file) === null) || colliding_warning}
title={!is_folder && get_file_type(file) === null ? 'Dateityp nicht unterstützt' : ''} title={!file_is_folder && get_file_type(file) === null
className="flex rounded-l-lg rounded-r-none {is_folder ? 'Dateityp nicht unterstützt'
: colliding_warning
? 'Dateien kollidieren auf verschiedenen Bildschirmen'
: ''}
className="flex rounded-l-lg rounded-r-none {file_is_folder
? 'text-stone-450' ? 'text-stone-450'
: 'text-stone-800'} w-full" : 'text-stone-800'} w-full"
div_class="w-full" div_class="w-full"
bg={get_selectable_color_classes( bg={colliding_warning
!is_folder && get_file_type(file) !== null, ? 'bg-red-400'
: get_selectable_color_classes(
!file_is_folder && get_file_type(file) !== null,
{ {
bg: true bg: true
}, },
-50 -50
)} )}
hover_bg={get_selectable_color_classes( hover_bg={colliding_warning
!is_folder, ? 'bg-red-500'
: get_selectable_color_classes(
!file_is_folder,
{ {
bg: true bg: true
}, },
50 50
)} )}
active_bg={get_selectable_color_classes( active_bg={colliding_warning
!is_folder, ? 'bg-red-500'
: get_selectable_color_classes(
!file_is_folder,
{ {
bg: true bg: true
}, },
@@ -281,14 +298,16 @@
e.stopPropagation(); e.stopPropagation();
}} }}
> >
{#if is_folder} {#if file_is_folder}
<ArrowRight class="size-full" strokeWidth="3" /> <ArrowRight class="size-full" strokeWidth="3" />
{:else if $missing_colliding_displays_ids && $missing_colliding_displays_ids.missing.length !== 0} {:else if get_file_type(file) === null}
<RefreshPlay className="size-full" />
{:else if get_file_type(file) !== null}
<Play class="size-full" strokeWidth="3" />
{:else}
<Ban class="size-full" strokeWidth="3" /> <Ban class="size-full" strokeWidth="3" />
{:else if colliding_warning}
<TriangleAlert class="size-full" strokeWidth="3" />
{:else if !!$missing_colliding_displays_ids && $missing_colliding_displays_ids.missing.length !== 0}
<RefreshPlay className="size-full" />
{:else}
<Play class="size-full" strokeWidth="3" />
{/if} {/if}
</Button> </Button>
</div> </div>
@@ -302,15 +321,15 @@
{onclick} {onclick}
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 !!file_transfer_task_list}
<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-400 bg-stone-600 rounded-r-lg"
style={`width: ${Math.min($loading_data.total_percentage, 100)}%;`} style={`width: ${get_total_percentage(file_transfer_task_list)}%;`}
></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">
{#if is_folder} {#if file_is_folder}
<Folder class="size-full p-2" /> <Folder class="size-full p-2" />
{:else if $thumbnail_url || null} {:else if $thumbnail_url || null}
<img <img
@@ -327,43 +346,16 @@
{/if} {/if}
</div> </div>
<div class="content-center truncate select-none w-full" title={file.name}> <div class="content-center truncate select-none w-full" title={file.name}>
{file.name.includes('.') && !is_folder && get_file_type(file) {file.name.includes('.') && !file_is_folder && get_file_type(file)
? file.name.slice(0, file.name.lastIndexOf('.')) ? file.name.slice(0, file.name.lastIndexOf('.'))
: file.name} : file.name}
</div> </div>
</div> </div>
<div <div
class=" p-1 flex flex-row items-center gap-1 pr-1 z-10 {get_grayed_out_text_color_strings( class=" p-1 flex flex-row items-center gap-1 pr-1 z-10 {get_grayed_out_text_color_strings(
is_selected(get_file_primary_key(file), $selected_file_ids) is_selected(file_primary_key, $selected_file_ids)
)} duration-200 transition-colors" )} duration-200 transition-colors"
> >
<!-- {#if get_display_ids_where_file_is_missing($current_file_path, file, $selected_display_ids, $all_files)[1].length !== 0}
<Button
className="h-8 aspect-square transition-colors duration-200 !p-1.5 text-stone-100"
bg="bg-red-500"
click_function={(e) => {
e.stopPropagation();
}}
>
<TriangleAlert class="size-full" />
</Button>
{:else if get_display_ids_where_file_is_missing($current_file_path, file, $selected_display_ids, $all_files)[0].length !== 0}
<Button
className="h-8 aspect-square transition-colors duration-200 !p-1.5"
bg="bg-transparent"
hover_bg={get_selectable_color_classes(false, {
bg: true
})}
active_bg={get_selectable_color_classes(false, {
bg: true
})}
click_function={(e) => {
e.stopPropagation();
}}
>
<RefreshCcwDot class="size-full" />
</Button>
{/if} -->
<div <div
class="w-14 content-center text-center select-none text-xs whitespace-nowrap" class="w-14 content-center text-center select-none text-xs whitespace-nowrap"
title={get_created_info($date_mapping, true)} title={get_created_info($date_mapping, true)}
@@ -372,25 +364,25 @@
</div> </div>
<div <div
class="h-[70%] border {get_grayed_out_border_color_strings( class="h-[70%] border {get_grayed_out_border_color_strings(
is_selected(get_file_primary_key(file), $selected_file_ids) is_selected(file_primary_key, $selected_file_ids)
)} duration-200 transition-colors my-1" )} duration-200 transition-colors my-1"
></div> ></div>
<div <div
class="w-12 content-center text-center select-none text-xs whitespace-nowrap truncate" class="w-12 content-center text-center select-none text-xs whitespace-nowrap truncate"
title={file.type} title={file.type}
> >
{is_folder ? 'Ordner' : (get_file_type(file)?.display_name ?? '?')} {file_is_folder ? 'Ordner' : (get_file_type(file)?.display_name ?? '?')}
</div> </div>
<div <div
class="h-[70%] border {get_grayed_out_border_color_strings( class="h-[70%] border {get_grayed_out_border_color_strings(
is_selected(get_file_primary_key(file), $selected_file_ids) is_selected(file_primary_key, $selected_file_ids)
)} duration-200 transition-colors" )} duration-200 transition-colors"
></div> ></div>
<div <div
class="w-12 content-center text-center select-none text-xs whitespace-nowrap" class="w-12 content-center text-center select-none text-xs whitespace-nowrap"
title={get_file_size_display_string(file.size, 3)} title={get_file_size_display_string($file_size ?? -1, 3)}
> >
{get_file_size_display_string(file.size)} {get_file_size_display_string($file_size ?? -1)}
</div> </div>
</div> </div>
</div> </div>
@@ -1,6 +1,6 @@
<script lang="ts"> <script lang="ts">
import type { NumberSetting } from '$lib/ts/types'; import type { NumberSetting } from '$lib/ts/types';
import { ChevronDown, ChevronUp, Minus, Plus } from 'lucide-svelte'; import { ChevronDown, ChevronUp } from 'lucide-svelte';
import Button from './Button.svelte'; import Button from './Button.svelte';
let { let {
@@ -18,7 +18,7 @@
} = $props(); } = $props();
function try_to_close() { function try_to_close() {
if (!content.closable || !content.open) return; if (!content.open) return;
close_function(); close_function();
} }
@@ -35,19 +35,13 @@
</script> </script>
{#if content.open} {#if content.open}
<!-- svelte-ignore a11y_no_static_element_interactions -->
<!-- svelte-ignore a11y_click_events_have_key_events -->
<div <div
class="absolute inset-0 backdrop-blur flex justify-center items-center z-50 {className}" class="popup absolute inset-0 backdrop-blur flex justify-center items-center z-50 {className}"
onclick={try_to_close}
transition:fade={{ duration: 100 }} transition:fade={{ duration: 100 }}
> >
<!-- svelte-ignore a11y_no_static_element_interactions -->
<!-- svelte-ignore a11y_click_events_have_key_events -->
<div <div
class="bg-stone-800 rounded-2xl min-w-[30%] max-w-[90%] max-h-[85%] flex flex-col shadow-2xl/60 overflow-hidden {content.window_class ?? class="bg-stone-800 rounded-2xl min-w-[30%] max-w-[90%] max-h-[85%] flex flex-col shadow-2xl/60 overflow-hidden {content.window_class ??
''}" ''}"
onclick={(e) => e.stopPropagation()}
> >
{#if content.title} {#if content.title}
<div class="font-bold bg-stone-700 p-1.5 flex flex-row justify-between gap-8 w-full"> <div class="font-bold bg-stone-700 p-1.5 flex flex-row justify-between gap-8 w-full">
@@ -64,16 +58,16 @@
</div> </div>
</div> </div>
<div class="flex aspect-square shrink-0"> <div class="flex aspect-square shrink-0">
{#if content.closable}
<Button className="aspect-square p-1.5!" click_function={try_to_close}> <Button className="aspect-square p-1.5!" click_function={try_to_close}>
<X /> <X />
</Button> </Button>
{/if}
</div> </div>
</div> </div>
{/if} {/if}
<div class="p-2 min-h-0 overflow-auto flex flex-col gap-2 {snippet_container_class}"> <div class="p-2 min-h-0 overflow-auto flex flex-col gap-2 {snippet_container_class}">
{@render content.snippet(content.snippet_arg)} {#if content.snippet}
{@render content.snippet(content.snippet_arg ?? '')}
{/if}
</div> </div>
</div> </div>
</div> </div>
@@ -30,7 +30,7 @@
enter_function?: (() => void) | null; enter_function?: (() => void) | null;
} = $props(); } = $props();
let focus_bg = get_shifted_color(bg, 100); let focus_bg = $derived(get_shifted_color(bg, 100));
let focused: boolean = $state(false); let focused: boolean = $state(false);
let current_info = $state(''); let current_info = $state('');
let input_element: HTMLInputElement; let input_element: HTMLInputElement;
+77 -33
View File
@@ -1,5 +1,6 @@
import { notifications } from './stores/notification'; import { notifications } from './stores/notification';
import { import {
is_folder,
to_display_status, to_display_status,
type DisplayStatus, type DisplayStatus,
type Inode, type Inode,
@@ -9,6 +10,9 @@ import {
} from './types'; } from './types';
import { dev } from '$app/environment'; import { dev } from '$app/environment';
import { get_sanitized_file_url } from './utils'; import { get_sanitized_file_url } from './utils';
import { online_displays } from './stores/displays';
import { get } from 'svelte/store';
import { update_display_status } from './main';
export async function get_screenshot(ip: string): Promise<Blob | null> { export async function get_screenshot(ip: string): Promise<Blob | null> {
const options = { method: 'PATCH' }; const options = { method: 'PATCH' };
@@ -47,6 +51,17 @@ export async function show_html(ip: string, html: string): Promise<void> {
await request_display(ip, '/showHTML', options); await request_display(ip, '/showHTML', options);
} }
export async function open_website(ip: string, url: string): Promise<void> {
const options = {
method: 'PATCH',
headers: { 'content-type': 'application/json' },
body: JSON.stringify({
url: url
})
};
await request_display(ip, '/openWebsite', options);
}
export async function get_file_data( export async function get_file_data(
ip: string, ip: string,
path: string path: string
@@ -69,9 +84,10 @@ export async function get_file_data(
`; `;
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 null; if (!raw_response.ok || !raw_response.json) return null;
if (!raw_response.ok) return null;
if (handle_shell_error(ip, raw_response, command, true)) return null;
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 (handle_shell_error(ip, json_response, command, true)) return null;
if (json_response.stdout.trim() === '') return null; if (json_response.stdout.trim() === '') return null;
const response: FileInfo[] = json_response.stdout const response: FileInfo[] = json_response.stdout
@@ -92,6 +108,7 @@ export async function get_file_data(
size: Number(response_element.size), size: Number(response_element.size),
thumbnail: null thumbnail: null
}; };
if (is_folder(folder_element)) folder_element.size = 0;
folder_element_list.push({ folder_element, date_created: new Date(response_element.created) }); folder_element_list.push({ folder_element, date_created: new Date(response_element.created) });
} }
return folder_element_list; return folder_element_list;
@@ -100,11 +117,10 @@ export async function get_file_data(
export async function get_file_tree_data(ip: string, path: string): Promise<TreeElement[] | null> { export async function get_file_tree_data(ip: string, path: string): Promise<TreeElement[] | null> {
const command = `cd ".${path}" && tree -Js`; const command = `cd ".${path}" && tree -Js`;
const raw_response = await run_shell_command(ip, command); const raw_response = await run_shell_command(ip, command);
if (!raw_response.ok) return null;
if (handle_shell_error(ip, raw_response, command, true)) return null;
if (!raw_response.ok || !raw_response.json) return null;
const json_response = raw_response.json as ShellCommandResponse; const json_response = raw_response.json as ShellCommandResponse;
if (handle_shell_error(ip, json_response, command, true)) return null;
const tree_element: TreeElement | null = JSON.parse(json_response.stdout.trim())[0] || null; const tree_element: TreeElement | null = JSON.parse(json_response.stdout.trim())[0] || null;
return tree_element?.contents || null; return tree_element?.contents || null;
@@ -114,9 +130,8 @@ export async function create_path(ip: string, path: string): Promise<void> {
const command = `mkdir -p ".${path}"`; const command = `mkdir -p ".${path}"`;
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) return;
const json_response = raw_response.json as ShellCommandResponse; handle_shell_error(ip, raw_response, command, true);
handle_shell_error(ip, json_response, command, true);
} }
export async function rename_file( export async function rename_file(
@@ -128,9 +143,8 @@ export async function rename_file(
const command: string = `cd ".${path}" && mv "${old_file_name}" "${new_file_name}"`; const command: string = `cd ".${path}" && mv "${old_file_name}" "${new_file_name}"`;
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) return;
const json_response = raw_response.json as ShellCommandResponse; handle_shell_error(ip, raw_response, command, true);
handle_shell_error(ip, json_response, command, true);
} }
export async function delete_files( export async function delete_files(
@@ -143,9 +157,8 @@ export async function delete_files(
command += ` && rm -r "${file_name}"`; command += ` && rm -r "${file_name}"`;
} }
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) return;
const json_response = raw_response.json as ShellCommandResponse; handle_shell_error(ip, raw_response, command, true);
handle_shell_error(ip, json_response, command, true);
} }
export async function show_blackscreen(ip: string): Promise<void> { export async function show_blackscreen(ip: string): Promise<void> {
@@ -170,15 +183,21 @@ export async function get_thumbnail_blob(ip: string, path_to_file: string): Prom
return raw_response.blob; return raw_response.blob;
} }
export async function ping_ip(ip: string): Promise<DisplayStatus> { export async function ping_ip(ip: string): Promise<{ status: DisplayStatus; version?: string }> {
const raw_response = await request_control(`/ping?ip=${ip}`, { method: 'GET' }); const raw_response = await request_control(`/ping?ip=${ip}`, { method: 'GET' });
if (!raw_response.ok || !raw_response.json) return null; if (!raw_response.ok || !raw_response.json) return { status: null };
const status = raw_response.json.status; const raw_status = raw_response.json.status;
if (typeof status === 'string') { if (typeof raw_status === 'string') {
return to_display_status(status); const status = to_display_status(raw_status);
const version = raw_response.json.version;
if (typeof version === 'string') {
return { status, version };
} else {
return { status };
} }
return null; }
return { status: null };
} }
async function request_display( async function request_display(
@@ -188,14 +207,30 @@ async function request_display(
supress_error_handling_http_codes: number[] = [] supress_error_handling_http_codes: number[] = []
): Promise<RequestResponse> { ): Promise<RequestResponse> {
const url = `http://${ip}:1323/api${api_route}`; const url = `http://${ip}:1323/api${api_route}`;
return await request(url, options, supress_error_handling_http_codes);
const current_online_displays = get(online_displays);
if (!current_online_displays.map((d) => d.ip).includes(ip)) return { ok: false };
const response = await request(url, options, supress_error_handling_http_codes);
if (!response.ok && response.http_code === 408) {
// Network error -> device possibly not longer online -> test status and throw no error if its offline
const possible_displays = current_online_displays.filter((d) => d.ip === ip);
for (const display of possible_displays) {
const current_status = await update_display_status(display);
if (current_status === 'app_online') {
console.error(`No response from ${url}`);
notifications.push('error', 'Netzwerk-Fehler bei API-Anfrage', `${url}`);
}
}
}
return response;
} }
async function request_control( async function request_control(
api_route: string, api_route: string,
options: { method: string; headers?: Record<string, string>; body?: string } options: { method: string; headers?: Record<string, string>; body?: string }
): Promise<RequestResponse> { ): Promise<RequestResponse> {
const url = `http://127.0.0.1:8080/api${api_route}`; const url = `${dev ? 'http://127.0.0.1:8080' : window.location.origin}/api${api_route}`;
return await request(url, options); return await request(url, options);
} }
@@ -206,9 +241,6 @@ async function request(
): Promise<RequestResponse> { ): Promise<RequestResponse> {
try { try {
const cache_buster = `${url.includes('?') ? '&' : '?'}=${Date.now()}`; const cache_buster = `${url.includes('?') ? '&' : '?'}=${Date.now()}`;
if (dev) {
console.debug('Sending request: ', url + cache_buster, 'with', options.body ?? 'none');
}
const response = await fetch(url + cache_buster, options); const response = await fetch(url + cache_buster, options);
if (response.ok || supress_error_handling_http_codes.includes(response.status)) { if (response.ok || supress_error_handling_http_codes.includes(response.status)) {
const contentType = response.headers.get('content-type') || ''; const contentType = response.headers.get('content-type') || '';
@@ -219,9 +251,6 @@ async function request(
} else { } else {
const json: Record<string, unknown> = await response.json(); const json: Record<string, unknown> = await response.json();
request_response = { ok: response.ok, http_code: response.status, json: json }; request_response = { ok: response.ok, http_code: response.status, json: json };
if (dev) {
console.debug(request_response);
}
} }
return request_response; return request_response;
} }
@@ -245,6 +274,7 @@ async function request(
if (dev) { if (dev) {
console.warn('Request failed - Is the targeted device online?'); console.warn('Request failed - Is the targeted device online?');
} }
return { ok: false, http_code: 408 };
} else { } else {
console.error(url, error); console.error(url, error);
notifications.push('error', `Fataler Fehler bei API-Anfrage`, `${url}\nFehler: ${error}`); notifications.push('error', `Fataler Fehler bei API-Anfrage`, `${url}\nFehler: ${error}`);
@@ -255,11 +285,21 @@ async function request(
function handle_shell_error( function handle_shell_error(
ip: string, ip: string,
shell_response: ShellCommandResponse, response: RequestResponse,
shell_command: string, shell_command: string,
command_includs_cd: boolean command_includs_cd: boolean,
response_type: 'json' | 'blob' = 'json'
): boolean { ): boolean {
if (shell_response.exitCode !== 0) { if (
(response_type === 'json' && !response.json) ||
(response_type === 'blob' && !response.blob)
) {
const error_string = `Did not receive ${response_type}: ${JSON.stringify(response)}`;
console.error(error_string);
notifications.push('error', `Fehler in API-Shell`, `${ip}\n${shell_command}\n${error_string}`);
return true;
} else if (response.json && response.json.exitCode !== 0) {
const shell_response = response.json as ShellCommandResponse;
if ( if (
command_includs_cd && command_includs_cd &&
shell_response.stderr && shell_response.stderr &&
@@ -292,8 +332,12 @@ async function run_shell_command(ip: string, command: string): Promise<RequestRe
return await request_display(ip, '/shellCommand', options); return await request_display(ip, '/shellCommand', options);
} }
export async function shutdown(ip: string): Promise<RequestResponse> { export async function shutdown(ip: string): Promise<boolean> {
return await run_shell_command(ip, 'xfce4-session-logout --halt'); const command = 'xfce4-session-logout --halt';
const raw_response = await run_shell_command(ip, command);
if (!raw_response.ok) return false;
if (handle_shell_error(ip, raw_response, command, true)) return false;
return true;
} }
export async function startup(mac: string): Promise<RequestResponse> { export async function startup(mac: string): Promise<RequestResponse> {
+1 -2
View File
@@ -23,8 +23,7 @@ export class FileDatabase extends Dexie {
[display_id+file_primary_key], [display_id+file_primary_key],
display_id, display_id,
file_primary_key, file_primary_key,
date_created, date_created
loading_data
`, `,
displays: ` displays: `
id, id,
@@ -1,5 +1,6 @@
import { get, writable, type Writable } from 'svelte/store';
import { db } from './database'; import { db } from './database';
import { get_display_by_id } from './stores/displays'; import { get_display_by_id, run_on_all_selected_displays } from './stores/displays';
import { import {
create_path_on_all_selected_displays, create_path_on_all_selected_displays,
get_folder_elements, get_folder_elements,
@@ -11,6 +12,7 @@ import { notifications } from './stores/notification';
import { generate_thumbnail } from './stores/thumbnails'; import { generate_thumbnail } from './stores/thumbnails';
import { import {
get_file_primary_key, get_file_primary_key,
is_folder,
type FileLoadingData, type FileLoadingData,
type FileOnDisplay, type FileOnDisplay,
type FileTransferTask, type FileTransferTask,
@@ -18,9 +20,30 @@ import {
type ShortDisplay type ShortDisplay
} from './types'; } from './types';
import { get_sanitized_file_url, get_uuid, make_valid_name } from './utils'; import { get_sanitized_file_url, get_uuid, make_valid_name } from './utils';
import { open_file } from './api_handler';
const START_LOADING_DATA = {
percentage: 0,
bytes_per_second: 0,
seconds_until_finish: -1
};
export const file_transfer_tasks: Writable<Record<string, FileTransferTask[]>> = writable<
Record<string, FileTransferTask[]>
>({});
let is_processing: boolean = false; let is_processing: boolean = false;
const tasks: FileTransferTask[] = [];
function add_file_transfer_task(file_primary_key: string, new_task: FileTransferTask) {
file_transfer_tasks.update((tasks) => {
if (Object.hasOwn(tasks, file_primary_key)) {
tasks[file_primary_key].push(new_task);
return tasks;
} else {
return { ...tasks, [file_primary_key]: [new_task] };
}
});
}
export async function add_upload( export async function add_upload(
file_list: FileList, file_list: FileList,
@@ -28,7 +51,6 @@ export async function add_upload(
current_file_path: string current_file_path: string
) { ) {
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); 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 (
@@ -47,6 +69,10 @@ export async function add_upload(
thumbnail: null thumbnail: null
}; };
const file_primary_key = get_file_primary_key(db_file); const file_primary_key = get_file_primary_key(db_file);
if (Object.hasOwn(file_transfer_tasks, file_primary_key))
return show_already_in_tasks_error(db_file, 'upload'); // file is already in task
await db.files.put(db_file); await db.files.put(db_file);
const upload_task_promises = selected_display_ids.map(async (display_id) => { const upload_task_promises = selected_display_ids.map(async (display_id) => {
@@ -56,17 +82,11 @@ export async function add_upload(
const db_file_on_display: FileOnDisplay = { const db_file_on_display: FileOnDisplay = {
display_id, display_id,
file_primary_key, file_primary_key,
date_created: new Date(), date_created: new Date()
loading_data: {
type: 'upload',
percentage: 0,
bytes_per_second: 0,
seconds_until_finish: -1
}
}; };
await db.files_on_display.put(db_file_on_display); await db.files_on_display.put(db_file_on_display);
return { const new_task = {
data: { data: {
type: 'upload' as const, type: 'upload' as const,
file file
@@ -77,13 +97,13 @@ export async function add_upload(
}, },
path: current_file_path, path: current_file_path,
file_name: file_name, file_name: file_name,
file_primary_key, loading_data: START_LOADING_DATA,
bytes_total: file.size bytes_total: file.size
}; };
add_file_transfer_task(file_primary_key, new_task);
}); });
const upload_tasks = (await Promise.all(upload_task_promises)).filter((e) => !!e); await Promise.all(upload_task_promises);
tasks.push(...upload_tasks);
} }
await start_task_processing(); await start_task_processing();
@@ -91,7 +111,8 @@ export async function add_upload(
export async function add_sync_recursively( export async function add_sync_recursively(
selected_file_id: string, selected_file_id: string,
selected_display_ids: string[] selected_display_ids: string[],
open_file_afterwards: boolean = false
) { ) {
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,
@@ -99,7 +120,7 @@ export async function add_sync_recursively(
); );
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') { if (is_folder(file_data.file)) {
const new_path = file_data.file.path + file_data.file.name + '/'; const new_path = file_data.file.path + file_data.file.name + '/';
const elements_in_folder = await get_folder_elements(new_path, selected_display_ids); const elements_in_folder = await get_folder_elements(new_path, selected_display_ids);
if (elements_in_folder.length === 0) { if (elements_in_folder.length === 0) {
@@ -113,42 +134,34 @@ export async function add_sync_recursively(
} }
if (file_data.short_displays_without_file.length === 0) return; // file is present on all selected displays if (file_data.short_displays_without_file.length === 0) return; // file is present on all selected displays
if (Object.prototype.hasOwnProperty.call(file_transfer_tasks, selected_file_id))
return show_already_in_tasks_error(file_data.file, 'sync'); // file is already in task
await create_path_on_all_selected_displays(file_data.file.path, selected_display_ids); await create_path_on_all_selected_displays(file_data.file.path, selected_display_ids);
tasks.push({ const new_task: FileTransferTask = {
data: { data: {
type: 'sync', type: 'sync',
destination_displays: file_data.short_displays_without_file destination_display_data: file_data.short_displays_without_file.map((display) => ({
display,
loading_data: START_LOADING_DATA
})),
open_file_afterwards_on_display_ids: open_file_afterwards ? selected_display_ids : []
}, },
display: file_data.short_display_with_file, display: file_data.short_display_with_file,
path: file_data.file.path, path: file_data.file.path,
file_name: file_data.file.name, file_name: file_data.file.name,
file_primary_key: selected_file_id, loading_data: START_LOADING_DATA,
bytes_total: file_data.file.size bytes_total: file_data.file.size
});
await db.files_on_display.update([file_data.short_display_with_file.id, selected_file_id], {
loading_data: {
type: 'sync_download',
percentage: 0,
bytes_per_second: 0,
seconds_until_finish: -1
}
});
const display_ids_without_file = file_data.short_displays_without_file.map((d) => d.id);
const new_file_loading_data: FileLoadingData = {
type: 'sync_upload',
percentage: 0,
bytes_per_second: 0,
seconds_until_finish: -1
}; };
add_file_transfer_task(selected_file_id, new_task);
const display_ids_without_file = file_data.short_displays_without_file.map((d) => d.id);
const new_fods: FileOnDisplay[] = display_ids_without_file.map((display_id) => ({ const new_fods: FileOnDisplay[] = display_ids_without_file.map((display_id) => ({
display_id, display_id,
file_primary_key: selected_file_id, file_primary_key: selected_file_id,
date_created: new Date(), date_created: new Date()
loading_data: new_file_loading_data
})); }));
console.log("TEST", new_fods)
await db.files_on_display.bulkPut(new_fods); await db.files_on_display.bulkPut(new_fods);
await start_task_processing(); await start_task_processing();
@@ -222,15 +235,19 @@ function generate_valid_file_name(original_file_name: string, used_file_names: s
return name; return name;
} }
async function upload(task: FileTransferTask): Promise<void> { async function upload(
file_primary_key: string,
task: FileTransferTask,
list_index: number
): Promise<void> {
const task_data = task.data; const task_data = task.data;
if (task_data.type !== 'upload' || !task_data.file) if (task_data.type !== 'upload' || !task_data.file)
return console.warn('Task cancelled: wrong task type:', task); 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(file_primary_key, list_index, task, task_data.file);
} }
export async function sync(task: FileTransferTask) { export async function sync(file_primary_key: string, task: FileTransferTask, list_index: number) {
if (task.data.type !== 'sync') return console.warn('Task cancelled: wrong task type:', task); if (task.data.type !== 'sync') return console.warn('Task cancelled: wrong task type:', task);
const hasOPFS = const hasOPFS =
@@ -238,7 +255,8 @@ export async function sync(task: FileTransferTask) {
'storage' in navigator && 'storage' in navigator &&
'getDirectory' in navigator.storage; 'getDirectory' in navigator.storage;
if (!hasOPFS) { if (!hasOPFS) {
return show_error( return show_general_error(
file_primary_key,
task, task,
'OPFS (navigator.storage.getDirectory) nicht verfügbar bitte Chromium/Edge/Chrome nutzen.' 'OPFS (navigator.storage.getDirectory) nicht verfügbar bitte Chromium/Edge/Chrome nutzen.'
); );
@@ -251,7 +269,7 @@ export async function sync(task: FileTransferTask) {
const url = `http://${task.display.ip}:1323/api${get_sanitized_file_url(task.path + task.file_name)}`; const url = `http://${task.display.ip}:1323/api${get_sanitized_file_url(task.path + task.file_name)}`;
const fetch_source = await fetch(url, { method: 'GET' }); const fetch_source = await fetch(url, { method: 'GET' });
if (!fetch_source.ok || !fetch_source.body) if (!fetch_source.ok || !fetch_source.body)
return show_error(task, `HTTP ${fetch_source.status}`); return show_general_error(file_primary_key, task, `HTTP ${fetch_source.status}`);
const dir = await navigator.storage.getDirectory(); const dir = await navigator.storage.getDirectory();
const file_handle = await dir.getFileHandle(temp_name, { create: true }); const file_handle = await dir.getFileHandle(temp_name, { create: true });
@@ -264,25 +282,39 @@ export async function sync(task: FileTransferTask) {
if (done) break; if (done) break;
if (!value) continue; if (!value) continue;
await update_current_loading_data('sync_download', task, value.byteLength, start_time); update_current_loading_data(file_primary_key, list_index, value.byteLength, start_time);
await writable.write(value); await writable.write(value);
} }
await writable.close(); await writable.close();
await db.files_on_display.update([task.display.id, task.file_primary_key], { finish_loading_data(file_primary_key, list_index);
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();
for (const current_short_display of task.data.destination_displays) { for (const current_short_display of task.data.destination_display_data) {
await upload_file_via_xhr(task, current_short_display, temp_file); await upload_file_via_xhr(
file_primary_key,
list_index,
task,
temp_file,
current_short_display.display
);
} }
await dir.removeEntry(temp_name); await dir.removeEntry(temp_name);
// open file, if required
if (task.data.open_file_afterwards_on_display_ids.length !== 0) {
const path_to_file = task.path + task.file_name;
await run_on_all_selected_displays(
(d) => open_file(d.ip, path_to_file),
true,
task.data.open_file_afterwards_on_display_ids
);
}
} catch (e) { } catch (e) {
show_error(task, String(e)); show_general_error(file_primary_key, task, String(e));
} }
} }
@@ -291,8 +323,7 @@ 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') if (!file_data || is_folder(file_data.file)) return console.warn('Download cancelled: is folder');
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)}`;
@@ -315,56 +346,76 @@ export async function download_file(selected_file_id: string, selected_display_i
async function start_task_processing() { async function start_task_processing() {
if (!is_processing) { if (!is_processing) {
is_processing = tasks.length !== 0; is_processing = Object.keys(get(file_transfer_tasks)).length !== 0;
await start_task_loop(); await start_task_loop();
} }
} }
async function start_task_loop() { async function start_task_loop() {
while (tasks.length > 0) { while (Object.keys(get(file_transfer_tasks)).length > 0) {
const current_task = tasks[0]; const tasks = get(file_transfer_tasks);
const current_file_id = Object.keys(tasks)[0];
const current_task_list = tasks[current_file_id];
for (const [list_index, current_task] of current_task_list.entries()) {
if (current_task.data.type === 'upload') { if (current_task.data.type === 'upload') {
await upload(current_task); await upload(current_file_id, current_task, list_index);
} else if (current_task.data.type === 'sync') { } else if (current_task.data.type === 'sync') {
await sync(current_task); await sync(current_file_id, current_task, list_index);
}
delete_current_task_if_needed(current_file_id);
} }
tasks.shift(); // Remove current_task from tasks
} }
is_processing = false; is_processing = false;
} }
function delete_current_task_if_needed(current_file_id: string) {
file_transfer_tasks.update((all_tasks) => {
const next = { ...all_tasks };
const current_tasks = next[current_file_id];
if (current_tasks.length !== 1) {
if (current_tasks.find((t) => t.loading_data.percentage !== 100)) {
return next; // not all tasks are finished -> do nothing
}
}
delete next[current_file_id];
return next;
});
}
async function upload_file_via_xhr( async function upload_file_via_xhr(
file_primary_key: string,
list_index: number,
task: FileTransferTask, task: FileTransferTask,
current_short_display: ShortDisplay, current_file: File,
current_file: File destination_short_display: ShortDisplay | null = null
) { ) {
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();
xhr.open( xhr.open(
'POST', 'POST',
`http://${current_short_display.ip}:1323/api${get_sanitized_file_url(task.path + task.file_name)}`, `http://${destination_short_display ? destination_short_display.ip : task.display.ip}:1323/api${get_sanitized_file_url(task.path + task.file_name)}`,
true true
); );
xhr.setRequestHeader('content-type', 'application/octet-stream'); xhr.setRequestHeader('content-type', 'application/octet-stream');
xhr.upload.onprogress = (e) => { xhr.upload.onprogress = (e) => {
const apply = async () => { const apply = async () => {
await update_current_loading_data( update_current_loading_data(
loading_type, file_primary_key,
task, list_index,
e.loaded, e.loaded,
start_time, start_time,
current_short_display.id destination_short_display ? destination_short_display.id : null
); );
}; };
apply(); apply();
}; };
xhr.onerror = async (e: ProgressEvent) => { xhr.onerror = async (e: ProgressEvent) => {
await show_error(task, e); await show_general_error(file_primary_key, task, e);
resolve(); resolve();
}; };
@@ -372,21 +423,22 @@ async function upload_file_via_xhr(
if (xhr.readyState === 4) { if (xhr.readyState === 4) {
if (xhr.status == 200) { if (xhr.status == 200) {
// set loading_data to 100% // set loading_data to 100%
await db.files_on_display.update([current_short_display.id, task.file_primary_key], { finish_loading_data(
date_created: new Date(), file_primary_key,
loading_data: null list_index,
}); destination_short_display ? destination_short_display.id : null
);
// Generate Thumbnail if not done already // Generate Thumbnail if not done already
setTimeout(async () => { setTimeout(async () => {
const inode_element: Inode | undefined = await db.files.get( const inode_element: Inode | undefined = await db.files.get(
JSON.parse(task.file_primary_key) as [string, string, number, string] JSON.parse(file_primary_key) as [string, string, number, string]
); );
if (!!inode_element && inode_element.thumbnail === null) { if (!!inode_element && inode_element.thumbnail === null) {
await generate_thumbnail(task.display.ip, task.path, inode_element); await generate_thumbnail(task.display.ip, task.path, inode_element);
} }
}, 10); }, 10);
} else { } else {
await show_error(task, `HTTP ${xhr.status}`); await show_general_error(file_primary_key, task, `HTTP ${xhr.status}`);
} }
resolve(); resolve();
} }
@@ -396,30 +448,89 @@ async function upload_file_via_xhr(
}); });
} }
async function update_current_loading_data( function finish_loading_data(
type: FileLoadingData['type'], file_primary_key: string,
task: FileTransferTask, list_index: number,
destination_display_id: string | null = null
) {
file_transfer_tasks.update((tasks) => {
const current_loading_data = {
percentage: 100,
bytes_per_second: 0,
seconds_until_finish: 0
};
const new_task_list = tasks[file_primary_key].map((task, index) =>
index === list_index
? get_updated_task(current_loading_data, destination_display_id, task)
: task
);
return {
...tasks,
[file_primary_key]: new_task_list
};
});
}
function update_current_loading_data(
file_primary_key: string,
list_index: number,
current_bytes: number, current_bytes: number,
start_time: Date, start_time: Date,
other_display_id: string | null = null destination_display_id: string | null = null
) { ) {
file_transfer_tasks.update((tasks) => {
const task = tasks[file_primary_key][list_index];
if (!task) return tasks;
const current_percentage = Math.min( const current_percentage = Math.min(
task.bytes_total > 0 ? Math.round((current_bytes / task.bytes_total) * 100) : 1, task.bytes_total > 0 ? Math.round((current_bytes / task.bytes_total) * 100) : 1,
99 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( const current_loading_data: FileLoadingData = {
[other_display_id ? other_display_id : task.display.id, task.file_primary_key],
{
loading_data: {
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
} };
}
const new_task_list = tasks[file_primary_key].map((task, index) =>
index === list_index
? get_updated_task(current_loading_data, destination_display_id, task)
: task
); );
return {
...tasks,
[file_primary_key]: new_task_list
};
});
}
function get_updated_task(
current_loading_data: FileLoadingData,
destination_display_id: string | null,
task: FileTransferTask
): FileTransferTask {
if (destination_display_id && task.data.type === 'sync') {
const updatedDestinations = task.data.destination_display_data.map((dd) =>
dd.display.id === destination_display_id ? { ...dd, loading_data: current_loading_data } : dd
);
return {
...task,
data: {
...task.data,
destination_display_data: updatedDestinations
}
};
} else {
return {
...task,
loading_data: current_loading_data
};
}
} }
function get_prognosed_data( function get_prognosed_data(
@@ -434,7 +545,11 @@ function get_prognosed_data(
return { bytes_per_second, seconds_until_finish }; return { bytes_per_second, seconds_until_finish };
} }
async function show_error(task: FileTransferTask, error: ProgressEvent | string) { async function show_general_error(
file_primary_key: string,
task: FileTransferTask,
error: ProgressEvent | string
) {
const task_data = task.data; const task_data = task.data;
console.error('Error in File-Transfer-Handler:', error, task); console.error('Error in File-Transfer-Handler:', error, task);
notifications.push( notifications.push(
@@ -443,12 +558,20 @@ 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_recusively(task.display.id, task.file_primary_key); await remove_file_from_display_recusively(task.display.id, 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_display_data.map((e) => e.display.id)) {
await remove_file_from_display_recusively(display_id, task.file_primary_key); await remove_file_from_display_recusively(display_id, file_primary_key);
} }
await remove_all_files_without_display(); await remove_all_files_without_display();
} }
} }
function show_already_in_tasks_error(file: Inode, process: 'upload' | 'sync') {
notifications.push(
'error',
`Datei '${file.name}' konnte nicht ${process === 'upload' ? 'hochgeladen' : 'synchronisiert'} werden`,
`Eine Datei kann nicht in mehreren file_transfer_tasks enthalten sein. Bitte erneut versuchen, wenn die aktuellen Aktionen fertiggestellt wurden`
);
}
+22 -14
View File
@@ -1,8 +1,8 @@
import { screenshot_loop } from './stores/displays'; import { screenshot_loop } from './stores/displays';
import { ping_ip } from './api_handler'; import { ping_ip } from './api_handler';
import type { Display } from './types'; import type { Display, DisplayStatus } from './types';
import { update_folder_elements_recursively } from './stores/files';
import { db } from './database'; import { db } from './database';
import { update_changed_directories } from './stores/files';
const update_display_status_interval_seconds = 20; const update_display_status_interval_seconds = 20;
const update_display_loading_status_interval_seconds = 2; const update_display_loading_status_interval_seconds = 2;
@@ -10,8 +10,9 @@ const update_display_loading_status_interval_seconds = 2;
const loading_display_ids: string[] = []; const loading_display_ids: string[] = [];
export async function on_app_start() { export async function on_app_start() {
await db.files.clear(); await db.displays
await db.files_on_display.clear(); .toCollection()
.modify({ status: null, preview: { currently_updating: false, url: null } });
await update_all_display_status(false); await update_all_display_status(false);
await setInterval( await setInterval(
() => update_all_display_status(false), () => update_all_display_status(false),
@@ -36,22 +37,29 @@ async function update_all_display_status(only_loading_displays: boolean) {
} }
} }
export async function update_display_status(display: Display) { export async function update_display_status(display: Display): Promise<DisplayStatus> {
const new_status = await ping_ip(display.ip); const resp = await ping_ip(display.ip);
if (new_status === null && display.status !== null) return; if (resp.version && display.version !== resp.version) {
if (new_status !== display.status) { display.version = resp.version;
await db.displays.put(display); // save
}
if (resp.status === null && display.status !== null) return null;
if (resp.status !== display.status) {
let run_on_display_start = false;
// status change // status change
if (new_status === 'app_offline') { if (resp.status === 'app_offline') {
loading_display_ids.push(display.id); loading_display_ids.push(display.id);
} else { } else {
remove_display_from_loading_displays(display.id); remove_display_from_loading_displays(display.id);
if (new_status === 'app_online') { if (resp.status === 'app_online') {
on_display_start(display); run_on_display_start = true;
} }
} }
display.status = new_status; display.status = resp.status;
await db.displays.put(display); // save await db.displays.put(display); // save
if (run_on_display_start) await on_display_start(display);
} }
return resp.status;
} }
export function remove_display_from_loading_displays(display_id: string) { export function remove_display_from_loading_displays(display_id: string) {
@@ -62,6 +70,6 @@ export function remove_display_from_loading_displays(display_id: string) {
} }
async function on_display_start(display: Display) { async function on_display_start(display: Display) {
await update_folder_elements_recursively(display, '/'); await update_changed_directories(display);
await screenshot_loop(display.id); screenshot_loop(display.id);
} }
+42 -9
View File
@@ -14,6 +14,19 @@ import { db } from '../database';
import { dev } from '$app/environment'; import { dev } from '$app/environment';
import { remove_display_from_loading_displays } from '../main'; import { remove_display_from_loading_displays } from '../main';
import { preview_settings } from './ui_behavior'; import { preview_settings } from './ui_behavior';
import { liveQuery } from 'dexie';
export const online_displays: Writable<Display[]> = writable<Display[]>([]);
export const online_displays_sub = liveQuery(() =>
db.displays.where('status').equals('app_online').toArray()
).subscribe((value) => {
online_displays.set(value);
const current_online_display_ids = value.map((d) => d.id);
selected_online_display_ids.set(get(selected_display_ids).filter((id) => current_online_display_ids.includes(id)));
});
export const selected_online_display_ids: Writable<string[]> = writable<string[]>([]);
export const local_displays: Writable<DisplayIdGroup[]> = writable<DisplayIdGroup[]>([]); export const local_displays: Writable<DisplayIdGroup[]> = writable<DisplayIdGroup[]>([]);
@@ -62,8 +75,15 @@ export async function edit_display_data(
): Promise<Display | null> { ): Promise<Display | null> {
let display = await db.displays.get(display_id); let display = await db.displays.get(display_id);
if (!display) return null; if (!display) return null;
display = { ...display, ip: ip, mac: mac, name: name }; display = {
...display,
ip: ip,
mac: mac,
name,
preview: { currently_updating: false, url: null }
};
await db.displays.put(display); // save await db.displays.put(display); // save
screenshot_loop(display.id);
return display; return display;
} }
@@ -118,8 +138,9 @@ 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) { export function screenshot_loop(display_id: string) {
const settings = get(preview_settings); setTimeout(async () => {
let settings = get(preview_settings);
if (settings.mode === 'never') return; if (settings.mode === 'never') return;
const initial_retry_count = settings.retry_count.now; const initial_retry_count = settings.retry_count.now;
@@ -135,9 +156,14 @@ export async function screenshot_loop(display_id: string) {
let retry_count = initial_retry_count; let retry_count = initial_retry_count;
while (retry_count > 0) { while (retry_count > 0) {
settings = get(preview_settings);
if (settings.mode === 'never') break;
if (settings.mode !== 'always') 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);
settings = get(preview_settings);
if (settings.mode === 'never') break;
if (!new_blob) { if (!new_blob) {
display.preview = { currently_updating: false, url: null }; display.preview = { currently_updating: false, url: null };
await db.displays.update(display.id, { preview: display.preview }); await db.displays.update(display.id, { preview: display.preview });
@@ -159,27 +185,33 @@ export async function screenshot_loop(display_id: string) {
await new Promise((resolve) => setTimeout(resolve, retry_seconds * 1000)); // sleep await new Promise((resolve) => setTimeout(resolve, retry_seconds * 1000)); // sleep
} }
if (settings.mode === 'never') {
await db.displays.update(display.id, { preview: { currently_updating: false, url: null } });
} else {
display.preview.currently_updating = false; display.preview.currently_updating = false;
await db.displays.update(display.id, { preview: display.preview }); await db.displays.update(display.id, { preview: display.preview });
} }
}, 0);
}
export async function run_on_all_selected_displays( export async function run_on_all_selected_displays(
run_function: (display: Display) => void | Promise<void>, run_function: (display: Display) => void | Promise<void>,
update_screenshot_afterwards: boolean = true, update_screenshot_afterwards: boolean = true,
ignore_offline: boolean = true display_ids: string[] | null = null
) { ) {
if (!display_ids) display_ids = get(selected_online_display_ids);
const maybe_displays: (Display | null)[] = await Promise.all( const maybe_displays: (Display | null)[] = await Promise.all(
// fails when only a single promis fails // fails when only a single promis fails
get(selected_display_ids).map(async (id) => await get_display_by_id(id)) display_ids.map(async (id) => await get_display_by_id(id))
); );
const displays: Display[] = maybe_displays.filter((d): d is Display => d !== null); const displays: Display[] = maybe_displays.filter((d): d is Display => d !== null);
Promise.all( await Promise.all(
displays.map(async (display) => { displays.map(async (display) => {
if (!display || (ignore_offline && display.status === 'host_offline')) return; if (!display) return;
await run_function(display); await run_function(display);
if (update_screenshot_afterwards) { if (update_screenshot_afterwards) {
await screenshot_loop(display.id); screenshot_loop(display.id);
} }
}) })
); );
@@ -204,7 +236,7 @@ export async function update_local_displays() {
export async function update_db_displays() { export async function update_db_displays() {
local_displays.update((groups) => groups.filter((g) => g.displays.length !== 0)); local_displays.update((groups) => groups.filter((g) => g.displays.length !== 0));
const filtered_local_display_groups = get(local_displays) const filtered_local_display_groups = get(local_displays);
const db_display_group_ids = (await db.display_groups.toArray()).map((group) => group.id); 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 local_display_group_ids = filtered_local_display_groups.map((group) => group.id);
@@ -242,6 +274,7 @@ export function set_new_display_order(display_id_group_id: string, new_data: Dis
}); });
} }
if (dev) { if (dev) {
setTimeout(add_testing_displays, 0); setTimeout(add_testing_displays, 0);
async function add_testing_displays() { async function add_testing_displays() {
+53 -49
View File
@@ -1,16 +1,18 @@
import { get, writable, type Writable } from 'svelte/store'; import { get, writable, type Writable } from 'svelte/store';
import { import {
get_file_primary_key, get_file_primary_key,
is_folder,
type Display, type Display,
type FileOnDisplay, type FileOnDisplay,
type Inode, type Inode,
type TreeElement type TreeElement
} from '../types'; } from '../types';
import { get_display_by_id } from './displays'; import { get_display_by_id, online_displays, selected_online_display_ids } 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_path, 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';
import { file_transfer_tasks } from '../file_transfer_handler';
export const current_file_path: Writable<string> = writable<string>('/'); export const current_file_path: Writable<string> = writable<string>('/');
@@ -24,17 +26,19 @@ export async function change_file_path(new_path: string) {
deactivate_old_thumbnail_urls(); deactivate_old_thumbnail_urls();
const displays = await db.displays.toArray(); for (const display of get(online_displays)) {
await update_changed_directories(display, new_path);
}
}
for (const display of displays) { export async function update_changed_directories(display: Display, path: string = '/') {
const changed_paths = await get_changed_directory_paths(display, new_path); const changed_paths = await get_changed_directory_paths(display, path);
if (!changed_paths) continue; if (!changed_paths) return;
console.debug('Update file system from', display.name, ':', changed_paths); console.debug('Update file system from', display.name, ':', changed_paths);
for (const path of changed_paths) { for (const path of changed_paths) {
await update_folder_elements_recursively(display, path); await update_folder_elements_recursively(display, path);
} }
} }
}
export async function delete_and_deselect_unique_files_from_display(display_id: string) { export async function delete_and_deselect_unique_files_from_display(display_id: string) {
const files_on_display = await db.files_on_display const files_on_display = await db.files_on_display
@@ -58,7 +62,7 @@ export async function remove_file_from_display_recusively(
const inode_element = await get_file_by_id(found.file_primary_key); const inode_element = await get_file_by_id(found.file_primary_key);
if (!inode_element) return; if (!inode_element) return;
if (inode_element.type === 'inode/directory') { if (is_folder(inode_element)) {
const path_inside_folder = inode_element.path + inode_element.name + `/`; const path_inside_folder = inode_element.path + inode_element.name + `/`;
const primary_file_keys_in_folder = ( const primary_file_keys_in_folder = (
await db.files.where('path').equals(path_inside_folder).toArray() await db.files.where('path').equals(path_inside_folder).toArray()
@@ -92,7 +96,10 @@ export async function update_current_folder_on_selected_displays() {
}); });
const current_path = get(current_file_path); const current_path = get(current_file_path);
for (const display of await db.displays.where('id').anyOf(get(selected_display_ids)).toArray()) { for (const display of await db.displays
.where('id')
.anyOf(get(selected_online_display_ids))
.toArray()) {
await update_folder_elements_recursively(display, current_path); await update_folder_elements_recursively(display, current_path);
} }
} }
@@ -105,13 +112,19 @@ export async function get_missing_colliding_display_ids(
const colliding: string[] = []; const colliding: string[] = [];
const colliding_files = await db.files const colliding_files = await db.files
.where('[path+name]') .where('name')
.equals([file.path, file.name]) .equals(file.name)
.filter((e) => e.size !== file.size || e.type !== file.type) .filter((e) => e.path === file.path && e.size !== file.size)
.toArray(); .toArray();
for (const colliding_file of colliding_files) { for (const colliding_file of colliding_files) {
colliding.push( colliding.push(
...(await get_display_ids_where_file_is_missing(colliding_file, selected_display_ids)) ...(
await db.files_on_display
.where('file_primary_key')
.equals(get_file_primary_key(colliding_file))
.filter((fod) => selected_display_ids.includes(fod.display_id))
.toArray()
).map((fod) => fod.display_id)
); );
} }
@@ -148,7 +161,7 @@ export async function get_displays_where_path_not_exists(
const folders_of_current_path = await db.files const folders_of_current_path = await db.files
.where('name') .where('name')
.equals(last_path_part) .equals(last_path_part)
.filter((inode) => inode.path === path_without_last_part && inode.type === 'inode/directory') .filter((inode) => inode.path === path_without_last_part && is_folder(inode))
.first(); .first();
if (!folders_of_current_path) return []; if (!folders_of_current_path) return [];
const folder_primary_key = get_file_primary_key(folders_of_current_path); const folder_primary_key = get_file_primary_key(folders_of_current_path);
@@ -224,16 +237,27 @@ async function get_recursive_changed_directory_paths(
return has_changed; return has_changed;
} }
export async function update_folder_elements_recursively( async function update_folder_elements_recursively(
display: Display, display: Display,
file_path: string = '/' file_path: string = '/'
): Promise<void> { ): Promise<void> {
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 loading_file_ids = Object.keys(get(file_transfer_tasks));
const loading_file_keys_without_size = (
await db.files.bulkGet(
loading_file_ids.map((string_id) => JSON.parse(string_id) as [string, string, number, string])
)
)
.filter((f) => !!f)
.map((f) => JSON.stringify([f.path, f.name, f.type]));
// Filter new files, which aren't currently uploading
const existing_files_on_display_in_path: FileOnDisplay[] = await db.files_on_display const existing_files_on_display_in_path: FileOnDisplay[] = await db.files_on_display
.where('display_id') .where('display_id')
.equals(display.id) .equals(display.id)
.filter((f) => !loading_file_ids.includes(f.file_primary_key))
.toArray(); .toArray();
const existing_file_keys_on_display_in_path: [string, string, number, string][] = const existing_file_keys_on_display_in_path: [string, string, number, string][] =
existing_files_on_display_in_path.map( existing_files_on_display_in_path.map(
@@ -245,17 +269,14 @@ export async function update_folder_elements_recursively(
.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 }[] = const diff = get_folder_elements_difference(existing_files, new_folder_elements);
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( // Filter new files, which aren't currently uploading -> don't compare size
existing_files_with_loading_state, diff.new = diff.new.filter(
new_folder_elements (e) =>
!loading_file_keys_without_size.includes(
JSON.stringify([e.folder_element.path, e.folder_element.name, e.folder_element.type])
)
); );
if (diff.new.length > 0) { if (diff.new.length > 0) {
@@ -265,12 +286,11 @@ export async function update_folder_elements_recursively(
const file_on_display: FileOnDisplay = { const file_on_display: FileOnDisplay = {
display_id: display.id, display_id: display.id,
file_primary_key: get_file_primary_key(new_element.folder_element), file_primary_key: get_file_primary_key(new_element.folder_element),
loading_data: null,
date_created: new_element.date_created date_created: new_element.date_created
}; };
await db.files_on_display.put(file_on_display); await db.files_on_display.put(file_on_display);
if (new_element.folder_element.type === 'inode/directory') { if (is_folder(new_element.folder_element)) {
await update_folder_elements_recursively( await update_folder_elements_recursively(
display, display,
file_path + new_element.folder_element.name + '/' file_path + new_element.folder_element.name + '/'
@@ -295,15 +315,13 @@ export async function update_folder_elements_recursively(
} }
function get_folder_elements_difference( function get_folder_elements_difference(
old_elements: { folder_element: Inode; is_loading: boolean }[], old_elements: Inode[],
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.folder_element))); const old_keys = new Set(old_elements.map((e) => get_file_primary_key(e)));
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 const only_in_old = old_elements.filter((e) => !new_keys.has(get_file_primary_key(e)));
.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))
); );
@@ -328,8 +346,8 @@ export async function get_folder_elements(
function sort_files(files: Inode[]) { function sort_files(files: Inode[]) {
files.sort((a, b) => { files.sort((a, b) => {
const isDirA = a.type === 'inode/directory'; const isDirA = is_folder(a);
const isDirB = b.type === 'inode/directory'; const isDirB = is_folder(b);
// Ordner zuerst // Ordner zuerst
if (isDirA && !isDirB) return -1; if (isDirA && !isDirB) return -1;
@@ -364,7 +382,7 @@ export async function get_file_by_id(
export async function run_for_selected_files_on_selected_displays( export async function run_for_selected_files_on_selected_displays(
action: (ip: string, file_names: string[]) => Promise<void> action: (ip: string, file_names: string[]) => Promise<void>
): Promise<void> { ): Promise<void> {
for (const display_id of get(selected_display_ids)) { for (const display_id of get(selected_online_display_ids)) {
const file_key_strings_on_display: string[] = ( const file_key_strings_on_display: string[] = (
await db.files_on_display.where('display_id').equals(display_id).toArray() await db.files_on_display.where('display_id').equals(display_id).toArray()
).map((e) => e.file_primary_key); ).map((e) => e.file_primary_key);
@@ -388,15 +406,6 @@ export async function run_for_selected_files_on_selected_displays(
} }
} }
export async function create_folder_on_all_selected_displays(
folder_name: string,
path: string,
selected_display_ids: string[]
): Promise<void> {
const path_with_folder_name = (path += folder_name + '/');
await create_path_on_all_selected_displays(path_with_folder_name, selected_display_ids);
}
export async function create_path_on_all_selected_displays( export async function create_path_on_all_selected_displays(
path: string, path: string,
selected_display_ids: string[] selected_display_ids: string[]
@@ -411,12 +420,7 @@ export async function create_path_on_all_selected_displays(
} }
setTimeout(async () => { setTimeout(async () => {
for (const display of displays_without_path) { for (const display of displays_without_path) {
const changed_paths = await get_changed_directory_paths(display, '/'); await update_changed_directories(display);
if (!changed_paths) continue;
console.debug('Update file system from', display.name, ':', changed_paths);
for (const path of changed_paths) {
await update_folder_elements_recursively(display, path);
}
} }
}, 0); }, 0);
} }
+7 -1
View File
@@ -1,4 +1,5 @@
import { writable, type Writable } from 'svelte/store'; import { get, writable, type Writable } from 'svelte/store';
import { online_displays, selected_online_display_ids } from './displays';
export const selected_file_ids: Writable<string[]> = writable<string[]>([]); // JSON.stringify([string, string, number, string]) export const selected_file_ids: Writable<string[]> = writable<string[]>([]); // JSON.stringify([string, string, number, string])
export const selected_display_ids: Writable<string[]> = writable<string[]>([]); export const selected_display_ids: Writable<string[]> = writable<string[]>([]);
@@ -19,6 +20,11 @@ export function select(
} }
return all_ids; return all_ids;
}); });
if (selected_ids === selected_display_ids) {
const current_online_display_ids = get(online_displays).map((d) => d.id);
selected_online_display_ids.set(get(selected_display_ids).filter((id) => current_online_display_ids.includes(id)));
}
} }
export function is_selected(id: string, selected_ids: string[]): boolean { export function is_selected(id: string, selected_ids: string[]): boolean {
@@ -1,5 +1,6 @@
import { writable, type Writable } from 'svelte/store'; import { writable, type Writable } from 'svelte/store';
import type { NumberSetting } from '../types'; import type { NumberSetting } from '../types';
import { dev } from '$app/environment';
export const dnd_flip_duration_ms = 300; export const dnd_flip_duration_ms = 300;
@@ -33,7 +34,7 @@ export const preview_settings: Writable<{
retry_seconds: NumberSetting; retry_seconds: NumberSetting;
retry_count: NumberSetting; retry_count: NumberSetting;
}>({ }>({
mode: 'normal', mode: dev ? 'never' : 'normal',
retry_seconds: { retry_seconds: {
max: 10, max: 10,
min: 0.5, min: 0.5,
+23 -24
View File
@@ -33,7 +33,7 @@ export type FileTransferTask = {
display: ShortDisplay; display: ShortDisplay;
path: string; path: string;
file_name: string; file_name: string;
file_primary_key: string; loading_data: FileLoadingData;
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)
}; };
@@ -44,7 +44,17 @@ export type FileTransferTaskData =
} }
| { | {
type: 'sync'; type: 'sync';
destination_displays: ShortDisplay[]; destination_display_data: {
display: ShortDisplay;
loading_data: FileLoadingData;
}[];
open_file_afterwards_on_display_ids: string[];
};
export type FileLoadingData = {
percentage: number;
bytes_per_second: number;
seconds_until_finish: number;
}; };
export type ShortDisplay = { export type ShortDisplay = {
@@ -56,21 +66,6 @@ export type FileOnDisplay = {
display_id: string; display_id: string;
file_primary_key: string; // JSON.stringify([string, string, number, string]) file_primary_key: string; // JSON.stringify([string, string, number, string])
date_created: Date; date_created: Date;
loading_data: FileLoadingData | null; // null if not loading
};
export type FileLoadingData = {
type: 'upload' | 'download' | 'sync_download' | 'sync_upload';
percentage: number;
bytes_per_second: 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 = {
@@ -101,6 +96,7 @@ export type Display = {
group_id: string; group_id: string;
name: string; name: string;
status: DisplayStatus; status: DisplayStatus;
version?: string;
}; };
export type DisplayGroup = { export type DisplayGroup = {
@@ -132,21 +128,20 @@ export type MenuOption = {
export type PopupContent = { export type PopupContent = {
open: boolean; open: boolean;
snippet: Snippet<[string]> | null; snippet: Snippet<[string]> | Snippet<[]> | null;
snippet_arg?: string; snippet_arg?: string;
title?: string; title?: string;
title_class?: string; title_class?: string;
title_icon?: typeof X | null; title_icon?: typeof X | null;
window_class?: string; window_class?: string;
closable?: boolean;
}; };
export type NumberSetting = { export type NumberSetting = {
max: number, max: number;
min: number, min: number;
now: number, now: number;
step: number step: number;
} };
export type DisplayStatus = 'host_offline' | 'app_offline' | 'app_online' | null; export type DisplayStatus = 'host_offline' | 'app_offline' | 'app_online' | null;
@@ -155,3 +150,7 @@ export function to_display_status(value: string): DisplayStatus {
? (value as DisplayStatus) ? (value as DisplayStatus)
: null; : null;
} }
export function is_folder(inode: Inode) {
return inode.type === 'inode/directory';
}
+11 -2
View File
@@ -55,7 +55,7 @@ export function get_uuid(): string {
export function get_file_size_display_string(size: number, toFixed: number | null = null): string { export function get_file_size_display_string(size: number, toFixed: number | null = null): string {
if (size < 0) if (size < 0)
return toFixed === null ? 'versch.' : 'Verschiedene Größen auf verschiedenen Bildschirmen'; return toFixed === null ? '...' : 'Größe wird aktuell berechnet';
if (size === 0) return '0 B'; if (size === 0) return '0 B';
const k = 1024; const k = 1024;
@@ -100,7 +100,7 @@ export function display_status_to_info(status: DisplayStatus): string {
return 'Lädt'; return 'Lädt';
case 'host_offline': case 'host_offline':
return 'Offline'; return 'Offline';
case null: default:
return '???'; return '???';
} }
} }
@@ -113,3 +113,12 @@ export function get_sanitized_file_url(file_path: string, is_preview = false) {
return `/file/${is_preview ? 'preview/' : ''}${[...pathSegments].join('/')}`; return `/file/${is_preview ? 'preview/' : ''}${[...pathSegments].join('/')}`;
} }
let keyboard_queue = Promise.resolve();
export function add_to_keyboard_queue(task: () => Promise<void>) {
keyboard_queue = keyboard_queue.then(task).catch((err) => {
console.error('Error in input queue:', err);
});
}
@@ -15,6 +15,7 @@
</svelte:head> </svelte:head>
{#if !dev} {#if !dev}
<!-- eslint-disable-next-line svelte/no-at-html-tags -->
{@html versionSplashScreen} {@html versionSplashScreen}
{/if} {/if}
+41 -30
View File
@@ -7,10 +7,8 @@
Trash2, Trash2,
Menu, Menu,
ChevronDown, ChevronDown,
icons,
SquareCheckBig, SquareCheckBig,
Square, Square,
X,
Info Info
} from 'lucide-svelte'; } from 'lucide-svelte';
import Button from '$lib/components/Button.svelte'; import Button from '$lib/components/Button.svelte';
@@ -25,7 +23,8 @@
edit_display_data, edit_display_data,
get_display_by_id, get_display_by_id,
is_display_name_taken, is_display_name_taken,
remove_display remove_display,
screenshot_loop
} from '$lib/ts/stores/displays'; } from '$lib/ts/stores/displays';
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';
@@ -35,6 +34,8 @@
import HighlightedText from '$lib/components/HighlightedText.svelte'; import HighlightedText from '$lib/components/HighlightedText.svelte';
import { preview_settings } from '$lib/ts/stores/ui_behavior'; import { preview_settings } from '$lib/ts/stores/ui_behavior';
import NumberSettingInput from '$lib/components/NumberSettingInput.svelte'; import NumberSettingInput from '$lib/components/NumberSettingInput.svelte';
import { db } from '$lib/ts/database';
import version from './../../../../shared/version.txt?raw';
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))$/;
@@ -44,8 +45,7 @@
open: false, open: false,
snippet: null, snippet: null,
title: '', title: '',
title_class: '!text-xl', title_class: '!text-xl'
closable: true
}); });
let remove_display_name = $state(''); let remove_display_name = $state('');
@@ -71,13 +71,13 @@
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; let display: Display | null = null;
if (!!existing_display_id) { if (existing_display_id) {
display = 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 resp = await ping_ip(text_inputs_valid.ip.value);
display = await add_display(ip, mac, name, status); display = await add_display(ip, mac, name, resp.status);
} }
if (!!display) { if (display) {
await update_display_status(display); await update_display_status(display);
} }
} }
@@ -93,6 +93,20 @@
} }
} }
async function change_preview_mode(mode: 'never' | 'normal' | 'always') {
$preview_settings.mode = mode;
if (mode === 'never') {
await db.displays
.toCollection()
.modify({ preview: { currently_updating: false, url: null } });
} else {
const display_ids = (await db.displays.toArray()).map((d) => d.id);
for (const display_id of display_ids) {
screenshot_loop(display_id);
}
}
}
function popup_close_function() { function popup_close_function() {
popup_content.open = false; popup_content.open = false;
} }
@@ -102,11 +116,10 @@
popup_content = { popup_content = {
open: true, open: true,
snippet: display_popup, snippet: display_popup,
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', window_class: 'w-3xl'
closable: true
}; };
}; };
@@ -117,8 +130,7 @@
title: 'Einstellungen', title: 'Einstellungen',
title_icon: Settings, title_icon: Settings,
title_class: '!text-xl', title_class: '!text-xl',
window_class: 'w-3xl', window_class: 'w-3xl'
closable: true
}; };
}; };
@@ -130,8 +142,7 @@
snippet_arg: display_id, snippet_arg: display_id,
title: 'Bildschirm wirklich löschen?', title: 'Bildschirm wirklich löschen?',
title_class: 'text-red-400 !text-xl', title_class: 'text-red-400 !text-xl',
title_icon: Trash2, title_icon: Trash2
closable: true
}; };
}; };
@@ -149,8 +160,7 @@
snippet_arg: display_id, snippet_arg: display_id,
title: 'Bildschirm bearbeiten', title: 'Bildschirm bearbeiten',
title_icon: Monitor, title_icon: Monitor,
title_class: '!text-xl', title_class: '!text-xl'
closable: true
}; };
}; };
@@ -162,18 +172,21 @@
snippet: about_popup, snippet: about_popup,
title: 'Über PLG MuDiCS', title: 'Über PLG MuDiCS',
title_icon: Info, title_icon: Info,
title_class: '!text-xl', title_class: '!text-xl'
closable: true
}; };
}; };
</script> </script>
<!-- eslint-disable-next-line @typescript-eslint/no-unused-vars -->
{#snippet about_popup(_: string)} {#snippet about_popup(_: string)}
<div class="px-2"> <div class="px-2">
<p>
{version}
</p>
<h3 class="text-lg font-bold mt-4">Entwickler</h3> <h3 class="text-lg font-bold mt-4">Entwickler</h3>
<p> <p>
<a target="_blank" class="link" href="https://github.com/programmer-44">E44</a> <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>, <a target="_blank" class="link" href="https://codeberg.org/2mal3">2mal3</a>
</p> </p>
<h3 class="text-lg font-bold mt-4">Lizenz</h3> <h3 class="text-lg font-bold mt-4">Lizenz</h3>
@@ -239,7 +252,7 @@
title="Anzeigename" title="Anzeigename"
placeholder="z.B. Beamer vorne links" placeholder="z.B. Beamer vorne links"
is_valid_function={async (input: string) => { is_valid_function={async (input: string) => {
if (!!existing_display_id) { if (existing_display_id) {
if (input === (await get_display_by_id(existing_display_id))?.name) if (input === (await get_display_by_id(existing_display_id))?.name)
return [true, 'Gültiger Name']; return [true, 'Gültiger Name'];
} }
@@ -269,11 +282,11 @@
className="px-4 gap-2" className="px-4 gap-2"
bg="bg-stone-750" bg="bg-stone-750"
click_function={async () => { click_function={async () => {
const status = await ping_ip(text_inputs_valid.ip.value); const resp = await ping_ip(text_inputs_valid.ip.value);
notifications.push( notifications.push(
'info', 'info',
`Ping '${text_inputs_valid.ip.value}'`, `Ping '${text_inputs_valid.ip.value}'`,
`Aktueller Zustand: ${display_status_to_info(status)}` `Aktueller Zustand: ${display_status_to_info(resp.status)}`
); );
}}><Radio /> Ping</Button }}><Radio /> Ping</Button
> >
@@ -303,7 +316,7 @@
{/if} {/if}
<Button <Button
disabled={!all_text_inputs_valid()} disabled={!all_text_inputs_valid()}
className="{!!existing_display_id ? 'px-4' : 'pl-3 pr-4 gap-2'} font-bold" className="{existing_display_id ? 'px-4' : 'pl-3 pr-4 gap-2'} font-bold"
bg="bg-stone-650" bg="bg-stone-650"
click_function={async () => { click_function={async () => {
await finalize_add_edit_display(existing_display_id); await finalize_add_edit_display(existing_display_id);
@@ -332,9 +345,7 @@
menu_options={(['never', 'normal', 'always'] as const).map((mode) => ({ menu_options={(['never', 'normal', 'always'] as const).map((mode) => ({
icon: mode === $preview_settings.mode ? SquareCheckBig : Square, icon: mode === $preview_settings.mode ? SquareCheckBig : Square,
name: get_display_preview_mode(mode), name: get_display_preview_mode(mode),
on_select: () => { on_select: async () => await change_preview_mode(mode)
$preview_settings.mode = mode;
}
}))}>{get_display_preview_mode($preview_settings.mode)} <ChevronDown /></Button }))}>{get_display_preview_mode($preview_settings.mode)} <ChevronDown /></Button
> >
</div> </div>
@@ -374,7 +385,7 @@
menu_options={[ menu_options={[
{ {
icon: Plus, icon: Plus,
name: 'Neuen Bildschirm hinzufügen', name: 'Neuen Bildschirm Hinzufügen',
on_select: show_new_display_popup on_select: show_new_display_popup
}, },
{ {
+145 -75
View File
@@ -21,14 +21,20 @@
show_blackscreen, show_blackscreen,
shutdown, shutdown,
startup, startup,
show_html open_website
} from '$lib/ts/api_handler'; } 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,
selected_online_display_ids
} 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 { liveQuery, type Observable } from 'dexie';
import TextInput from '$lib/components/TextInput.svelte'; import TextInput from '$lib/components/TextInput.svelte';
import { add_to_keyboard_queue } from '$lib/ts/utils';
import { onMount } from 'svelte';
let all_display_states: Observable<'on' | 'off' | 'mixed'> | undefined = $state(); let all_display_states: Observable<'on' | 'off' | 'mixed'> | undefined = $state();
$effect(() => { $effect(() => {
@@ -39,8 +45,14 @@
let popup_content: PopupContent = $state({ let popup_content: PopupContent = $state({
open: false, open: false,
snippet: null, snippet: null,
title: '', title: ''
closable: true });
let current_text = $state('');
const key_pressed = $state({
ArrowRight: false,
ArrowLeft: false
}); });
function popup_close_function() { function popup_close_function() {
@@ -51,9 +63,9 @@
popup_content = { popup_content = {
open: true, open: true,
snippet: send_keys_popup, snippet: send_keys_popup,
title: 'Tastatur-Eingaben durchgeben', title: 'Tastatur-Eingaben Senden',
title_icon: Keyboard, title_icon: Keyboard,
closable: true window_class: 'h-full'
}; };
}; };
@@ -61,9 +73,8 @@
popup_content = { popup_content = {
open: true, open: true,
snippet: text_popup, snippet: text_popup,
title: 'Text anzeigen', title: 'Text Anzeigen',
title_icon: TextAlignStart, title_icon: TextAlignStart,
closable: true,
window_class: 'size-full' window_class: 'size-full'
}; };
}; };
@@ -72,10 +83,9 @@
popup_content = { popup_content = {
open: true, open: true,
snippet: website_popup, snippet: website_popup,
title: 'Webseite anzeigen', title: 'Webseite Anzeigen',
window_class: 'w-xl', window_class: 'w-xl',
title_icon: Globe, title_icon: Globe
closable: true
}; };
}; };
@@ -93,21 +103,24 @@
} }
} }
async function ask_shutdonw() { async function ask_shutdown() {
popup_content = { popup_content = {
open: true, open: true,
snippet: ask_shutdonw_popup, snippet: ask_shutdown_popup,
title: 'PC Herunterfahren', title: 'Bildschirm Herunterfahren',
title_icon: PowerOff, title_icon: PowerOff
closable: true
}; };
} }
async function shutdown_action() { async function shutdown_action() {
popup_content.open = false; popup_content.open = false;
await run_on_all_selected_displays((d) => { await run_on_all_selected_displays(async (d) => {
shutdown(d.ip); // no await here because we want to be fast if (await shutdown(d.ip)) {
db.displays.update(d.id, { status: 'app_offline' }); db.displays.update(d.id, {
status: 'app_offline',
preview: { currently_updating: false, url: null }
});
}
}, false); }, false);
} }
@@ -119,28 +132,19 @@
db.displays.update(d.id, { status: 'app_offline' }); db.displays.update(d.id, { status: 'app_offline' });
}, },
false, false,
false $selected_display_ids
); );
} }
async function send_single_key_press(key: string) { async function send_single_key_press(key: string, action: 'press' | 'release') {
await run_on_all_selected_displays((d) => await run_on_all_selected_displays((d) => send_keyboard_input(d.ip, [{ key, action }]));
send_keyboard_input(d.ip, [{ key, action: 'press' }])
);
setTimeout(
async () =>
await run_on_all_selected_displays((d) =>
send_keyboard_input(d.ip, [{ key, action: 'release' }])
),
10
);
} }
let website_url = $state(''); let website_url = $state('');
let website_url_valid = $state(false); let website_url_valid = $state(false);
function validate_website_url(url: string): [boolean, string] { function validate_website_url(url: string): [boolean, string] {
if (url === '') return [true, '']; if (url === '') return [true, ''];
const regex = /^https?:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/; const regex = /^https?:\/\/[\w-]+(\.[\w-]+)+([\w\-._~:/?#[\]@!$&'()*+,;=.])*/;
if (regex.test(url)) { if (regex.test(url)) {
return [true, '']; return [true, ''];
} }
@@ -149,17 +153,64 @@
async function send_website() { async function send_website() {
popup_content.open = false; popup_content.open = false;
await run_on_all_selected_displays((d) => await run_on_all_selected_displays((d) => open_website(d.ip, website_url));
show_html(d.ip, `<iframe src="${website_url}"></iframe>`)
);
website_url = '';
} }
function has_open_popup(): boolean {
return document.querySelector('.popup') !== null;
}
function handle_key(
event: KeyboardEvent,
key: 'ArrowRight' | 'ArrowLeft',
action: 'press' | 'release'
) {
if (event.key === key) {
const current_press_state: boolean = key_pressed[key];
if (
(action === 'press' && (current_press_state === true || has_open_popup())) ||
(action === 'release' && current_press_state === false)
)
return;
key_pressed[key] = !current_press_state;
add_to_keyboard_queue(async () => {
await run_on_all_selected_displays(
(d) => send_keyboard_input(d.ip, [{ key, action }]),
true
);
});
}
}
function add_remove_event_listeners(
add_remove_function: (type: string, listener: (e: KeyboardEvent) => void) => void
) {
const actions = {
keydown: 'press',
keyup: 'release'
} as const;
const keys = ['ArrowRight', 'ArrowLeft'] as const;
for (const [action_type, action_value] of Object.entries(actions)) {
for (const key of keys) {
add_remove_function(action_type, (e: KeyboardEvent) => handle_key(e, key, action_value));
}
}
}
onMount(() => {
add_remove_event_listeners(window.addEventListener);
return () => {
add_remove_event_listeners(window.removeEventListener);
};
});
</script> </script>
{#snippet website_popup()} {#snippet website_popup()}
<div class="flex flex-col gap-2"> <div class="flex flex-col gap-2">
<TextInput <TextInput
title="URL" title="URL (mit http:// oder https://)"
placeholder="https://example.com" placeholder="https://example.com"
bind:current_value={website_url} bind:current_value={website_url}
bind:current_valid={website_url_valid} bind:current_valid={website_url_valid}
@@ -180,7 +231,7 @@
</div> </div>
{/snippet} {/snippet}
{#snippet ask_shutdonw_popup()} {#snippet ask_shutdown_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">
@@ -192,61 +243,80 @@
{/snippet} {/snippet}
{#snippet send_keys_popup()} {#snippet send_keys_popup()}
<div class="overflow-hidden flex flex-col gap-2"> <KeyInput {popup_close_function} />
<div>
<KeyInput />
</div>
<div class="flex flex-row justify-end gap-2">
<Button className="px-4 font-bold" click_function={popup_close_function}>Fertig</Button>
</div>
</div>
{/snippet} {/snippet}
{#snippet text_popup()} {#snippet text_popup()}
<TipTapInput /> <TipTapInput bind:text={current_text} />
{/snippet} {/snippet}
<div class="grid grid-rows-[2.5rem_auto] bg-stone-800 rounded-2xl min-w-0"> <div class="grid grid-rows-[2.5rem_auto] bg-stone-800 rounded-2xl min-w-0">
<div class="text-xl font-bold pl-3 content-center bg-stone-700 rounded-t-2xl truncate min-w-0"> <div class="text-xl font-bold pl-3 content-center bg-stone-700 rounded-t-2xl truncate min-w-0">
Bildschirme steuern Bildschirme Steuern
</div> </div>
<div class="relative flex flex-col gap-2 p-2 overflow-auto"> <div class="relative flex flex-col gap-2 p-2 overflow-auto">
<div class="flex flex-row justify-between gap-2"> <div class="flex flex-row justify-between gap-2">
<div class="flex flex-col gap-2"> <div class="flex flex-col gap-2">
<div class="flex flex-row gap-2 w-75 justify-normal"> <div class="flex flex-row gap-2 w-75 justify-normal">
<Button <button
title="Vorherige Folie (Pfeil nach Links)" title="Vorherige Folie (Pfeil nach Links) [gedrückt halten möglich]"
className="px-9" class="px-9 {key_pressed.ArrowLeft
disabled={$selected_display_ids.length === 0} ? 'bg-stone-500'
click_function={async () => { : 'bg-stone-700'} {$selected_online_display_ids.length === 0
await send_single_key_press('VK_LEFT'); ? 'text-stone-500 cursor-not-allowed'
}}><ArrowBigLeft /></Button : 'hover:bg-stone-600 active:bg-stone-500 cursor-pointer'} py-2 rounded-xl flex justify-center items-center transition-colors duration-200"
disabled={$selected_online_display_ids.length === 0 || key_pressed.ArrowLeft}
onmousedown={() => {
add_to_keyboard_queue(async () => await send_single_key_press('ArrowLeft', 'press'));
}}
onmouseup={() => {
add_to_keyboard_queue(
async () => await send_single_key_press('ArrowLeft', 'release')
);
}}
> >
<Button <ArrowBigLeft />
title="Nächste Folie (Pfeil nach Rechts)" </button>
className="px-9"
disabled={$selected_display_ids.length === 0} <button
click_function={async () => { title="Nächste Folie (Pfeil nach Rechts) [gedrückt halten möglich]"
await send_single_key_press('VK_RIGHT'); class="px-9 {key_pressed.ArrowRight
}}><ArrowBigRight /></Button ? 'bg-stone-500 cursor-not-allowed'
: `bg-stone-700 ${
$selected_online_display_ids.length === 0
? 'text-stone-500 cursor-not-allowed'
: 'hover:bg-stone-600 active:bg-stone-500 cursor-pointer'
}`} py-2 rounded-xl flex justify-center items-center transition-colors duration-200"
disabled={$selected_online_display_ids.length === 0 || key_pressed.ArrowRight}
onmousedown={() => {
add_to_keyboard_queue(async () => await send_single_key_press('ArrowRight', 'press'));
}}
onmouseup={() => {
add_to_keyboard_queue(
async () => await send_single_key_press('ArrowRight', 'release')
);
}}
> >
<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} click_function={show_text_popup}
click_function={show_text_popup}><TextAlignStart /> Text anzeigen</Button disabled={$selected_online_display_ids.length === 0}
><TextAlignStart /> Text 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_online_display_ids.length === 0}
click_function={show_website_popup}><Globe /> Webseite anzeigen</Button 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_online_display_ids.length === 0}
click_function={async () => { click_function={async () => {
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
@@ -254,15 +324,15 @@
<div class="flex flex-row justify-normal"> <div class="flex flex-row justify-normal">
<Button className="rounded-r-none pl-3 flex gap-3 grow w-65 justify-normal" disabled> <Button className="rounded-r-none pl-3 flex gap-3 grow w-65 justify-normal" disabled>
<TrafficCone /> Fallback-Bild anzeigen <TrafficCone /> Fallback-Bild Anzeigen
</Button> </Button>
<Button className="rounded-l-none flex grow-0 w-10" disabled><ChevronDown /></Button> <Button className="rounded-l-none flex grow-0 w-10" disabled><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_online_display_ids.length === 0}
click_function={show_send_keys_popup}><Keyboard /> Tastatur-Eingaben durchgeben</Button click_function={show_send_keys_popup}><Keyboard /> Tastatur-Eingaben Senden</Button
> >
</div> </div>
<div class="flex flex-col gap-2 justify-between"> <div class="flex flex-col gap-2 justify-between">
@@ -272,20 +342,20 @@
disabled={$all_display_states === '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 /> Bildschirm Hochfahren
</Button> </Button>
<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_display_states === 'off' || $selected_display_ids.length === 0} disabled={$all_display_states === 'off' || $selected_online_display_ids.length === 0}
click_function={ask_shutdonw} click_function={ask_shutdown}
> >
<PowerOff /> PC herunterfahren</Button <PowerOff /> Bildschirm Herunterfahren</Button
> >
</div> </div>
<Button className="px-3 flex gap-3 w-full xl:w-75 justify-normal" disabled> <Button className="px-3 flex gap-3 w-full xl:w-75 justify-normal" disabled>
<SquareTerminal /> <SquareTerminal />
Shell-Befehl ausführen Shell-Befehl Ausführen
</Button> </Button>
</div> </div>
</div> </div>
+28 -14
View File
@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { fade, scale } from 'svelte/transition'; import { fade } from 'svelte/transition';
import { import {
all_displays_of_group_selected, all_displays_of_group_selected,
get_display_by_id, get_display_by_id,
@@ -13,6 +13,7 @@
change_height, change_height,
current_height, current_height,
dnd_flip_duration_ms, dnd_flip_duration_ms,
get_selectable_color_classes,
is_display_drag, is_display_drag,
is_group_drag, is_group_drag,
next_height_step_size, next_height_step_size,
@@ -21,16 +22,13 @@
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 { Menu, Pencil, PinOff, Trash2, VideoOff, ZoomIn, ZoomOut } from 'lucide-svelte'; import { History, Menu, Pencil, PinOff, 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 DisplayGroupObject from '../lib/components/DisplayGroupObject.svelte'; import DisplayGroupObject from '../lib/components/DisplayGroupObject.svelte';
import { Pane, Splitpanes } from 'svelte-splitpanes'; import { Pane, Splitpanes, type IPaneSizingEvent } 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,
@@ -60,7 +58,7 @@
$effect(() => { $effect(() => {
const d = $display_groups; const d = $display_groups;
const sdi = $selected_display_ids; const sdi = $selected_display_ids;
all_groups_selected = liveQuery(() => all_selected(d || [], sdi)); all_groups_selected = liveQuery(() => d.length !== 0 && all_selected(d || [], sdi));
}); });
let last_pinned_pane_size: number = 45; let last_pinned_pane_size: number = 45;
@@ -71,8 +69,13 @@
pinned_pane_size = 0; pinned_pane_size = 0;
} }
function get_display_menu_options(display_id: string): MenuOption[] { function get_display_menu_options(display_id: string, display_version: string|undefined): MenuOption[] {
return [ return [
{
icon: History,
name: display_version ?? "Version unbekannt",
disabled: true,
},
{ {
icon: Pencil, icon: Pencil,
name: 'Bildschirm bearbeiten', name: 'Bildschirm bearbeiten',
@@ -110,7 +113,7 @@
return true; return true;
} }
function handle_splitpane_resize(e: any) { function handle_splitpane_resize(e: CustomEvent<IPaneSizingEvent[]>) {
if (e.detail[0].size === 0) { if (e.detail[0].size === 0) {
$pinned_display_id = null; $pinned_display_id = null;
pinned_pane_size = last_pinned_pane_size; pinned_pane_size = last_pinned_pane_size;
@@ -168,7 +171,7 @@
click_function={(e) => { click_function={(e) => {
e.stopPropagation(); e.stopPropagation();
}} }}
menu_options={get_display_menu_options($pinned_display_id)} menu_options={get_display_menu_options($pinned_display_id, $pinned_display?.version)}
> >
<Menu /> <Menu />
</Button> </Button>
@@ -215,17 +218,28 @@
</span> </span>
<div class="flex flex-row gap-1"> <div class="flex flex-row gap-1">
<button <button
class="min-w-40 px-4 rounded-xl cursor-pointer duration-200 transition-colors bg-stone-600" disabled={$display_groups?.length === 0}
class="min-w-40 px-4 rounded-xl duration-200 transition-colors {$display_groups?.length ===
0
? 'text-stone-500 cursor-not-allowed'
: 'cursor-pointer'} {get_selectable_color_classes($all_groups_selected || false, {
bg: true,
hover: $display_groups?.length !== 0,
active: $display_groups?.length !== 0,
text: true
})}"
onclick={async () => await toggle_all_selected_displays($display_groups)} onclick={async () => await toggle_all_selected_displays($display_groups)}
> >
<span>{$all_groups_selected || false ? 'Alle abwählen' : 'Alle auswählen'}</span> <span>{$all_groups_selected || false ? 'Alle Abwählen' : 'Alle Auswählen'}</span>
</button> </button>
<div class="flex flex-row"> <div class="flex flex-row">
<Button <Button
title="Bildschirme größer darstellen" title="Bildschirme größer darstellen"
className="aspect-square p-1.5! pr-1! rounded-r-none" className="aspect-square p-1.5! pr-1! rounded-r-none"
bg="bg-stone-600" bg="bg-stone-600"
disabled={!Boolean(next_height_step_size('display', $current_height, 1))} disabled={!next_height_step_size('display', $current_height, 1)}
click_function={() => { click_function={() => {
change_height('display', 1); change_height('display', 1);
}} }}
@@ -236,7 +250,7 @@
title="Bildschirme kleiner darstellen" title="Bildschirme kleiner darstellen"
className="aspect-square p-1.5! pl-1! rounded-l-none" className="aspect-square p-1.5! pl-1! rounded-l-none"
bg="bg-stone-600" bg="bg-stone-600"
disabled={!Boolean(next_height_step_size('display', $current_height, -1))} disabled={!next_height_step_size('display', $current_height, -1)}
click_function={() => { click_function={() => {
change_height('display', -1); change_height('display', -1);
}} }}
+97 -45
View File
@@ -11,10 +11,15 @@
ZoomIn, ZoomIn,
ZoomOut ZoomOut
} from 'lucide-svelte'; } from 'lucide-svelte';
import { change_height, current_height, next_height_step_size } from '$lib/ts/stores/ui_behavior'; import {
change_height,
current_height,
get_selectable_color_classes,
next_height_step_size
} from '$lib/ts/stores/ui_behavior';
import Button from '$lib/components/Button.svelte'; import Button from '$lib/components/Button.svelte';
import PathBar from './PathBar.svelte'; import PathBar from './PathBar.svelte';
import { selected_display_ids, selected_file_ids } from '$lib/ts/stores/select'; import { select, selected_display_ids, selected_file_ids } from '$lib/ts/stores/select';
import { import {
current_file_path, current_file_path,
get_folder_elements, get_folder_elements,
@@ -22,12 +27,12 @@
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_not_exists, get_displays_where_path_not_exists,
create_folder_on_all_selected_displays create_path_on_all_selected_displays
} from '$lib/ts/stores/files'; } from '$lib/ts/stores/files';
import { slide } from 'svelte/transition'; import { slide } from 'svelte/transition';
import InodeElement from '../lib/components/InodeElement.svelte'; import InodeElement from '../lib/components/InodeElement.svelte';
import PopUp from '$lib/components/PopUp.svelte'; import PopUp from '$lib/components/PopUp.svelte';
import { get_file_primary_key, type Inode, type PopupContent } from '$lib/ts/types'; import { get_file_primary_key, is_folder, type Inode, type PopupContent } from '$lib/ts/types';
import TextInput from '$lib/components/TextInput.svelte'; import TextInput from '$lib/components/TextInput.svelte';
import { import {
first_letter_is_valid, first_letter_is_valid,
@@ -38,6 +43,8 @@
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, add_sync_recursively } from '$lib/ts/file_transfer_handler'; import { download_file, add_upload, add_sync_recursively } from '$lib/ts/file_transfer_handler';
import { selected_online_display_ids } from '$lib/ts/stores/displays';
import FileDropZone from '$lib/components/FileDropZone.svelte';
let current_name: string = $state(''); let current_name: string = $state('');
let current_valid: boolean = $state(false); let current_valid: boolean = $state(false);
@@ -48,25 +55,37 @@
const s = $selected_file_ids; const s = $selected_file_ids;
selected_files = liveQuery(() => get_selected_files(s)); selected_files = liveQuery(() => get_selected_files(s));
}); });
let all_files_selected: boolean = $state(false);
$effect(() => {
const fe = $current_folder_elements;
const sfe_id = $selected_file_ids;
if (fe && sfe_id && fe.length !== 0) {
all_files_selected =
fe.length === sfe_id.length &&
!fe.find((inode) => !sfe_id.includes(get_file_primary_key(inode)));
}
});
let current_folder_elements: Observable<Inode[]> | undefined = $state(); let current_folder_elements: Observable<Inode[]> | undefined = $state();
$effect(() => { $effect(() => {
const path = $current_file_path, const path = $current_file_path,
display_ids = $selected_display_ids; display_ids = $selected_online_display_ids;
current_folder_elements = liveQuery(() => get_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'; if (s.length !== 1) return false;
const inode = await get_file_by_id(s[0]);
if (!inode) return false;
return !is_folder(inode);
}); });
}); });
let popup_content: PopupContent = $state({ let popup_content: PopupContent = $state({
open: false, open: false,
snippet: null, snippet: null,
title: '', title: ''
closable: true
}); });
let file_input: HTMLInputElement; let file_input: HTMLInputElement;
@@ -76,7 +95,7 @@
const results = await Promise.all(selected_file_ids.map((id) => get_file_by_id(id))); const results = await Promise.all(selected_file_ids.map((id) => get_file_by_id(id)));
return results.filter((element) => element !== null); return results.filter((element) => element !== null);
} catch (e: unknown) { } catch (e: unknown) {
console.error('Error on generating selected_files'); console.error('Error on generating selected_files', e);
return []; return [];
} }
} }
@@ -87,11 +106,8 @@
async function create_new_folder() { async function create_new_folder() {
popup_close_function(); popup_close_function();
await create_folder_on_all_selected_displays( const path_with_folder_name = ($current_file_path += current_name.trim() + '/');
current_name.trim(), await create_path_on_all_selected_displays(path_with_folder_name, $selected_online_display_ids);
$current_file_path,
$selected_display_ids
);
await update_current_folder_on_selected_displays(); await update_current_folder_on_selected_displays();
} }
@@ -110,17 +126,16 @@
const show_edit_file_popup = async () => { const show_edit_file_popup = async () => {
const file = await get_file_by_id($selected_file_ids[0]); const file = await get_file_by_id($selected_file_ids[0]);
if (!file) return; if (!file) return;
const is_folder = file.type === 'inode/directory'; const file_is_folder = is_folder(file);
const extension = is_folder ? '' : '.' + file.name.split('.').at(-1) || ''; const extension = file_is_folder ? '' : '.' + file.name.split('.').at(-1) || '';
current_name = file.name.slice(0, file.name.length - extension.length); current_name = file.name.slice(0, file.name.length - extension.length);
current_valid = true; current_valid = true;
popup_content = { popup_content = {
open: true, open: true,
snippet: edit_file_name_popup, snippet: edit_file_name_popup,
title: `${is_folder ? 'Ordner' : 'Datei'} umbenennen`, title: `${file_is_folder ? 'Ordner' : 'Datei'} umbenennen`,
title_icon: FolderPlus, title_icon: FolderPlus,
snippet_arg: extension, snippet_arg: extension
closable: true
}; };
}; };
@@ -128,14 +143,13 @@
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_not_exists($current_file_path, $selected_display_ids) await get_displays_where_path_not_exists($current_file_path, $selected_online_display_ids)
).map((display) => display.name); ).map((display) => display.name);
popup_content = { popup_content = {
open: true, open: true,
snippet: new_folder_popup, snippet: new_folder_popup,
title: 'Neuen Ordner erstellen', title: 'Neuen Ordner erstellen',
title_icon: FolderPlus, title_icon: FolderPlus
closable: true
}; };
}; };
@@ -144,22 +158,36 @@
open: true, open: true,
snippet: delete_request_popup, snippet: delete_request_popup,
title: `${$selected_file_ids.length} ${$selected_file_ids.length === 1 ? 'Objekt' : 'Objekte'} wirklich löschen?`, title: `${$selected_file_ids.length} ${$selected_file_ids.length === 1 ? 'Objekt' : 'Objekte'} wirklich löschen?`,
title_icon: Trash2, title_icon: Trash2
closable: true
}; };
}; };
async function toggle_all_selected_files(current_files: Inode[]) {
let action: 'select' | 'deselect';
if (all_files_selected === false) {
action = 'select';
} else {
action = 'deselect';
}
for (const file of current_files) {
await select(selected_file_ids, get_file_primary_key(file), action);
}
}
async function sync_selected_files( async function sync_selected_files(
selected_file_ids: string[], current_selected_file_ids: string[],
selected_display_ids: string[], selected_display_ids: string[],
current_folder_elements: Inode[] current_folder_elements: Inode[]
) { ) {
if (selected_file_ids.length === 0 && current_folder_elements.length > 0) { if (current_selected_file_ids.length === 0 && current_folder_elements.length > 0) {
selected_file_ids = current_folder_elements.map((inode) => get_file_primary_key(inode)); current_selected_file_ids = current_folder_elements.map((inode) =>
get_file_primary_key(inode)
);
} }
if (selected_file_ids.length === 0) return; if (current_selected_file_ids.length === 0) return;
// Mit For-Schleife über ausgewählte Elemente gehen // Mit For-Schleife über ausgewählte Elemente gehen
for (const file_id of selected_file_ids) { for (const file_id of current_selected_file_ids) {
await select(selected_file_ids, file_id, 'deselect');
await add_sync_recursively(file_id, selected_display_ids); await add_sync_recursively(file_id, selected_display_ids);
} }
} }
@@ -173,7 +201,7 @@
> existiert nicht auf {display_names_where_path_does_not_exist.length === 1 > existiert nicht auf {display_names_where_path_does_not_exist.length === 1
? 'dem Bildschirm' ? 'dem Bildschirm'
: 'den Bildschirmen'} : 'den Bildschirmen'}
{#each display_names_where_path_does_not_exist as display_name, i} {#each display_names_where_path_does_not_exist as display_name, i (i)}
{#if i !== 0} {#if i !== 0}
, ,
{/if} {/if}
@@ -248,7 +276,7 @@
>{`${$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-y-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, i (i)}
<InodeElement {file} not_interactable /> <InodeElement {file} not_interactable />
{/each} {/each}
</div> </div>
@@ -278,21 +306,40 @@
bind:this={file_input} bind:this={file_input}
multiple multiple
accept={get_accepted_file_type_string()} accept={get_accepted_file_type_string()}
onchange={(e) => onchange={async (e) => {
add_upload((e.target as HTMLInputElement).files!, $selected_display_ids, $current_file_path)} const target = e.target as HTMLInputElement;
await add_upload(target.files!, $selected_online_display_ids, $current_file_path);
target.value = '';
}}
/> />
<div class="bg-stone-800 h-full rounded-2xl grid grid-rows-[2.5rem_1fr] min-h-0"> <div class="bg-stone-800 size-full rounded-2xl grid grid-rows-[2.5rem_1fr] min-h-0">
<div class="bg-stone-700 flex justify-between w-full p-1 rounded-t-2xl min-w-0 gap-2"> <div class="bg-stone-700 flex justify-between w-full p-1 rounded-t-2xl min-w-0 gap-2">
<span class="text-xl font-bold pl-2 content-center truncate min-w-0"> <span class="text-xl font-bold pl-2 content-center truncate min-w-0">
Dateien anzeigen und verwalten Dateien Anzeigen und Verwalten
</span> </span>
<div class="flex flex-row gap-1">
<button
disabled={$current_folder_elements?.length === 0}
class="min-w-40 px-4 rounded-xl duration-200 transition-colors {$current_folder_elements?.length ===
0
? 'text-stone-500 cursor-not-allowed'
: 'cursor-pointer'} {get_selectable_color_classes(all_files_selected, {
bg: true,
hover: $current_folder_elements?.length !== 0,
active: $current_folder_elements?.length !== 0,
text: true
})}"
onclick={async () => await toggle_all_selected_files($current_folder_elements ?? [])}
>
<span>{all_files_selected ? 'Alle Abwählen' : 'Alle Auswählen'}</span>
</button>
<div class="flex flex-row"> <div class="flex flex-row">
<Button <Button
title="Dateien größer darstellen" title="Dateien größer darstellen"
className="aspect-square p-1.5! pr-1! rounded-r-none" className="aspect-square p-1.5! pr-1! rounded-r-none"
bg="bg-stone-600" bg="bg-stone-600"
disabled={!Boolean(next_height_step_size('file', $current_height, 1))} disabled={!next_height_step_size('file', $current_height, 1)}
click_function={() => { click_function={() => {
change_height('file', 1); change_height('file', 1);
}} }}
@@ -303,7 +350,7 @@
title="Dateien kleiner darstellen" title="Dateien kleiner darstellen"
className="aspect-square p-1.5! pl-1! rounded-l-none" className="aspect-square p-1.5! pl-1! rounded-l-none"
bg="bg-stone-600" bg="bg-stone-600"
disabled={!Boolean(next_height_step_size('file', $current_height, -1))} disabled={!next_height_step_size('file', $current_height, -1)}
click_function={() => { click_function={() => {
change_height('file', -1); change_height('file', -1);
}} }}
@@ -312,6 +359,7 @@
</Button> </Button>
</div> </div>
</div> </div>
</div>
<div class="flex flex-col gap-2 p-2 overflow-hidden relative rounded-b-2xl"> <div class="flex flex-col gap-2 p-2 overflow-hidden relative rounded-b-2xl">
<div class="flex flex-col gap-2 p-2 bg-stone-750 rounded-xl"> <div class="flex flex-col gap-2 p-2 bg-stone-750 rounded-xl">
<PathBar /> <PathBar />
@@ -321,7 +369,7 @@
title="Neuen Ordner erstellen (Neuen Ordner mit ausgewählten Objekten erstellen)" title="Neuen Ordner erstellen (Neuen Ordner mit ausgewählten Objekten erstellen)"
className="px-3 flex" className="px-3 flex"
click_function={show_new_folder_popup} click_function={show_new_folder_popup}
disabled={$selected_display_ids.length === 0}><FolderPlus /></Button disabled={$selected_online_display_ids.length === 0}><FolderPlus /></Button
> >
<div class="border border-stone-700 my-1"></div> <div class="border border-stone-700 my-1"></div>
<Button <Button
@@ -330,13 +378,13 @@
click_function={() => { click_function={() => {
if (file_input) file_input.click(); if (file_input) file_input.click();
}} }}
disabled={$selected_display_ids.length === 0}><Upload /></Button disabled={$selected_online_display_ids.length === 0}><Upload /></Button
> >
<Button <Button
title="Ausgewählte Datei herunterladen" title="Ausgewählte Datei herunterladen"
className="px-3 flex" className="px-3 flex"
click_function={async () => click_function={async () =>
await download_file($selected_file_ids[0], $selected_display_ids)} await download_file($selected_file_ids[0], $selected_online_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>
@@ -346,10 +394,10 @@
click_function={async () => click_function={async () =>
await sync_selected_files( await sync_selected_files(
$selected_file_ids, $selected_file_ids,
$selected_display_ids, $selected_online_display_ids,
$current_folder_elements ?? [] $current_folder_elements ?? []
)} )}
disabled={$selected_display_ids.length === 0} disabled={$selected_online_display_ids.length === 0}
><RefreshCcw /> ><RefreshCcw />
<span class="hidden 2xl:flex">Synchronisieren</span> <span class="hidden 2xl:flex">Synchronisieren</span>
</Button> </Button>
@@ -363,7 +411,7 @@
<Button <Button
title="Ausgewählte Datei(en) einfügen" title="Ausgewählte Datei(en) einfügen"
className="px-3 flex" className="px-3 flex"
disabled={$selected_display_ids.length === 0} disabled={$selected_online_display_ids.length === 0}
> >
<ClipboardPaste /> <ClipboardPaste />
</Button> </Button>
@@ -385,9 +433,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="min-h-0 h-full overflow-y-auto overflow-x-hidden bg-stone-750 rounded-xl">
<div
class="min-h-0 size-full overflow-y-auto overflow-x-hidden bg-stone-750 rounded-xl relative"
>
<FileDropZone className="rounded-xl size-full" />
<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_online_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">
Es sind keine Bildschirme ausgewählt. Es sind keine Bildschirme ausgewählt.
</span> </span>
+110 -41
View File
@@ -1,70 +1,87 @@
<script lang="ts"> <script lang="ts">
import { flip } from 'svelte/animate'; import { flip } from 'svelte/animate';
import { get_selectable_color_classes } from '$lib/ts/stores/ui_behavior'; import { get_selectable_color_classes } from '$lib/ts/stores/ui_behavior';
import key_map_json from './../../../../shared/keys.json';
import { fade } from 'svelte/transition'; import { fade } from 'svelte/transition';
import { run_on_all_selected_displays } from '$lib/ts/stores/displays'; import { run_on_all_selected_displays } from '$lib/ts/stores/displays';
import { send_keyboard_input } from '$lib/ts/api_handler'; import { send_keyboard_input } from '$lib/ts/api_handler';
import { ArrowDownToLine, ArrowUpFromLine, Grid2x2, Option } from 'lucide-svelte';
import Button from '$lib/components/Button.svelte';
import { onDestroy } from 'svelte';
import { add_to_keyboard_queue } from '$lib/ts/utils';
const key_map: Record<string, string> = key_map_json as Record<string, string>; let {
popup_close_function
}: {
popup_close_function: () => void;
} = $props();
let active = $state(false); let active = $state(false);
const current_keys: string[] = $state([]); const current_keys: string[] = $state([]);
let last_keys: { id: number; key: string }[] = $state([]); let last_keys: { id: number; key: string }[] = $state([]);
let seq = 0;
let el: HTMLDivElement; let el: HTMLDivElement;
function add_to_last_keys(name: string) { function add_to_last_keys(name: string) {
const id = Date.now(); const id = ++seq;
last_keys.push({ id, key: name });
// Neueste oben
last_keys = [{ id, key: name }, ...last_keys].slice(0, 6);
setTimeout(() => { setTimeout(() => {
last_keys = last_keys.filter((e) => e.id !== id); last_keys = last_keys.filter((e) => e.id !== id);
}, 1500); }, 1500);
} }
async function on_key(e: KeyboardEvent, key_down: boolean) { async function on_keyboard_input(e: KeyboardEvent, key_down: boolean) {
if (!active) return; if (!active) return;
const id = key_map[e.code]; const id = e.code;
if (!id) return; if (!id) return;
if (key_down) {
if (current_keys.includes(e.code)) return;
current_keys.push(e.code);
} else {
const index = current_keys.indexOf(e.code);
if (index === -1) return;
current_keys.splice(index, 1);
}
if (e.repeat) return;
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
const action: 'press' | 'release' = key_down ? 'press' : 'release'; if (e.repeat) return;
await on_key(id, key_down);
add_to_last_keys(action.toUpperCase() + ' ' + e.code);
await run_on_all_selected_displays(
(d) => send_keyboard_input(d.ip, [{ key: id, action }]),
true
);
} }
async function release_all_pressed_keys() { async function on_key(key: string, key_down: boolean) {
if (key_down) {
if (current_keys.includes(key)) return;
current_keys.push(key);
} else {
const index = current_keys.indexOf(key);
if (index === -1) return;
current_keys.splice(index, 1);
}
const action: 'press' | 'release' = key_down ? 'press' : 'release';
add_to_last_keys(action.toUpperCase() + ' ' + key);
add_to_keyboard_queue(async () => {
await run_on_all_selected_displays((d) => send_keyboard_input(d.ip, [{ key, action }]), true);
});
}
function release_all_pressed_keys() {
const inputs: { key: string; action: 'press' | 'release' }[] = []; const inputs: { key: string; action: 'press' | 'release' }[] = [];
for (let i = current_keys.length - 1; i >= 0; i--) { for (let i = current_keys.length - 1; i >= 0; i--) {
inputs.push({key: current_keys[i], action: 'release'}) inputs.push({ key: current_keys[i], action: 'release' });
current_keys.splice(i, 1); current_keys.splice(i, 1);
} }
await run_on_all_selected_displays( add_to_keyboard_queue(async () => {
(d) => send_keyboard_input(d.ip, inputs), await run_on_all_selected_displays((d) => send_keyboard_input(d.ip, inputs), true);
true });
);
} }
onDestroy(() => {
release_all_pressed_keys();
});
</script> </script>
<div class="flex flex-row gap-2 overflow-hidden h-full">
<div <div
role="textbox" role="textbox"
tabindex="0" tabindex="0"
@@ -79,11 +96,11 @@
}} }}
onblur={async () => { onblur={async () => {
active = false; active = false;
await release_all_pressed_keys(); release_all_pressed_keys();
}} }}
onkeydown={(e) => on_key(e, true)} onkeydown={(e) => on_keyboard_input(e, true)}
onkeyup={(e) => on_key(e, false)} onkeyup={(e) => on_keyboard_input(e, false)}
class="relative flex justify-center items-center h-15 w-full cursor-pointer rounded-xl transition-colors duration-200 select-none {get_selectable_color_classes( class="flex justify-center items-center text-center grow py-2 px-8 w-70 h-full cursor-pointer rounded-xl transition-colors duration-200 select-none {get_selectable_color_classes(
active, active,
{ {
bg: true, bg: true,
@@ -94,13 +111,65 @@
)}" )}"
> >
{active ? 'Erfassung aktiv' : 'Hier für Erfassung klicken'} {active ? 'Erfassung aktiv' : 'Hier für Erfassung klicken'}
<div class="absolute top-full left-0 ml-1 mt-0.5 flex flex-col-reverse text-sm text-stone-400"> </div>
{#each last_keys as key (key.id)} <div
<span class="relative flex flex-col gap-1 text-sm w-40 p-2 bg-stone-750 rounded-xl overflow-hidden h-full"
animate:flip={{ duration: 200 }}
in:fade={{ duration: 200 }}
out:fade={{ duration: 500 }}>{key.key}</span
> >
{#each last_keys as item (item.id)}
<span
class="flex flex-row gap-2 {item.key.split(' ')[0] === 'PRESS'
? 'text-sky-600'
: 'text-lime-600'}"
animate:flip={{ duration: 120 }}
in:fade={{ duration: 120 }}
out:fade={{ duration: 200 }}
>
{#if item.key.split(' ')[0] === 'PRESS'}
<ArrowDownToLine />
{:else}
<ArrowUpFromLine />
{/if}
{item.key.split(' ').at(-1)}
</span>
{/each} {/each}
<div
class="absolute bottom-0 right-0 left-0 h-5 bg-linear-to-b from-transparent to-stone-750"
></div>
</div>
<div class="flex flex-col gap-2 justify-between">
<div class="flex flex-col gap-2">
<button
title="Windows-/Meta-Taste [gedrückt halten möglich]"
class="px-3 bg-stone-700 py-2 gap-2 rounded-xl flex items-center transition-colors duration-200 hover:bg-stone-600 active:bg-stone-500 cursor-pointer"
onmousedown={async (e) => {
e.preventDefault();
await on_key('MetaLeft', true);
}}
onmouseup={async () => {
await on_key('MetaLeft', false);
}}
>
<Grid2x2 /> Meta
</button>
<button
title="Alt-Taste [gedrückt halten möglich]"
class="px-3 bg-stone-700 py-2 gap-2 rounded-xl flex items-center transition-colors duration-200 hover:bg-stone-600 active:bg-stone-500 cursor-pointer"
onmousedown={async (e) => {
e.preventDefault();
await on_key('AltLeft', true);
}}
onmouseup={async () => {
await on_key('AltLeft', false);
}}
>
<Option /> Alt
</button>
</div>
<Button
div_class="mt-2 justify-end"
className="px-4 font-bold"
click_function={popup_close_function}>Fertig</Button
>
</div> </div>
</div> </div>
+13 -6
View File
@@ -9,7 +9,6 @@
Highlighter, Highlighter,
Italic, Italic,
PaintBucket, PaintBucket,
QrCode,
Strikethrough Strikethrough
} from 'lucide-svelte'; } from 'lucide-svelte';
import Button from '$lib/components/Button.svelte'; import Button from '$lib/components/Button.svelte';
@@ -20,6 +19,12 @@
import { Color } from '@tiptap/extension-text-style'; import { Color } from '@tiptap/extension-text-style';
import Highlight from '@tiptap/extension-highlight'; import Highlight from '@tiptap/extension-highlight';
let {
text = $bindable()
}: {
text: string;
} = $props();
type TextEditOption = { type TextEditOption = {
onclick: () => void; onclick: () => void;
is_selected: () => boolean; is_selected: () => boolean;
@@ -128,20 +133,22 @@
multicolor: true multicolor: true
}) })
], ],
content: '', content: text,
onTransaction: ({ editor }) => { onTransaction: ({ editor }) => {
// Increment the state signal to force a re-render // Increment the state signal to force a re-render
editor_state = { editor }; editor_state = { editor };
}, },
autofocus: true autofocus: true
}); });
editor_state.editor.commands.selectAll();
}); });
onDestroy(() => { onDestroy(() => {
if (editor_state.editor) text = editor_state.editor.getHTML();
editor_state.editor?.destroy(); editor_state.editor?.destroy();
}); });
</script> </script>
{#each Object.values(color_states) as color_state} {#each Object.values(color_states) as color_state, i (i)}
<input type="color" bind:this={color_state.el} bind:value={color_state.value} class="hidden" /> <input type="color" bind:this={color_state.el} bind:value={color_state.value} class="hidden" />
{/each} {/each}
@@ -155,9 +162,9 @@
<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">
{#each text_edit_options as edit_row} {#each text_edit_options as edit_row, i (i)}
<div class="flex flex-row gap-1"> <div class="flex flex-row gap-1">
{#each edit_row as option} {#each edit_row as option, j (j)}
<div class="flex flex-row"> <div class="flex flex-row">
<button <button
title={option.title} title={option.title}
@@ -210,7 +217,7 @@
{/each} {/each}
</div> </div>
<Button click_function={show_text} className="w-full font-bold">Text anzeigen</Button> <Button click_function={show_text} className="w-full font-bold">Text Anzeigen</Button>
</div> </div>
</div> </div>
+7
View File
@@ -0,0 +1,7 @@
[working-directory: 'frontend']
gen:
deno install
deno task build
dev: gen
go run *.go
+28 -5
View File
@@ -1,6 +1,7 @@
package main package main
import ( import (
"encoding/json"
"log/slog" "log/slog"
"net" "net"
"net/http" "net/http"
@@ -64,7 +65,7 @@ func main() {
os.Exit(1) os.Exit(1)
} }
}() }()
err = shared.OpenBrowserWindow("http://localhost:"+port, false, "control") err = openBrowserWindow("http://localhost:" + port)
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)
@@ -77,23 +78,45 @@ func pingRoute(ctx echo.Context) error {
return ctx.JSON(http.StatusBadRequest, PingResponse{Error: "missing 'ip' query parameter"}) return ctx.JSON(http.StatusBadRequest, PingResponse{Error: "missing 'ip' query parameter"})
} }
cmd := exec.Command("ping", "-c", "1", "-w", "1", ip) cmd := exec.Command("ping", "-c", "1", "-w", "5", ip)
result := shared.RunShellCommand(cmd) result := shared.RunShellCommand(cmd)
if result.ExitCode != 0 { if result.ExitCode != 0 {
return ctx.JSON(http.StatusOK, PingResponse{Status: "host_offline"}) return ctx.JSON(http.StatusOK, PingResponse{Status: "host_offline"})
} }
conn, err := net.DialTimeout("tcp", ip+":1323", 1*time.Second) client := http.Client{
Timeout: 5 * time.Second,
}
resp, err := client.Get("http://" + ip + ":1323/api/ping")
if err != nil { if err != nil {
return ctx.JSON(http.StatusOK, PingResponse{Status: "app_offline"}) return ctx.JSON(http.StatusOK, PingResponse{Status: "app_offline"})
} }
conn.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
return ctx.JSON(http.StatusOK, PingResponse{Status: "app_offline"})
}
return ctx.JSON(http.StatusOK, PingResponse{Status: "app_online"}) var appPing AppPingResponse
if err := json.NewDecoder(resp.Body).Decode(&appPing); err != nil {
return ctx.JSON(http.StatusOK, PingResponse{
Status: "app_offline",
})
}
return ctx.JSON(http.StatusOK, PingResponse{
Status: "app_online",
Version: appPing.Version,
})
}
type AppPingResponse struct {
Version string `json:"version"`
} }
type PingResponse struct { type PingResponse struct {
Status string `json:"status"` Status string `json:"status"`
Version string `json:"version"`
Error string `json:"error"` Error string `json:"error"`
} }
@@ -1,4 +1,4 @@
package shared package main
import ( import (
"errors" "errors"
@@ -6,36 +6,31 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"plg-mudics/shared"
) )
func OpenBrowserWindow(url string, fullscreen bool, profile string) error { func openBrowserWindow(url string) error {
bins := []string{"chromium", "chromium-browser"} bins := []string{"chromium", "chromium-browser"}
home, err := os.UserHomeDir() home, err := os.UserHomeDir()
if err != nil { if err != nil {
return fmt.Errorf("unable to determine user home directory: %w", err) return fmt.Errorf("unable to determine user home directory: %w", err)
} }
browserProfileDirPath := filepath.Join(home, ".local", "share", "plg-mudics", fmt.Sprintf("browser-%s", profile)) browserProfileDirPath := filepath.Join(home, ".local", "share", "plg-mudics", "browser-control")
if err := os.MkdirAll(browserProfileDirPath, os.ModePerm); err != nil { if err := os.MkdirAll(browserProfileDirPath, os.ModePerm); err != nil {
return fmt.Errorf("failed to create local config directory: %w", err) return fmt.Errorf("failed to create local config directory: %w", err)
} }
args := []string{ args := []string{
fmt.Sprintf("--app=%s", url), fmt.Sprintf("--app=%s", url),
"--autoplay-policy=no-user-gesture-required",
fmt.Sprintf("--user-data-dir=%s", browserProfileDirPath), fmt.Sprintf("--user-data-dir=%s", browserProfileDirPath),
"--disable-web-security", "--disable-features=Translate",
"--allow-running-insecure-content",
"--disable-features=XFrameOptions",
}
if fullscreen {
args = append(args, "--start-fullscreen")
} }
errs := []string{} errs := []string{}
for _, bin := range bins { for _, bin := range bins {
cmd := exec.Command(bin, args...) cmd := exec.Command(bin, args...)
commandOutput := RunShellCommand(cmd) commandOutput := shared.RunShellCommand(cmd)
if commandOutput.ExitCode == 0 { if commandOutput.ExitCode == 0 {
return nil return nil
} }
+6
View File
@@ -62,6 +62,12 @@ Even when the command itself fails.
The screenshot as binary in the response body. The screenshot as binary in the response body.
## PATCH `/openWebsite`
### Request Body
- `url`: string
## POST `/file/<path>` - Upload File ## POST `/file/<path>` - Upload File
### Responses ### Responses
+83
View File
@@ -0,0 +1,83 @@
package browser
import (
"context"
"fmt"
"os"
"path/filepath"
"github.com/chromedp/chromedp"
)
var Browser BrowserType = BrowserType{}
type BrowserType struct {
Ctx context.Context
Cancel context.CancelFunc
}
func (b *BrowserType) Init() error {
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", "browser-display")
if err := os.MkdirAll(browserProfileDirPath, os.ModePerm); err != nil {
return fmt.Errorf("failed to create local config directory: %w", err)
}
opts := []chromedp.ExecAllocatorOption{
chromedp.Flag("headless", false),
chromedp.Flag("app", "http://example.com"), // app mode prevents a few unwanted features of chrome, the start url is directly overwritten
chromedp.Flag("start-fullscreen", true),
chromedp.Flag("hide-scrollbars", true),
chromedp.Flag("allow-file-access-from-files", true),
chromedp.Flag("user-data-dir", browserProfileDirPath),
chromedp.Flag("autoplay-policy", "no-user-gesture-required"),
}
initCtx, _ := chromedp.NewExecAllocator(context.Background(), opts...)
b.Ctx, b.Cancel = chromedp.NewContext(initCtx)
return nil
}
func (b *BrowserType) OpenPage(url string) error {
err := chromedp.Run(b.Ctx, chromedp.Navigate(url))
if err != nil {
return fmt.Errorf("navigate to URL: %w", err)
}
return nil
}
// Yes, we need that trick with creating a temp file and not directly sending html since
// chrome only allows us to access local files via other local files
func (b *BrowserType) OpenHTML(html string) error {
var err error
tempFile, err := os.CreateTemp("", "mudics-*.html")
if err != nil {
return fmt.Errorf("could not create tempfile: %w", err)
}
defer func() { _ = tempFile.Close() }()
_, err = tempFile.WriteString(html)
if err != nil {
return fmt.Errorf("could not write to tempfile: %w", err)
}
err = chromedp.Run(b.Ctx, chromedp.Navigate("file://"+tempFile.Name()))
if err != nil {
return fmt.Errorf("navigate to URL: %w", err)
}
return nil
}
func (b *BrowserType) OpenPDF(path string) error {
err := b.OpenPage("file://" + path + "#toolbar=0&view=Fit")
if err != nil {
return fmt.Errorf("open PDF: %w", err)
}
return nil
}
+10 -3
View File
@@ -1,9 +1,10 @@
module plg-mudics/display module plg-mudics/display
go 1.24.4 go 1.25
require ( require (
github.com/a-h/templ v0.3.960 github.com/a-h/templ v0.3.977
github.com/chromedp/chromedp v0.14.2
github.com/gabriel-vasile/mimetype v1.4.11 github.com/gabriel-vasile/mimetype v1.4.11
github.com/labstack/echo/v4 v4.15.0 github.com/labstack/echo/v4 v4.15.0
github.com/micmonay/keybd_event v1.1.2 github.com/micmonay/keybd_event v1.1.2
@@ -14,9 +15,15 @@ require (
github.com/a-h/parse v0.0.0-20250122154542-74294addb73e // indirect github.com/a-h/parse v0.0.0-20250122154542-74294addb73e // indirect
github.com/andybalholm/brotli v1.1.0 // indirect github.com/andybalholm/brotli v1.1.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/chromedp/cdproto v0.0.0-20250803210736-d308e07a266d // indirect
github.com/chromedp/sysutil v1.1.0 // indirect
github.com/cli/browser v1.3.0 // indirect github.com/cli/browser v1.3.0 // indirect
github.com/fatih/color v1.16.0 // indirect github.com/fatih/color v1.16.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-json-experiment/json v0.0.0-20251027170946-4849db3c2f7e // indirect
github.com/gobwas/httphead v0.1.0 // indirect
github.com/gobwas/pool v0.2.1 // indirect
github.com/gobwas/ws v1.4.0 // indirect
github.com/labstack/gommon v0.4.2 // indirect github.com/labstack/gommon v0.4.2 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-isatty v0.0.20 // indirect
@@ -27,7 +34,7 @@ require (
golang.org/x/mod v0.30.0 // indirect golang.org/x/mod v0.30.0 // indirect
golang.org/x/net v0.48.0 // indirect golang.org/x/net v0.48.0 // indirect
golang.org/x/sync v0.19.0 // indirect golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.39.0 // indirect golang.org/x/sys v0.40.0 // indirect
golang.org/x/text v0.32.0 // indirect golang.org/x/text v0.32.0 // indirect
golang.org/x/time v0.14.0 // indirect golang.org/x/time v0.14.0 // indirect
golang.org/x/tools v0.39.0 // indirect golang.org/x/tools v0.39.0 // indirect
+18
View File
@@ -2,10 +2,18 @@ github.com/a-h/parse v0.0.0-20250122154542-74294addb73e h1:HjVbSQHy+dnlS6C3XajZ6
github.com/a-h/parse v0.0.0-20250122154542-74294addb73e/go.mod h1:3mnrkvGpurZ4ZrTDbYU84xhwXW2TjTKShSwjRi2ihfQ= github.com/a-h/parse v0.0.0-20250122154542-74294addb73e/go.mod h1:3mnrkvGpurZ4ZrTDbYU84xhwXW2TjTKShSwjRi2ihfQ=
github.com/a-h/templ v0.3.960 h1:trshEpGa8clF5cdI39iY4ZrZG8Z/QixyzEyUnA7feTM= 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/a-h/templ v0.3.960/go.mod h1:oCZcnKRf5jjsGpf2yELzQfodLphd2mwecwG4Crk5HBo=
github.com/a-h/templ v0.3.977 h1:kiKAPXTZE2Iaf8JbtM21r54A8bCNsncrfnokZZSrSDg=
github.com/a-h/templ v0.3.977/go.mod h1:oCZcnKRf5jjsGpf2yELzQfodLphd2mwecwG4Crk5HBo=
github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
github.com/chromedp/cdproto v0.0.0-20250803210736-d308e07a266d h1:ZtA1sedVbEW7EW80Iz2GR3Ye6PwbJAJXjv7D74xG6HU=
github.com/chromedp/cdproto v0.0.0-20250803210736-d308e07a266d/go.mod h1:NItd7aLkcfOA/dcMXvl8p1u+lQqioRMq/SqDp71Pb/k=
github.com/chromedp/chromedp v0.14.2 h1:r3b/WtwM50RsBZHMUm9fsNhhzRStTHrKdr2zmwbZSzM=
github.com/chromedp/chromedp v0.14.2/go.mod h1:rHzAv60xDE7VNy/MYtTUrYreSc0ujt2O1/C3bzctYBo=
github.com/chromedp/sysutil v1.1.0 h1:PUFNv5EcprjqXZD9nJb9b/c9ibAbxiYo4exNWZyipwM=
github.com/chromedp/sysutil v1.1.0/go.mod h1:WiThHUdltqCNKGc4gaU50XgYjwjYIhKWoHGPTUfWTJ8=
github.com/cli/browser v1.3.0 h1:LejqCrpWr+1pRqmEPDGnTZOjsMe7sehifLynZJuqJpo= github.com/cli/browser v1.3.0 h1:LejqCrpWr+1pRqmEPDGnTZOjsMe7sehifLynZJuqJpo=
github.com/cli/browser v1.3.0/go.mod h1:HH8s+fOAxjhQoBUAsKuPCbqUuxZDhQ2/aD+SzsEfBTk= github.com/cli/browser v1.3.0/go.mod h1:HH8s+fOAxjhQoBUAsKuPCbqUuxZDhQ2/aD+SzsEfBTk=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -16,6 +24,14 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
github.com/gabriel-vasile/mimetype v1.4.11 h1:AQvxbp830wPhHTqc1u7nzoLT+ZFxGY7emj5DR5DYFik= github.com/gabriel-vasile/mimetype v1.4.11 h1:AQvxbp830wPhHTqc1u7nzoLT+ZFxGY7emj5DR5DYFik=
github.com/gabriel-vasile/mimetype v1.4.11/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= github.com/gabriel-vasile/mimetype v1.4.11/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
github.com/go-json-experiment/json v0.0.0-20251027170946-4849db3c2f7e h1:Lf/gRkoycfOBPa42vU2bbgPurFong6zXeFtPoxholzU=
github.com/go-json-experiment/json v0.0.0-20251027170946-4849db3c2f7e/go.mod h1:uNVvRXArCGbZ508SxYYTC5v1JWoz2voff5pm25jU1Ok=
github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= 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=
@@ -64,6 +80,8 @@ 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 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
golang.org/x/sys v0.40.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 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+7
View File
@@ -0,0 +1,7 @@
package pdfjs
import "embed"
//go:embed node_modules/pdfjs-dist/build/pdf.min.mjs
//go:embed node_modules/pdfjs-dist/build/pdf.worker.min.mjs
var Files embed.FS
+10
View File
@@ -0,0 +1,10 @@
{
"nodeModulesDir": "manual",
"nodeModulesLinker": "hoisted",
"imports": {
"pdfjs-dist": "npm:pdfjs-dist@6.0.227"
},
"tasks": {
"install": "deno install --frozen"
}
}
+90
View File
@@ -0,0 +1,90 @@
{
"version": "5",
"specifiers": {
"npm:pdfjs-dist@6.0.227": "6.0.227"
},
"npm": {
"@napi-rs/canvas-android-arm64@1.0.0": {
"integrity": "sha512-3hNKJObUK7JsCF9aJlVCs1J0/KE/gGfZNeK8MO1ge6bB3aicr5walGme9t9No1f/oyk9GgvdAT/rjSdsx3gbIw==",
"os": ["android"],
"cpu": ["arm64"]
},
"@napi-rs/canvas-darwin-arm64@1.0.0": {
"integrity": "sha512-ZIja19/BiGz2puhki+WUYSRriwFeFJ8Mi9eK3hZdSS85w4Y60cuEAJVhMCfKwswQkKkUtrnzdKMBuO7TupvexA==",
"os": ["darwin"],
"cpu": ["arm64"]
},
"@napi-rs/canvas-darwin-x64@1.0.0": {
"integrity": "sha512-hImggWc82jqZVpEsFR9S7PE9OQYjq/H/D7vwCGB6X1jRH+UVBP1+1niJTPBOat1B154T6GKK7/kcFtoWgjgFzQ==",
"os": ["darwin"],
"cpu": ["x64"]
},
"@napi-rs/canvas-linux-arm-gnueabihf@1.0.0": {
"integrity": "sha512-hlJRy6d+kWLKVOG/+1rEvNQVURZ0DxxRPJsLmEWwhwiXZUJc0BF5o9esALHSEP4CoJK4wChRtj3hnyBgVx2oWA==",
"os": ["linux"],
"cpu": ["arm"]
},
"@napi-rs/canvas-linux-arm64-gnu@1.0.0": {
"integrity": "sha512-5Hru4T3RXkosRQafcjelv7AUzw9mXqmGYsxnzeDDOWveFCJyEPMSJltvGCM+jfH98seOCbfwm9KyFg6Jm5FhAA==",
"os": ["linux"],
"cpu": ["arm64"]
},
"@napi-rs/canvas-linux-arm64-musl@1.0.0": {
"integrity": "sha512-LTUl9jS8WsLSUGaxQZKQkxfluOJRpgvBuxxdM4pYcjib+di8AU4OzQc6+L6SzGMLcKc9H0RAjojRatBhTMqYdg==",
"os": ["linux"],
"cpu": ["arm64"]
},
"@napi-rs/canvas-linux-riscv64-gnu@1.0.0": {
"integrity": "sha512-Iz931SAZf+WVDzpjk52Q3ffW3zw0YflFwEZMgs036Wfu1kX/LrwT9wGjsuSqyduqefUkl91/vTdAjn8hQu5ezA==",
"os": ["linux"],
"cpu": ["riscv64"]
},
"@napi-rs/canvas-linux-x64-gnu@1.0.0": {
"integrity": "sha512-pFEQ5eFK4JusgN1K6KkO9DKP/Hi1WMJOkF8Ch03/khTc4bFbCKkCCsJG4YcOMOW9bI4XbT2/eMAWxhO0xaWgPA==",
"os": ["linux"],
"cpu": ["x64"]
},
"@napi-rs/canvas-linux-x64-musl@1.0.0": {
"integrity": "sha512-jnvr8NrLHiZ3NCiOKWqDbkI4Ah+QDrqtZ+sddPZBltEb1mQ2coSvCSJYfict+oAwcm0c970oTmVySpjKP/lnaA==",
"os": ["linux"],
"cpu": ["x64"]
},
"@napi-rs/canvas-win32-arm64-msvc@1.0.0": {
"integrity": "sha512-y2j9/Gfd5joqiqxdP/L1smqjQ+uAx3C4N0EC7bDHrnZEEH8ToM/OC5p3uHvtj4Lq591aHj+ArL01UDLNwT5HgQ==",
"os": ["win32"],
"cpu": ["arm64"]
},
"@napi-rs/canvas-win32-x64-msvc@1.0.0": {
"integrity": "sha512-qwdhh9N6Gge/hC4pL9S1tQp0iKwhSl/dYjg7+RGp9k26iRGRi5MqqUyKGOXIWli0zOcuy5Y2wIH/jk2ry6i/jA==",
"os": ["win32"],
"cpu": ["x64"]
},
"@napi-rs/canvas@1.0.0": {
"integrity": "sha512-Jqxcy1XOIqj+lH9sl1GT+il6GR3uQv13vI2mrwubP3uT8Olak2ClDrK2RnxlQKjwv8BRr4b3ug0YR7c6hBX8wg==",
"optionalDependencies": [
"@napi-rs/canvas-android-arm64",
"@napi-rs/canvas-darwin-arm64",
"@napi-rs/canvas-darwin-x64",
"@napi-rs/canvas-linux-arm-gnueabihf",
"@napi-rs/canvas-linux-arm64-gnu",
"@napi-rs/canvas-linux-arm64-musl",
"@napi-rs/canvas-linux-riscv64-gnu",
"@napi-rs/canvas-linux-x64-gnu",
"@napi-rs/canvas-linux-x64-musl",
"@napi-rs/canvas-win32-arm64-msvc",
"@napi-rs/canvas-win32-x64-msvc"
]
},
"pdfjs-dist@6.0.227": {
"integrity": "sha512-/P6M4SXw+70waMVLUM7rdRtvo+dEzqE1t6W/zQNvBETo2MaRa5rrvCcAYdfWGiUzadTgM0lJmRApUrW0d9zgKg==",
"optionalDependencies": [
"@napi-rs/canvas"
]
}
},
"workspace": {
"dependencies": [
"npm:pdfjs-dist@6.0.227"
]
}
}
+6
View File
@@ -0,0 +1,6 @@
gen:
go tool templ generate
cd internal/pdfjs && deno install --frozen
dev: gen
go run *.go
+12 -7
View File
@@ -4,13 +4,11 @@ import (
"log/slog" "log/slog"
"os" "os"
"plg-mudics/display/browser"
"plg-mudics/display/pkg" "plg-mudics/display/pkg"
"plg-mudics/display/web" "plg-mudics/display/web"
"plg-mudics/shared"
) )
//go:generate go tool templ generate
func main() { func main() {
var err error var err error
@@ -19,16 +17,23 @@ func main() {
if err != nil { if err != nil {
slog.Error("Failed to get storage path", "error", err) slog.Error("Failed to get storage path", "error", err)
os.Exit(1) os.Exit(1)
return
} }
port := "1323" port := "1323"
// 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(shared.Version, port) go web.StartWebServer(port)
err = shared.OpenBrowserWindow("http://localhost:"+port, true, "display")
err = browser.Browser.Init()
if err != nil { if err != nil {
slog.Error("Failed to open browser window", "error", err) slog.Error("Initialize browser", "error", err)
os.Exit(1) os.Exit(1)
} }
err = pkg.OpenStartScreen()
if err != nil {
slog.Error("Open start screen", "error", err)
os.Exit(1)
}
defer browser.Browser.Cancel()
<-browser.Browser.Ctx.Done()
} }
-63
View File
@@ -1,63 +0,0 @@
package pkg
import (
"fmt"
"os"
"os/exec"
"plg-mudics/shared"
"syscall"
"github.com/gabriel-vasile/mimetype"
)
var FileHandler fileHandler = fileHandler{}
type fileHandler struct {
runningProgram *exec.Cmd
}
func (fh *fileHandler) OpenFile(path string) error {
var err error
mType, err := mimetype.DetectFile(path)
if err != nil {
return fmt.Errorf("failed to detect mime type: %w", err)
}
tempDirPath, err := os.MkdirTemp("", "plg-mudics-program-profile-")
if err != nil {
return fmt.Errorf("failed to create temporary profile directory: %w", err)
}
err = fh.CloseRunningProgram()
if err != nil {
return err
}
switch mType.String() {
case "application/vnd.openxmlformats-officedocument.presentationml.presentation", "application/vnd.oasis.opendocument.presentation":
fh.runningProgram = exec.Command("soffice", "--show", path, "--nologo", "--view", "--norestore", fmt.Sprintf("-env:UserInstallation=file://%s", tempDirPath))
case "application/pdf":
fh.runningProgram = exec.Command("xreader", path, "--presentation")
default:
return fmt.Errorf("unsupported file type: %s", mType.String())
}
fh.runningProgram.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
result := shared.RunShellCommandNonBlocking(fh.runningProgram)
if result.ExitCode != 0 {
return fmt.Errorf("could not open pdf: %s (%d)", result.Stderr, result.ExitCode)
}
return nil
}
func (fh *fileHandler) CloseRunningProgram() error {
if fh.runningProgram == nil {
return nil
}
err := syscall.Kill(-fh.runningProgram.Process.Pid, syscall.SIGTERM)
fh.runningProgram = nil
return err
}
+178
View File
@@ -0,0 +1,178 @@
package pkg
import (
"fmt"
"log/slog"
"time"
"github.com/micmonay/keybd_event"
)
type KeyAction int
const (
KeyPress KeyAction = iota
KeyRelease
)
type Input struct {
Key string
Action KeyAction
}
func KeyboardInput(inputs []Input) error {
var err error
kb, err := keybd_event.NewKeyBonding()
if err != nil {
return fmt.Errorf("failed to create key bonding: %w", err)
}
for _, input := range inputs {
switch input.Key {
case "Shift", "ShiftLeft", "ShiftRight":
kb.HasSHIFT(true)
case "Ctrl", "Control", "ControlLeft", "ControlRight":
kb.HasCTRL(true)
case "Alt", "AltLeft", "AltRight":
kb.HasALT(true)
case "Super", "Meta", "MetaLeft", "MetaRight":
kb.HasSuper(true)
default:
keyCode, ok := KeyboardEvents[input.Key]
if !ok {
slog.Warn("Could not parse keyboard input", "key", input.Key)
continue
}
kb.SetKeys(keyCode)
}
switch input.Action {
case KeyPress:
err = kb.Press()
case KeyRelease:
err = kb.Release()
}
if err != nil {
return fmt.Errorf("failed to run key event: %w", err)
}
time.Sleep(time.Microsecond * 10)
}
return nil
}
var KeyboardEvents = map[string]int{
"Escape": keybd_event.VK_ESC,
"Digit1": keybd_event.VK_1,
"Digit2": keybd_event.VK_2,
"Digit3": keybd_event.VK_3,
"Digit4": keybd_event.VK_4,
"Digit5": keybd_event.VK_5,
"Digit6": keybd_event.VK_6,
"Digit7": keybd_event.VK_7,
"Digit8": keybd_event.VK_8,
"Digit9": keybd_event.VK_9,
"Digit0": keybd_event.VK_0,
"KeyQ": keybd_event.VK_Q,
"KeyW": keybd_event.VK_W,
"KeyE": keybd_event.VK_E,
"KeyR": keybd_event.VK_R,
"KeyT": keybd_event.VK_T,
"KeyY": keybd_event.VK_Y,
"KeyU": keybd_event.VK_U,
"KeyI": keybd_event.VK_I,
"KeyO": keybd_event.VK_O,
"KeyP": keybd_event.VK_P,
"KeyA": keybd_event.VK_A,
"KeyS": keybd_event.VK_S,
"KeyD": keybd_event.VK_D,
"KeyF": keybd_event.VK_F,
"KeyG": keybd_event.VK_G,
"KeyH": keybd_event.VK_H,
"KeyJ": keybd_event.VK_J,
"KeyK": keybd_event.VK_K,
"KeyL": keybd_event.VK_L,
"KeyZ": keybd_event.VK_Z,
"KeyX": keybd_event.VK_X,
"KeyC": keybd_event.VK_C,
"KeyV": keybd_event.VK_V,
"KeyB": keybd_event.VK_B,
"KeyN": keybd_event.VK_N,
"KeyM": keybd_event.VK_M,
"F1": keybd_event.VK_F1,
"F2": keybd_event.VK_F2,
"F3": keybd_event.VK_F3,
"F4": keybd_event.VK_F4,
"F5": keybd_event.VK_F5,
"F6": keybd_event.VK_F6,
"F7": keybd_event.VK_F7,
"F8": keybd_event.VK_F8,
"F9": keybd_event.VK_F9,
"F10": keybd_event.VK_F10,
"F11": keybd_event.VK_F11,
"F12": keybd_event.VK_F12,
"F13": keybd_event.VK_F13,
"F14": keybd_event.VK_F14,
"F15": keybd_event.VK_F15,
"F16": keybd_event.VK_F16,
"F17": keybd_event.VK_F17,
"F18": keybd_event.VK_F18,
"F19": keybd_event.VK_F19,
"F20": keybd_event.VK_F20,
"F21": keybd_event.VK_F21,
"F22": keybd_event.VK_F22,
"F23": keybd_event.VK_F23,
"F24": keybd_event.VK_F24,
"NumLock": keybd_event.VK_NUMLOCK,
"ScrollLock": keybd_event.VK_SCROLLLOCK,
"CapsLock": keybd_event.VK_CAPSLOCK,
"Minus": keybd_event.VK_SP2,
"Equal": keybd_event.VK_SP3,
"Backspace": keybd_event.VK_BACKSPACE,
"Tab": keybd_event.VK_TAB,
"BracketLeft": keybd_event.VK_SP4,
"BracketRight": keybd_event.VK_SP5,
"Enter": keybd_event.VK_ENTER,
"Semicolon": keybd_event.VK_SP6,
"Quote": keybd_event.VK_SP7,
"Backquote": keybd_event.VK_SP1,
"Backslash": keybd_event.VK_SP8,
"Comma": keybd_event.VK_SP9,
"Period": keybd_event.VK_SP10,
"Slash": keybd_event.VK_SP11,
"IntlBackslash": keybd_event.VK_SP12,
"NumpadMultiply": keybd_event.VK_KPASTERISK,
"NumpadAdd": keybd_event.VK_KPPLUS,
"NumpadSubtract": keybd_event.VK_KPMINUS,
"NumpadDecimal": keybd_event.VK_KPDOT,
"Space": keybd_event.VK_SPACE,
"Numpad0": keybd_event.VK_KP0,
"Numpad1": keybd_event.VK_KP1,
"Numpad2": keybd_event.VK_KP2,
"Numpad3": keybd_event.VK_KP3,
"Numpad4": keybd_event.VK_KP4,
"Numpad5": keybd_event.VK_KP5,
"Numpad6": keybd_event.VK_KP6,
"Numpad7": keybd_event.VK_KP7,
"Numpad8": keybd_event.VK_KP8,
"Numpad9": keybd_event.VK_KP9,
"PageUp": keybd_event.VK_PAGEUP,
"PageDown": keybd_event.VK_PAGEDOWN,
"End": keybd_event.VK_END,
"Home": keybd_event.VK_HOME,
"ArrowLeft": keybd_event.VK_LEFT,
"ArrowUp": keybd_event.VK_UP,
"ArrowRight": keybd_event.VK_RIGHT,
"ArrowDown": keybd_event.VK_DOWN,
"PrintScreen": keybd_event.VK_PRINT,
"Insert": keybd_event.VK_INSERT,
"Delete": keybd_event.VK_DELETE,
"Help": keybd_event.VK_HELP,
"BrowserBack": keybd_event.VK_BACK,
"Pause": keybd_event.VK_PAUSE,
"Lang1": keybd_event.VK_HANGUEL,
"Lang2": keybd_event.VK_HANJA,
}
-129
View File
@@ -1,129 +0,0 @@
package pkg
import "github.com/micmonay/keybd_event"
var KeyboardEvents = map[string]int{
"VK_SP1": keybd_event.VK_SP1,
"VK_SP2": keybd_event.VK_SP2,
"VK_SP3": keybd_event.VK_SP3,
"VK_SP4": keybd_event.VK_SP4,
"VK_SP5": keybd_event.VK_SP5,
"VK_SP6": keybd_event.VK_SP6,
"VK_SP7": keybd_event.VK_SP7,
"VK_SP8": keybd_event.VK_SP8,
"VK_SP9": keybd_event.VK_SP9,
"VK_SP10": keybd_event.VK_SP10,
"VK_SP11": keybd_event.VK_SP11,
"VK_SP12": keybd_event.VK_SP12,
"VK_ESC": keybd_event.VK_ESC,
"VK_1": keybd_event.VK_1,
"VK_2": keybd_event.VK_2,
"VK_3": keybd_event.VK_3,
"VK_4": keybd_event.VK_4,
"VK_5": keybd_event.VK_5,
"VK_6": keybd_event.VK_6,
"VK_7": keybd_event.VK_7,
"VK_8": keybd_event.VK_8,
"VK_9": keybd_event.VK_9,
"VK_0": keybd_event.VK_0,
"VK_Q": keybd_event.VK_Q,
"VK_W": keybd_event.VK_W,
"VK_E": keybd_event.VK_E,
"VK_R": keybd_event.VK_R,
"VK_T": keybd_event.VK_T,
"VK_Y": keybd_event.VK_Y,
"VK_U": keybd_event.VK_U,
"VK_I": keybd_event.VK_I,
"VK_O": keybd_event.VK_O,
"VK_P": keybd_event.VK_P,
"VK_A": keybd_event.VK_A,
"VK_S": keybd_event.VK_S,
"VK_D": keybd_event.VK_D,
"VK_F": keybd_event.VK_F,
"VK_G": keybd_event.VK_G,
"VK_H": keybd_event.VK_H,
"VK_J": keybd_event.VK_J,
"VK_K": keybd_event.VK_K,
"VK_L": keybd_event.VK_L,
"VK_Z": keybd_event.VK_Z,
"VK_X": keybd_event.VK_X,
"VK_C": keybd_event.VK_C,
"VK_V": keybd_event.VK_V,
"VK_B": keybd_event.VK_B,
"VK_N": keybd_event.VK_N,
"VK_M": keybd_event.VK_M,
"VK_F1": keybd_event.VK_F1,
"VK_F2": keybd_event.VK_F2,
"VK_F3": keybd_event.VK_F3,
"VK_F4": keybd_event.VK_F4,
"VK_F5": keybd_event.VK_F5,
"VK_F6": keybd_event.VK_F6,
"VK_F7": keybd_event.VK_F7,
"VK_F8": keybd_event.VK_F8,
"VK_F9": keybd_event.VK_F9,
"VK_F10": keybd_event.VK_F10,
"VK_F11": keybd_event.VK_F11,
"VK_F12": keybd_event.VK_F12,
"VK_F13": keybd_event.VK_F13,
"VK_F14": keybd_event.VK_F14,
"VK_F15": keybd_event.VK_F15,
"VK_F16": keybd_event.VK_F16,
"VK_F17": keybd_event.VK_F17,
"VK_F18": keybd_event.VK_F18,
"VK_F19": keybd_event.VK_F19,
"VK_F20": keybd_event.VK_F20,
"VK_F21": keybd_event.VK_F21,
"VK_F22": keybd_event.VK_F22,
"VK_F23": keybd_event.VK_F23,
"VK_F24": keybd_event.VK_F24,
"VK_NUMLOCK": keybd_event.VK_NUMLOCK,
"VK_SCROLLLOCK": keybd_event.VK_SCROLLLOCK,
"VK_RESERVED": keybd_event.VK_RESERVED,
"VK_MINUS": keybd_event.VK_MINUS,
"VK_EQUAL": keybd_event.VK_EQUAL,
"VK_BACKSPACE": keybd_event.VK_BACKSPACE,
"VK_TAB": keybd_event.VK_TAB,
"VK_LEFTBRACE": keybd_event.VK_LEFTBRACE,
"VK_RIGHTBRACE": keybd_event.VK_RIGHTBRACE,
"VK_ENTER": keybd_event.VK_ENTER,
"VK_SEMICOLON": keybd_event.VK_SEMICOLON,
"VK_APOSTROPHE": keybd_event.VK_APOSTROPHE,
"VK_GRAVE": keybd_event.VK_GRAVE,
"VK_BACKSLASH": keybd_event.VK_BACKSLASH,
"VK_COMMA": keybd_event.VK_COMMA,
"VK_DOT": keybd_event.VK_DOT,
"VK_SLASH": keybd_event.VK_SLASH,
"VK_KPASTERISK": keybd_event.VK_KPASTERISK,
"VK_SPACE": keybd_event.VK_SPACE,
"VK_CAPSLOCK": keybd_event.VK_CAPSLOCK,
"VK_KP0": keybd_event.VK_KP0,
"VK_KP1": keybd_event.VK_KP1,
"VK_KP2": keybd_event.VK_KP2,
"VK_KP3": keybd_event.VK_KP3,
"VK_KP4": keybd_event.VK_KP4,
"VK_KP5": keybd_event.VK_KP5,
"VK_KP6": keybd_event.VK_KP6,
"VK_KP7": keybd_event.VK_KP7,
"VK_KP8": keybd_event.VK_KP8,
"VK_KP9": keybd_event.VK_KP9,
"VK_KPMINUS": keybd_event.VK_KPMINUS,
"VK_KPPLUS": keybd_event.VK_KPPLUS,
"VK_KPDOT": keybd_event.VK_KPDOT,
"VK_CANCEL": keybd_event.VK_CANCEL,
"VK_BACK": keybd_event.VK_BACK,
"VK_PAUSE": keybd_event.VK_PAUSE,
"VK_HANGUEL": keybd_event.VK_HANGUEL,
"VK_HANJA": keybd_event.VK_HANJA,
"VK_PAGEUP": keybd_event.VK_PAGEUP,
"VK_PAGEDOWN": keybd_event.VK_PAGEDOWN,
"VK_END": keybd_event.VK_END,
"VK_HOME": keybd_event.VK_HOME,
"VK_LEFT": keybd_event.VK_LEFT,
"VK_UP": keybd_event.VK_UP,
"VK_RIGHT": keybd_event.VK_RIGHT,
"VK_DOWN": keybd_event.VK_DOWN,
"VK_PRINT": keybd_event.VK_PRINT,
"VK_INSERT": keybd_event.VK_INSERT,
"VK_DELETE": keybd_event.VK_DELETE,
"VK_HELP": keybd_event.VK_HELP,
}
+22 -75
View File
@@ -1,93 +1,23 @@
package pkg package pkg
import ( import (
"bytes"
"context"
"errors" "errors"
"fmt" "fmt"
"net" "log/slog"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"strings" "strings"
"time" "time"
"plg-mudics/display/browser"
"plg-mudics/shared" "plg-mudics/shared"
"github.com/micmonay/keybd_event"
) )
func GetDeviceIp() (string, error) {
addrs, err := net.InterfaceAddrs()
if err != nil {
return "", fmt.Errorf("failed to get network interfaces: %w", err)
}
for _, addr := range addrs {
ipNet, ok := addr.(*net.IPNet)
if ok && !ipNet.IP.IsLoopback() && ipNet.IP.To4() != nil {
return ipNet.IP.String(), nil
}
}
return "", fmt.Errorf("no suitable IP address found")
}
func GetDeviceMac() (string, error) {
interfaces, err := net.Interfaces()
if err != nil {
return "", fmt.Errorf("failed to get network interfaces: %w", err)
}
for _, interf := range interfaces {
mac := interf.HardwareAddr.String()
if mac != "" {
return mac, nil
}
}
return "", fmt.Errorf("no suitable MAC address found")
}
type KeyAction int
const (
KeyPress KeyAction = iota
KeyRelease
)
type Input struct {
Key int
Action KeyAction
}
func KeyboardInput(inputs []Input) error {
var err error
kb, err := keybd_event.NewKeyBonding()
if err != nil {
return fmt.Errorf("failed to create key bonding: %w", err)
}
for _, input := range inputs {
kb.SetKeys(input.Key)
switch input.Action {
case KeyPress:
err = kb.Press()
case KeyRelease:
err = kb.Release()
}
if err != nil {
return fmt.Errorf("failed to run key event: %w", err)
}
time.Sleep(time.Microsecond * 100)
}
return nil
}
func TakeScreenshot() (string, error) { func TakeScreenshot() (string, error) {
tempFilePath := filepath.Join(os.TempDir(), fmt.Sprintf("screenshot_%d.png", time.Now().Unix())) tempFilePath := filepath.Join(os.TempDir(), fmt.Sprintf("screenshot_%d.jpg", time.Now().Unix()))
cmds := []*exec.Cmd{ cmds := []*exec.Cmd{
exec.Command("gnome-screenshot", "-f", tempFilePath), exec.Command("gnome-screenshot", "-f", tempFilePath),
@@ -148,3 +78,20 @@ func ResolveStorageFilePath(pathParam string) (string, bool, error) {
return fullPath, true, nil return fullPath, true, nil
} }
func ShowHTML(html string) error {
ResetView()
var templateBuffer bytes.Buffer
_ = htmlTemplate(html).Render(context.Background(), &templateBuffer)
err := browser.Browser.OpenHTML(templateBuffer.String())
return err
}
func ResetView() {
err := fileHandler.closeRunningProgram()
if err != nil {
slog.Error("Failed to close running program", "error", err)
}
}
+310
View File
@@ -0,0 +1,310 @@
package pkg
import "strings"
templ basicTemplate() {
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>PLG MuDiCS Display</title>
<style>
:root {
--background-color: black;
--foreground-color: oklch(92.3% 0.003 48.717);
--font-size: 5rem;
}
body {
display: flex;
justify-content: center;
/* centers horizontally */
align-items: center;
/* centers vertically */
width: 100vw;
/* Viewport width */
height: 100vh;
/* Viewport height */
margin: 0;
padding: 0;
overflow: hidden;
background-color: var(--background-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';
cursor: none;
}
video,
img {
width: 100vw;
/* Viewport width */
height: 100vh;
/* Viewport height */
object-fit: contain;
}
p,
li {
font-size: var(--font-size);
line-height: 1.2;
text-wrap: balance;
max-width: 90vw;
word-break: break-word;
margin: 0 0 calc(var(--font-size) * 0.4) 0;
}
ul,
ol {
padding-left: calc(var(--font-size)*1.5);
}
</style>
</head>
<bod>
{ children... }
</bod>
</html>
}
templ videoTemplate(path string) {
@basicTemplate() {
<video autoplay>
<source src={ "file://" + path } type="video/mp4"/>
</video>
}
}
templ htmlTemplate(html string) {
@basicTemplate() {
@templ.Raw(html)
}
}
templ imageTemplate(path string) {
@basicTemplate() {
<img src={ "file://" + path }/>
}
}
templ deviceInfoTemplate(ip string, mac string, showQR bool) {
@basicTemplate() {
<div style="width: 100vw; height: 100vh; display: flex; flex-direction: row; justify-content: space-between;">
<div
style="display: flex; flex-direction: column; gap: 1rem; justify-content: end; padding: 2rem; font-size: 4rem;"
>
{ ip }
<span style="text-transform: uppercase;">{ mac }</span>
</div>
if showQR {
<div style="display: flex; justify-content: end; align-items: end; padding: 2rem;">
<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;"
src={ "/qr?data=http://" + ip + ":8080" }
alt="QR-Code"
/>
</div>
</div>
}
</div>
<style>
:root {
--splash-bg: transparent !important;
--splash-fade-out-state: paused !important;
--background-color: oklch(21.6% 0.006 56.043);
}
</style>
}
}
templ pdfTemplate(path string, serverOrigin string) {
@basicTemplate() {
<base href={ serverOrigin + "/" }/>
<div
id="pdf"
data-src={ "api/file/" + strings.Split(path, "/.local/share/plg-mudics/display")[1] }
data-lib="static/pdfjs/pdf.min.mjs"
data-worker="static/pdfjs/pdf.worker.min.mjs"
></div>
<style>
html,body,#pdf {
margin:0;
width:100%;
height:100%;
overflow:hidden;
background:#000;
}
#pdf {
display:grid;
place-items:center;
}
#pdf canvas {
grid-area:1/1;
display:block;
}
</style>
<script type="module">
const host=document.querySelector("#pdf");
const resolve=x=>new URL(x,document.baseURI).href;
const P=await import(resolve(host.dataset.lib));
P.GlobalWorkerOptions.workerSrc=resolve(host.dataset.worker);
const pdf=await P.getDocument({
url:resolve(host.dataset.src),
useWasm:false
}).promise;
const cache=new Map();
let currentPage=1;
let wantedPage=1;
let requestNumber=0;
function renderPage(number) {
if(cache.has(number)) return cache.get(number);
const promise=(async()=>{
const page=await pdf.getPage(number);
const original=page.getViewport({scale:1});
const scale=Math.min(
innerWidth/original.width,
innerHeight/original.height
);
// Use 1 on old hardware. Raise to 1.5 for sharper output.
const pixelRatio=1;
const viewport=page.getViewport({
scale:scale*pixelRatio
});
const canvas=document.createElement("canvas");
canvas.width=Math.ceil(viewport.width);
canvas.height=Math.ceil(viewport.height);
canvas.style.width=`${viewport.width/pixelRatio}px`;
canvas.style.height=`${viewport.height/pixelRatio}px`;
const task=page.render({
canvasContext:canvas.getContext("2d"),
viewport
});
await task.promise;
return canvas;
})().catch(error=>{
cache.delete(number);
throw error;
});
cache.set(number,promise);
return promise;
}
async function show(number) {
wantedPage=Math.max(1,Math.min(pdf.numPages,number));
const request=++requestNumber;
const canvas=await renderPage(wantedPage);
// Ignore an obsolete result after multiple fast key presses.
if(request!==requestNumber) return;
// The new canvas is already completely rendered.
host.replaceChildren(canvas);
currentPage=wantedPage;
pruneCache();
preloadNeighbours();
}
function preloadNeighbours() {
const page=currentPage;
requestIdleCallback(async()=>{
if(page+1<=pdf.numPages) {
await renderPage(page+1);
}
if(page-1>=1) {
await renderPage(page-1);
}
},{timeout:250});
}
function pruneCache() {
const keep=new Set([
currentPage-1,
currentPage,
currentPage+1
]);
for(const [number,promise] of cache) {
if(keep.has(number)) continue;
cache.delete(number);
promise.then(canvas=>{
if(!canvas.isConnected) {
canvas.width=0;
canvas.height=0;
}
}).catch(()=>{});
}
}
addEventListener("keydown",event=>{
if(event.key==="ArrowRight") {
event.preventDefault();
show(wantedPage+1);
} else if(event.key==="ArrowLeft") {
event.preventDefault();
show(wantedPage-1);
}
});
addEventListener("resize",()=>{
cache.clear();
show(currentPage);
});
window.pdfViewer={
page:()=>currentPage,
count:()=>pdf.numPages,
show
};
await show(1);
</script>
}
}
templ startScreenTemplate(splashScreenHtml string, ip string, mac string, qrPath string) {
@basicTemplate() {
<div style="width: 100vw; height: 100vh; display: flex; flex-direction: row; justify-content: space-between;">
<div
style="display: flex; flex-direction: column; gap: 1rem; justify-content: end; padding: 2rem; font-size: 4rem;"
>
{ ip }
<span style="text-transform: uppercase;">{ mac }</span>
</div>
if qrPath != "" {
<div style="display: flex; justify-content: end; align-items: end; padding: 2rem;">
<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;"
src={ "file://" + qrPath }
alt="QR-Code"
/>
</div>
</div>
}
</div>
@templ.Raw(splashScreenHtml)
<style>
:root {
--splash-bg: transparent !important;
--splash-fade-out-state: paused !important;
--background-color: oklch(21.6% 0.006 56.043);
}
</style>
}
}
+117
View File
@@ -0,0 +1,117 @@
package pkg
import (
"bytes"
"context"
"fmt"
"log/slog"
"os"
"os/exec"
"path/filepath"
"plg-mudics/shared"
"syscall"
"github.com/gabriel-vasile/mimetype"
"plg-mudics/display/browser"
)
var fileHandler fileHandlerType = fileHandlerType{}
type fileHandlerType struct {
runningProgram *exec.Cmd
}
func OpenFile(path string) error {
ResetView()
mType, err := mimetype.DetectFile(path)
if err != nil {
return fmt.Errorf("detect mime type of file %q: %w", path, err)
}
switch mType.String() {
case "video/mp4":
var templateBuffer bytes.Buffer
_ = videoTemplate(path).Render(context.Background(), &templateBuffer)
err = browser.Browser.OpenHTML(templateBuffer.String())
case "image/jpeg", "image/png", "image/gif":
var templateBuffer bytes.Buffer
_ = imageTemplate(path).Render(context.Background(), &templateBuffer)
err = browser.Browser.OpenHTML(templateBuffer.String())
case "application/pdf":
var templateBuffer bytes.Buffer
err = pdfTemplate(path, "http://127.0.0.1:1323").Render(context.Background(), &templateBuffer)
if err == nil {
err = browser.Browser.OpenHTML(templateBuffer.String())
}
case "application/vnd.openxmlformats-officedocument.presentationml.presentation", "application/vnd.oasis.opendocument.presentation":
err = fileHandler.openFileWithApp(path)
default:
return fmt.Errorf("unsupported file type: %s", mType.String())
}
if err != nil {
return fmt.Errorf("failed to open file: %w", err)
}
return nil
}
func (fh *fileHandlerType) openFileWithApp(path string) error {
var err error
mType, err := mimetype.DetectFile(path)
if err != nil {
return fmt.Errorf("failed to detect mime type: %w", err)
}
switch mType.String() {
case "application/vnd.openxmlformats-officedocument.presentationml.presentation", "application/vnd.oasis.opendocument.presentation":
err = fh.openLibreoffice(path)
if err != nil {
return err
}
default:
return fmt.Errorf("unsupported file type: %s", mType.String())
}
fh.runningProgram.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
result := shared.RunShellCommandNonBlocking(fh.runningProgram)
if result.ExitCode != 0 {
return fmt.Errorf("could not open pdf: %s (%d)", result.Stderr, result.ExitCode)
}
return nil
}
func (fh *fileHandlerType) openLibreoffice(path string) error {
// yes, we need this weird workaround to delete lock files since libreoffice
// doesn't expose an option to ignore them or prevent their creation
// the --view argument for some reason doesn't work with --show
parent := filepath.Dir(path)
cmd := exec.Command("find", parent, "-name", ".~lock*", "-type", "f", "-delete")
result := shared.RunShellCommand(cmd)
if result.ExitCode != 0 {
slog.Warn("could not remove lock files", "path", parent, "stderr", result.Stderr, "exitCode", result.ExitCode)
}
tempDirPath, err := os.MkdirTemp("", "plg-mudics-program-profile-")
if err != nil {
return fmt.Errorf("failed to create temporary profile directory: %w", err)
}
fh.runningProgram = exec.Command("soffice", "--show", path, "--nologo", "--norestore", fmt.Sprintf("-env:UserInstallation=file://%s", tempDirPath))
return nil
}
func (fh *fileHandlerType) closeRunningProgram() error {
if fh.runningProgram == nil {
return nil
}
err := syscall.Kill(-fh.runningProgram.Process.Pid, syscall.SIGTERM)
fh.runningProgram = nil
return err
}
+120
View File
@@ -0,0 +1,120 @@
package pkg
import (
"bytes"
"context"
"fmt"
"image/color"
"net"
"os"
"plg-mudics/shared"
"strings"
"plg-mudics/display/browser"
"github.com/skip2/go-qrcode"
)
func OpenStartScreen() error {
var err error
raw := shared.RawSplashScreenTemplate
html := strings.ReplaceAll(raw, "%%APP-VERSION%%", shared.Version)
ip, err := getDeviceIp()
if err != nil {
return fmt.Errorf("get device IP: %w", err)
}
mac, err := getDeviceMac()
if err != nil {
return fmt.Errorf("get device MAC address: %w", err)
}
port := 8080
showQrCode := !isPortFree(port)
qrCodePath := ""
if showQrCode {
qrCodePath, err = generateQRCode(fmt.Sprintf("http://%s:%d", ip, port))
if err != nil {
return fmt.Errorf("generate QR code: %w", err)
}
}
var templateBuffer bytes.Buffer
_ = startScreenTemplate(html, ip, mac, qrCodePath).Render(context.Background(), &templateBuffer)
err = browser.Browser.OpenHTML(templateBuffer.String())
if err != nil {
return fmt.Errorf("open start screen in browser: %w", err)
}
return nil
}
func getDeviceIp() (string, error) {
addrs, err := net.InterfaceAddrs()
if err != nil {
return "", fmt.Errorf("failed to get network interfaces: %w", err)
}
for _, addr := range addrs {
ipNet, ok := addr.(*net.IPNet)
if ok && !ipNet.IP.IsLoopback() && ipNet.IP.To4() != nil {
return ipNet.IP.String(), nil
}
}
return "", fmt.Errorf("no suitable IP address found")
}
func isPortFree(port int) bool {
addr := fmt.Sprintf("127.0.0.1:%d", port)
l, err := net.Listen("tcp", addr)
if err != nil {
return false
}
_ = l.Close()
return true
}
func getDeviceMac() (string, error) {
interfaces, err := net.Interfaces()
if err != nil {
return "", fmt.Errorf("failed to get network interfaces: %w", err)
}
for _, interf := range interfaces {
mac := interf.HardwareAddr.String()
if mac != "" {
return mac, nil
}
}
return "", fmt.Errorf("no suitable MAC address found")
}
func generateQRCode(data string) (string, error) {
qr, err := qrcode.New(data, qrcode.Medium)
if err != nil {
return "", fmt.Errorf("could not generate qr code: %w", err)
}
qr.DisableBorder = true
qr.ForegroundColor = color.RGBA{R: 0x1c, G: 0x19, B: 0x17, A: 0xff}
qr.BackgroundColor = color.RGBA{R: 0xe7, G: 0xe5, B: 0xe4, A: 0xff}
png, err := qr.PNG(-1)
if err != nil {
return "", fmt.Errorf("could not render qr code: %w", err)
}
file, err := os.CreateTemp("", "mudics-qr-code-*.png")
if err != nil {
return "", fmt.Errorf("could not save qr code: %w", err)
}
defer func() { _ = file.Close() }()
_, err = file.Write(png)
if err != nil {
return "", fmt.Errorf("could not write qr code to file: %w", err)
}
return file.Name(), nil
}
+22
View File
@@ -0,0 +1,22 @@
meta {
name: openWebsite
type: http
seq: 10
}
patch {
url: 127.0.0.1:1323/api/openWebsite
body: json
auth: inherit
}
body:json {
{
"url": "https://example.com"
}
}
settings {
encodeUrl: true
timeout: 0
}
-12
View File
@@ -1,12 +0,0 @@
package web
import (
"embed"
"io/fs"
)
//go:embed all:static
var staticDir embed.FS
// BuildDirFS contains the embedded dist directory files (without the "build" prefix)
var StaticDirFS, _ = fs.Sub(staticDir, "static")
+38 -176
View File
@@ -1,52 +1,34 @@
package web package web
import ( import (
"bytes"
"context"
"errors" "errors"
"fmt" "fmt"
"image/color"
"io" "io"
"log/slog" "log/slog"
"net"
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
shared "plg-mudics/shared" shared "plg-mudics/shared"
"strings"
"github.com/gabriel-vasile/mimetype"
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware" "github.com/labstack/echo/v4/middleware"
"github.com/skip2/go-qrcode"
"plg-mudics/display/browser"
"plg-mudics/display/internal/pdfjs"
"plg-mudics/display/pkg" "plg-mudics/display/pkg"
) )
var version string func StartWebServer(port string) {
var sseConnection chan string
func StartWebServer(v string, port string) {
version = v
e := echo.New() e := echo.New()
e.GET("/", indexRoute) pdfJSGroup := e.Group("/static/pdfjs")
e.GET("/sse", sseRoute) pdfJSGroup.Use(middleware.CORS())
e.GET("/splash", func(ctx echo.Context) error { pdfJSGroup.StaticFS(
html := shared.SplashScreenTemplate "/",
html = strings.ReplaceAll(html, "%%APP-VERSION%%", version) echo.MustSubFS(pdfjs.Files, "node_modules/pdfjs-dist/build"),
return ctx.HTML(http.StatusOK, html) )
})
e.GET("/qr", qrRoute)
staticGroup := e.Group("/static")
staticGroup.Use(middleware.StaticWithConfig(middleware.StaticConfig{
Filesystem: http.FS(StaticDirFS),
HTML5: true,
}))
apiGroup := e.Group("/api") apiGroup := e.Group("/api")
apiGroup.Use(middleware.CORS()) apiGroup.Use(middleware.CORS())
@@ -55,6 +37,7 @@ func StartWebServer(v string, port string) {
apiGroup.PATCH("/keyboardInput", keyboardInputRoute) apiGroup.PATCH("/keyboardInput", keyboardInputRoute)
apiGroup.PATCH("/showHTML", showHTMLRoute) apiGroup.PATCH("/showHTML", showHTMLRoute)
apiGroup.PATCH("/takeScreenshot", takeScreenshotRoute) apiGroup.PATCH("/takeScreenshot", takeScreenshotRoute)
apiGroup.PATCH("/openWebsite", openWebsiteRoute)
fileGroup := apiGroup.Group("/file") fileGroup := apiGroup.Group("/file")
fileGroup.Use(extractFilePathMiddleware) fileGroup.Use(extractFilePathMiddleware)
@@ -69,85 +52,6 @@ func StartWebServer(v string, port string) {
} }
} }
func indexRoute(ctx echo.Context) error {
return indexTemplate().Render(ctx.Request().Context(), ctx.Response().Writer)
}
func sseRoute(ctx echo.Context) error {
slog.Info("SSE client connected")
w := ctx.Response()
w.Header().Set("Content-Type", "text/event-stream")
w.Header().Set("Cache-Control", "no-cache")
w.Header().Set("Connection", "keep-alive")
w.WriteHeader(http.StatusOK)
flusher, _ := w.Writer.(http.Flusher)
sseConnection = make(chan string)
// init display
ip, err := pkg.GetDeviceIp()
if err != nil {
slog.Error("Failed to get device IP address", "error", err)
}
mac, err := pkg.GetDeviceMac()
if err != nil {
slog.Error("Failed to get device MAC address", "error", err)
}
showQR := !isPortFree(8080)
var status bytes.Buffer
deviceInfoTemplate(ip, mac, showQR).Render(context.Background(), &status)
connectedEvent := Event{
Data: status.Bytes(),
}
connectedEvent.MarshalTo(w)
flusher.Flush()
for {
select {
case <-ctx.Request().Context().Done():
slog.Info("SSE client disconnected")
sseConnection = nil
return nil
case event := <-sseConnection:
rawEvent := Event{
Event: []byte(""),
Data: []byte(event),
}
if err := rawEvent.MarshalTo(w); err != nil {
slog.Warn("Error writing to client", "error", err)
return err
}
flusher.Flush()
}
}
}
func qrRoute(c echo.Context) error {
data := c.QueryParam("data")
if data == "" {
return c.String(http.StatusBadRequest, "missing data")
}
qr, err := qrcode.New(data, qrcode.Medium)
if err != nil {
return c.String(http.StatusInternalServerError, "could not generate qr")
}
qr.DisableBorder = true
qr.ForegroundColor = color.RGBA{R: 0x1c, G: 0x19, B: 0x17, A: 0xff}
qr.BackgroundColor = color.RGBA{R: 0xe7, G: 0xe5, B: 0xe4, A: 0xff}
png, err := qr.PNG(-1)
if err != nil {
return c.String(http.StatusInternalServerError, "could not encode png")
}
return c.Blob(http.StatusOK, "image/png", png)
}
func extractFilePathMiddleware(next echo.HandlerFunc) echo.HandlerFunc { func extractFilePathMiddleware(next echo.HandlerFunc) echo.HandlerFunc {
return func(ctx echo.Context) error { return func(ctx echo.Context) error {
raw := ctx.Param("path") raw := ctx.Param("path")
@@ -216,12 +120,6 @@ func keyboardInputRoute(ctx echo.Context) error {
return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: fmt.Sprintf("Invalid action: %s", input.Action)}) return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: fmt.Sprintf("Invalid action: %s", input.Action)})
} }
code, ok := pkg.KeyboardEvents[input.Key]
if !ok {
slog.Error("Unsupported key", "key", input.Key)
return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: fmt.Sprintf("Unsupported key: %s", input.Key)})
}
var action pkg.KeyAction var action pkg.KeyAction
if input.Action == "press" { if input.Action == "press" {
action = pkg.KeyPress action = pkg.KeyPress
@@ -231,7 +129,7 @@ func keyboardInputRoute(ctx echo.Context) error {
} }
inputs = append(inputs, pkg.Input{ inputs = append(inputs, pkg.Input{
Key: code, Key: input.Key,
Action: action, Action: action,
}) })
} }
@@ -272,7 +170,10 @@ func uploadFileRoute(ctx echo.Context) error {
slog.Error("Failed to close file", "file", fullPath, "error", fileCloseErr) slog.Error("Failed to close file", "file", fullPath, "error", fileCloseErr)
} }
if err != nil { if err != nil {
os.Remove(fullPath) err = os.Remove(fullPath)
if err != nil {
slog.Warn("could not remove broken file", "file", fullPath, "error", err)
}
} }
}() }()
@@ -301,14 +202,7 @@ func downloadFileRoute(ctx echo.Context) error {
slog.Info("Serving file for download", "path", fullPath) slog.Info("Serving file for download", "path", fullPath)
file, err := os.Open(fullPath) return ctx.Attachment(fullPath, filepath.Base(fullPath))
if err != nil {
slog.Error("Failed to open file", "file", fullPath, "error", err)
return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Failed to open file"})
}
defer file.Close()
return ctx.Stream(http.StatusOK, "application/octet-stream", file)
} }
func openFileRoute(ctx echo.Context) error { func openFileRoute(ctx echo.Context) error {
@@ -321,38 +215,7 @@ func openFileRoute(ctx echo.Context) error {
return ctx.JSON(http.StatusNotFound, shared.ErrorResponse{Description: "File not found"}) return ctx.JSON(http.StatusNotFound, shared.ErrorResponse{Description: "File not found"})
} }
if sseConnection == nil { err = pkg.OpenFile(fullPath)
return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Cant connect to display browser client"})
}
err = resetView()
if err != nil {
slog.Error("Failed to reset view", "error", err)
}
mType, err := mimetype.DetectFile(fullPath)
if err != nil {
slog.Error("Failed to detect mime type", "file", pathParam, "error", err)
return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Failed to detect file type"})
}
switch mType.String() {
case "video/mp4":
var templateBuffer bytes.Buffer
videoTemplate(pathParam).Render(context.Background(), &templateBuffer)
sseConnection <- templateBuffer.String()
case "image/jpeg", "image/png", "image/gif":
var templateBuffer bytes.Buffer
imageTemplate(pathParam).Render(context.Background(), &templateBuffer)
sseConnection <- templateBuffer.String()
case "application/pdf", "application/vnd.openxmlformats-officedocument.presentationml.presentation", "application/vnd.oasis.opendocument.presentation":
err = pkg.FileHandler.OpenFile(fullPath)
default:
slog.Info("Unsupported file type", "type", mType)
return ctx.JSON(http.StatusUnsupportedMediaType, shared.ErrorResponse{Description: "Unsupported file type: " + mType.String()})
}
if err != nil { if err != nil {
slog.Error("Failed to open file", "file", pathParam, "error", err) slog.Error("Failed to open file", "file", pathParam, "error", err)
return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Failed to open file"}) return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Failed to open file"})
@@ -371,13 +234,12 @@ func showHTMLRoute(ctx echo.Context) error {
return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: shared.BadRequestDescription}) return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: shared.BadRequestDescription})
} }
err := resetView() err := pkg.ShowHTML(request.HTML)
if err != nil { if err != nil {
slog.Error("Failed to reset view", "error", err) slog.Error("Failed to open html", "error", err)
return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Failed to open html"})
} }
sseConnection <- request.HTML
slog.Info("HTML content sent to client") slog.Info("HTML content sent to client")
return ctx.JSON(http.StatusOK, struct{}{}) return ctx.JSON(http.StatusOK, struct{}{})
} }
@@ -385,7 +247,7 @@ func showHTMLRoute(ctx echo.Context) error {
func pingRoute(ctx echo.Context) error { func pingRoute(ctx echo.Context) error {
return ctx.JSON(http.StatusOK, struct { return ctx.JSON(http.StatusOK, struct {
Version string `json:"version"` Version string `json:"version"`
}{Version: version}) }{Version: shared.Version})
} }
func takeScreenshotRoute(ctx echo.Context) error { func takeScreenshotRoute(ctx echo.Context) error {
@@ -428,24 +290,24 @@ func previewRoute(ctx echo.Context) error {
return ctx.File(outputFilePath) return ctx.File(outputFilePath)
} }
// Reset previous file views so they dont collide with the new one func openWebsiteRoute(ctx echo.Context) error {
func resetView() error { var err error
err := pkg.FileHandler.CloseRunningProgram()
var request struct {
URL string `json:"url"`
}
if err := ctx.Bind(&request); err != nil {
slog.Error("Failed to parse website input", "error", err)
return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: shared.BadRequestDescription})
}
slog.Info("Opening url")
err = browser.Browser.OpenPage(request.URL)
if err != nil { if err != nil {
return fmt.Errorf("failed to close running program: %w", err) slog.Error("Failed to open website", "url", request.URL, "error", err)
return ctx.JSON(http.StatusInternalServerError, shared.ErrorResponse{Description: "Failed to open website"})
} }
sseConnection <- "" return ctx.JSON(http.StatusOK, struct{}{})
return nil
}
func isPortFree(port int) bool {
addr := fmt.Sprintf("127.0.0.1:%d", port)
l, err := net.Listen("tcp", addr)
if err != nil {
return false
}
_ = l.Close()
return true
} }
-123
View File
@@ -1,123 +0,0 @@
package web
templ indexTemplate() {
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>PLG MuDiCS Display</title>
<script src="/static/htmx.min.js"></script>
<script src="/static/htmx-ext-sse.min.js"></script>
<style>
:root {
--background-color: black;
--foreground-color: oklch(92.3% 0.003 48.717);
--font-size: 5rem;
}
body {
display: flex;
justify-content: center;
/* centers horizontally */
align-items: center;
/* centers vertically */
width: 100vw;
/* Viewport width */
height: 100vh;
/* Viewport height */
margin: 0;
padding: 0;
overflow: hidden;
background-color: var(--background-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';
cursor: none;
}
video,
img,
iframe {
width: 100vw;
/* Viewport width */
height: 100vh;
/* Viewport height */
object-fit: contain;
}
p,
li {
font-size: var(--font-size);
line-height: 1.2;
text-wrap: balance;
max-width: 90vw;
word-break: break-word;
margin: 0 0 calc(var(--font-size) * 0.4) 0;
}
ul,
ol {
padding-left: calc(var(--font-size)*1.5);
}
</style>
<script>
document.addEventListener('keydown', function (event) {
if (event.code === 'Space') {
event.preventDefault();
var video = document.querySelector('video');
if (video) {
if (video.paused) {
video.play();
} else {
video.pause();
}
}
}
});
</script>
</head>
<bod>
<div hx-get="/splash" hx-trigger="load"></div>
<main hx-ext="sse" sse-connect="/sse" sse-swap="message"></main>
</bod>
</html>
}
templ videoTemplate(path string) {
<video autoplay>
<source src={ "/api/file/" + path } type="video/mp4"/>
</video>
}
templ imageTemplate(path string) {
<img src={ "/api/file/" + path }/>
}
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="display: flex; flex-direction: column; gap: 1rem; justify-content: end; padding: 2rem; font-size: 4rem;"
>
{ ip }
<span style="text-transform: uppercase;">{ mac }</span>
</div>
if showQR {
<div style="display: flex; justify-content: end; align-items: end; padding: 2rem;">
<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;"
src={ "/qr?data=http://" + ip + ":8080" }
alt="QR-Code"
/>
</div>
</div>
}
</div>
<style>
:root {
--splash-bg: transparent !important;
--splash-fade-out-state: paused !important;
--background-color: oklch(21.6% 0.006 56.043);
}
</style>
}
-75
View File
@@ -1,75 +0,0 @@
package web
import (
"bytes"
"fmt"
"io"
)
// Event represents Server-Sent Event.
// SSE explanation: https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#event_stream_format
type Event struct {
// ID is used to set the EventSource object's last event ID value.
ID []byte
// Data field is for the message. When the EventSource receives multiple consecutive lines
// that begin with data:, it concatenates them, inserting a newline character between each one.
// Trailing newlines are removed.
Data []byte
// Event is a string identifying the type of event described. If this is specified, an event
// will be dispatched on the browser to the listener for the specified event name; the website
// source code should use addEventListener() to listen for named events. The onmessage handler
// is called if no event name is specified for a message.
Event []byte
// Retry is the reconnection time. If the connection to the server is lost, the browser will
// wait for the specified time before attempting to reconnect. This must be an integer, specifying
// the reconnection time in milliseconds. If a non-integer value is specified, the field is ignored.
Retry []byte
// Comment line can be used to prevent connections from timing out; a server can send a comment
// periodically to keep the connection alive.
Comment []byte
}
// MarshalTo marshals Event to given Writer
func (ev *Event) MarshalTo(w io.Writer) error {
// Marshalling part is taken from: https://github.com/r3labs/sse/blob/c6d5381ee3ca63828b321c16baa008fd6c0b4564/http.go#L16
if len(ev.Data) == 0 && len(ev.Comment) == 0 {
return nil
}
if len(ev.Data) > 0 {
if _, err := fmt.Fprintf(w, "id: %s\n", ev.ID); err != nil {
return err
}
sd := bytes.Split(ev.Data, []byte("\n"))
for i := range sd {
if _, err := fmt.Fprintf(w, "data: %s\n", sd[i]); err != nil {
return err
}
}
if len(ev.Event) > 0 {
if _, err := fmt.Fprintf(w, "event: %s\n", ev.Event); err != nil {
return err
}
}
if len(ev.Retry) > 0 {
if _, err := fmt.Fprintf(w, "retry: %s\n", ev.Retry); err != nil {
return err
}
}
}
if len(ev.Comment) > 0 {
if _, err := fmt.Fprintf(w, ": %s\n", ev.Comment); err != nil {
return err
}
}
if _, err := fmt.Fprint(w, "\n"); err != nil {
return err
}
return nil
}
-1
View File
@@ -1 +0,0 @@
(function(){var g;htmx.defineExtension("sse",{init:function(e){g=e;if(htmx.createEventSource==undefined){htmx.createEventSource=t}},getSelectors:function(){return["[sse-connect]","[data-sse-connect]","[sse-swap]","[data-sse-swap]"]},onEvent:function(e,t){var r=t.target||t.detail.elt;switch(e){case"htmx:beforeCleanupElement":var n=g.getInternalData(r);var s=n.sseEventSource;if(s){g.triggerEvent(r,"htmx:sseClose",{source:s,type:"nodeReplaced"});n.sseEventSource.close()}return;case"htmx:afterProcessNode":i(r)}}});function t(e){return new EventSource(e,{withCredentials:true})}function a(n){if(g.getAttributeValue(n,"sse-swap")){var s=g.getClosestMatch(n,v);if(s==null){return null}var e=g.getInternalData(s);var a=e.sseEventSource;var t=g.getAttributeValue(n,"sse-swap");var r=t.split(",");for(var i=0;i<r.length;i++){const u=r[i].trim();const c=function(e){if(l(s)){return}if(!g.bodyContains(n)){a.removeEventListener(u,c);return}if(!g.triggerEvent(n,"htmx:sseBeforeMessage",e)){return}f(n,e.data);g.triggerEvent(n,"htmx:sseMessage",e)};g.getInternalData(n).sseEventListener=c;a.addEventListener(u,c)}}if(g.getAttributeValue(n,"hx-trigger")){var s=g.getClosestMatch(n,v);if(s==null){return null}var e=g.getInternalData(s);var a=e.sseEventSource;var o=g.getTriggerSpecs(n);o.forEach(function(t){if(t.trigger.slice(0,4)!=="sse:"){return}var r=function(e){if(l(s)){return}if(!g.bodyContains(n)){a.removeEventListener(t.trigger.slice(4),r)}htmx.trigger(n,t.trigger,e);htmx.trigger(n,"htmx:sseMessage",e)};g.getInternalData(n).sseEventListener=r;a.addEventListener(t.trigger.slice(4),r)})}}function i(e,t){if(e==null){return null}if(g.getAttributeValue(e,"sse-connect")){var r=g.getAttributeValue(e,"sse-connect");if(r==null){return}n(e,r,t)}a(e)}function n(r,e,n){var s=htmx.createEventSource(e);s.onerror=function(e){g.triggerErrorEvent(r,"htmx:sseError",{error:e,source:s});if(l(r)){return}if(s.readyState===EventSource.CLOSED){n=n||0;n=Math.max(Math.min(n*2,128),1);var t=n*500;window.setTimeout(function(){i(r,n)},t)}};s.onopen=function(e){g.triggerEvent(r,"htmx:sseOpen",{source:s});if(n&&n>0){const t=r.querySelectorAll("[sse-swap], [data-sse-swap], [hx-trigger], [data-hx-trigger]");for(let e=0;e<t.length;e++){a(t[e])}n=0}};g.getInternalData(r).sseEventSource=s;var t=g.getAttributeValue(r,"sse-close");if(t){s.addEventListener(t,function(){g.triggerEvent(r,"htmx:sseClose",{source:s,type:"message"});s.close()})}}function l(e){if(!g.bodyContains(e)){var t=g.getInternalData(e).sseEventSource;if(t!=undefined){g.triggerEvent(e,"htmx:sseClose",{source:t,type:"nodeMissing"});t.close();return true}}return false}function f(t,r){g.withExtensions(t,function(e){r=e.transformResponse(r,null,t)});var e=g.getSwapSpecification(t);var n=g.getTarget(t);g.swap(n,r,e,{contextElement:t})}function v(e){return g.getInternalData(e).sseEventSource!=null}})();
File diff suppressed because one or more lines are too long
+1 -8
View File
@@ -11,20 +11,13 @@
in { in {
devShells."x86_64-linux".default = pkgs.mkShell { devShells."x86_64-linux".default = pkgs.mkShell {
packages = with pkgs; [ packages = with pkgs; [
gcc
libreoffice libreoffice
ungoogled-chromium ungoogled-chromium
xreader
imagemagick imagemagick
ffmpeg ffmpeg
ghostscript
gnome-screenshot gnome-screenshot
playwright-driver.browsers
]; ];
PLAYWRIGHT_BROWSERS_PATH = pkgs.playwright-driver.browsers;
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "true";
PW_DISABLE_TS_ESM = "true";
}; };
}; };
} }
+10
View File
@@ -1,15 +1,25 @@
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/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
github.com/mdlayher/raw v0.0.0-20190313224157-43dbcdd7739d h1:rjAS0af7FIYCScTtEU5KjIldC6qVaEScUJhABHC+ccM=
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po=
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/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
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/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
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.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
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 h1:E2/AqCUMZGgd73TQkxUMcMla25GB9i/5HOdLr+uH7Vo=
golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54/go.mod h1:hKdjCMrbv9skySur+Nek8Hd0uJ0GuxJIoIX2payrIdQ= 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/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg= golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
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/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+1 -2
View File
@@ -92,20 +92,19 @@
nushell nushell
unzip unzip
iputils iputils
xreader
tree tree
jq jq
# Libraries # Libraries
imagemagick imagemagick
ffmpeg ffmpeg
ghostscript
]; ];
home-manager.users.mudics = { home-manager.users.mudics = {
xfconf.settings = { xfconf.settings = {
xfce4-power-manager."xfce4-power-manager/dpms-enabled" = false; xfce4-power-manager."xfce4-power-manager/dpms-enabled" = false;
xfce4-screensaver."saver/enabled" = false; xfce4-screensaver."saver/enabled" = false;
displays.Notify = 0; # disable popup when connecting new display
}; };
home.stateVersion = "25.05"; home.stateVersion = "25.05";
+1 -1
View File
@@ -6,7 +6,7 @@ import (
) )
//go:embed splash_screen.html //go:embed splash_screen.html
var SplashScreenTemplate string var RawSplashScreenTemplate string
//go:embed version.txt //go:embed version.txt
var versionNotTrimmed string var versionNotTrimmed string
-114
View File
@@ -1,114 +0,0 @@
{
"Escape": "VK_ESC",
"Digit1": "VK_1",
"Digit2": "VK_2",
"Digit3": "VK_3",
"Digit4": "VK_4",
"Digit5": "VK_5",
"Digit6": "VK_6",
"Digit7": "VK_7",
"Digit8": "VK_8",
"Digit9": "VK_9",
"Digit0": "VK_0",
"KeyQ": "VK_Q",
"KeyW": "VK_W",
"KeyE": "VK_E",
"KeyR": "VK_R",
"KeyT": "VK_T",
"KeyY": "VK_Y",
"KeyU": "VK_U",
"KeyI": "VK_I",
"KeyO": "VK_O",
"KeyP": "VK_P",
"KeyA": "VK_A",
"KeyS": "VK_S",
"KeyD": "VK_D",
"KeyF": "VK_F",
"KeyG": "VK_G",
"KeyH": "VK_H",
"KeyJ": "VK_J",
"KeyK": "VK_K",
"KeyL": "VK_L",
"KeyZ": "VK_Z",
"KeyX": "VK_X",
"KeyC": "VK_C",
"KeyV": "VK_V",
"KeyB": "VK_B",
"KeyN": "VK_N",
"KeyM": "VK_M",
"F1": "VK_F1",
"F2": "VK_F2",
"F3": "VK_F3",
"F4": "VK_F4",
"F5": "VK_F5",
"F6": "VK_F6",
"F7": "VK_F7",
"F8": "VK_F8",
"F9": "VK_F9",
"F10": "VK_F10",
"F11": "VK_F11",
"F12": "VK_F12",
"F13": "VK_F13",
"F14": "VK_F14",
"F15": "VK_F15",
"F16": "VK_F16",
"F17": "VK_F17",
"F18": "VK_F18",
"F19": "VK_F19",
"F20": "VK_F20",
"F21": "VK_F21",
"F22": "VK_F22",
"F23": "VK_F23",
"F24": "VK_F24",
"NumLock": "VK_NUMLOCK",
"ScrollLock": "VK_SCROLLLOCK",
"CapsLock": "VK_CAPSLOCK",
"Minus": "VK_SP2",
"Equal": "VK_SP3",
"Backspace": "VK_BACKSPACE",
"Tab": "VK_TAB",
"BracketLeft": "VK_SP4",
"BracketRight": "VK_SP5",
"Enter": "VK_ENTER",
"Semicolon": "VK_SP6",
"Quote": "VK_SP7",
"Backquote": "VK_SP1",
"Backslash": "VK_SP8",
"Comma": "VK_SP9",
"Period": "VK_SP10",
"Slash": "VK_SP11",
"IntlBackslash": "VK_SP12",
"NumpadMultiply": "VK_KPASTERISK",
"NumpadDivide": "VK_KPSLASH",
"NumpadAdd": "VK_KPPLUS",
"NumpadSubtract": "VK_KPMINUS",
"NumpadDecimal": "VK_KPDOT",
"NumpadEnter": "VK_KPENTER",
"Space": "VK_SPACE",
"Numpad0": "VK_KP0",
"Numpad1": "VK_KP1",
"Numpad2": "VK_KP2",
"Numpad3": "VK_KP3",
"Numpad4": "VK_KP4",
"Numpad5": "VK_KP5",
"Numpad6": "VK_KP6",
"Numpad7": "VK_KP7",
"Numpad8": "VK_KP8",
"Numpad9": "VK_KP9",
"PageUp": "VK_PAGEUP",
"PageDown": "VK_PAGEDOWN",
"End": "VK_END",
"Home": "VK_HOME",
"ArrowLeft": "VK_LEFT",
"ArrowUp": "VK_UP",
"ArrowRight": "VK_RIGHT",
"ArrowDown": "VK_DOWN",
"PrintScreen": "VK_PRINT",
"Insert": "VK_INSERT",
"Delete": "VK_DELETE",
"Help": "VK_HELP",
"BrowserBack": "VK_BACK",
"Pause": "VK_PAUSE",
"Lang1": "VK_HANGUEL",
"Lang2": "VK_HANJA"
}
+40 -13
View File
@@ -170,15 +170,8 @@
<span id="version-label" aria-label="Version">%%APP-VERSION%%</span> <span id="version-label" aria-label="Version">%%APP-VERSION%%</span>
<div class="fade-in"> <div class="fade-in cursor-layer" aria-hidden="true">
<div <div class="cursor-x">
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"> <svg class="cursor-y" width="50" height="50" viewBox="0 0 24 24">
<g <g
stroke="#ffffff" stroke="#ffffff"
@@ -223,8 +216,6 @@
--mouse-size: 50px; --mouse-size: 50px;
--mouse-bounce-delay: 5s; --mouse-bounce-delay: 5s;
--mouse-start-x: calc((35 * 100vw) / 1920);
--mouse-start-y: calc((60 * 100vh) / 1080);
--dur-x: 16s; --dur-x: 16s;
--dur-y: 9s; --dur-y: 9s;
@@ -254,8 +245,12 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
z-index: 9999; z-index: 9999;
height: 100vh;
width: 100vw; width: 100dvw;
height: 100dvh;
overflow: hidden;
container: splash / size;
animation-name: splash-fade; animation-name: splash-fade;
animation-duration: 1s; animation-duration: 1s;
@@ -342,7 +337,23 @@
animation: start-button-hover-press 1s ease-in-out 450ms forwards; animation: start-button-hover-press 1s ease-in-out 450ms forwards;
} }
.cursor-layer {
position: absolute;
inset: 0;
overflow: hidden;
pointer-events: none;
--mouse-start-x: calc(100cqw * 35 / 1920);
--mouse-start-y: calc(100cqh * 60 / 1080);
}
.cursor-x { .cursor-x {
position: absolute;
left: calc(50cqw + var(--mouse-start-x));
top: calc(50cqh + var(--mouse-start-y));
width: var(--mouse-size);
height: var(--mouse-size);
animation-name: move-mouse, mouse-bounceX; animation-name: move-mouse, mouse-bounceX;
animation-duration: 1s, var(--dur-x); animation-duration: 1s, var(--dur-x);
animation-delay: 0s, var(--mouse-bounce-delay); animation-delay: 0s, var(--mouse-bounce-delay);
@@ -354,6 +365,10 @@
} }
.cursor-y { .cursor-y {
width: 100%;
height: 100%;
display: block;
animation-name: mouse-bounceY; animation-name: mouse-bounceY;
animation-duration: var(--dur-y); animation-duration: var(--dur-y);
animation-delay: var(--mouse-bounce-delay); animation-delay: var(--mouse-bounce-delay);
@@ -364,6 +379,10 @@
will-change: transform; will-change: transform;
} }
.cursor-y * {
vector-effect: non-scaling-stroke;
}
@keyframes fade-in { @keyframes fade-in {
to { to {
opacity: 1; opacity: 1;
@@ -398,6 +417,10 @@
calc(50cqw - var(--mouse-size) - var(--mouse-start-x)) calc(50cqw - var(--mouse-size) - var(--mouse-start-x))
); );
} }
100% {
transform: translateX(0);
}
} }
@keyframes mouse-bounceY { @keyframes mouse-bounceY {
@@ -414,6 +437,10 @@
calc(50cqh - var(--mouse-size) - var(--mouse-start-y)) calc(50cqh - var(--mouse-size) - var(--mouse-start-y))
); );
} }
100% {
transform: translateY(0);
}
} }
@keyframes start-button-hover-press { @keyframes start-button-hover-press {
+1 -1
View File
@@ -25,7 +25,7 @@
}, },
".odp": { ".odp": {
"display_name": "ODP", "display_name": "ODP",
"mime_type": "application/vnd.oasis.opendocument.presentation" "mime_type": ".odp"
}, },
".pdf": { ".pdf": {
"display_name": "PDF", "display_name": "PDF",
+1 -1
View File
@@ -1 +1 @@
v0.0.15 v0.1.6