From 6d5aa9041f2de1ee080074e7435e02bba4051417 Mon Sep 17 00:00:00 2001 From: E44 <129310925+programmer-44@users.noreply.github.com> Date: Sun, 18 Jan 2026 11:59:14 +0100 Subject: [PATCH] chore(control): add backend of sync, visuals still buggy --- .../src/lib/components/InodeElement.svelte | 14 ++++++-- .../src/lib/ts/file_transfer_handler.ts | 21 ++++++++++- control/frontend/src/routes/FileView.svelte | 36 +++++++++++++++---- 3 files changed, 61 insertions(+), 10 deletions(-) diff --git a/control/frontend/src/lib/components/InodeElement.svelte b/control/frontend/src/lib/components/InodeElement.svelte index 8c8c467..0b539b7 100755 --- a/control/frontend/src/lib/components/InodeElement.svelte +++ b/control/frontend/src/lib/components/InodeElement.svelte @@ -29,7 +29,7 @@ import RefreshPlay from '../svgs/RefreshPlay.svelte'; import { get_file_size_display_string, get_file_type } from '$lib/ts/utils'; import { open_file } from '$lib/ts/api_handler'; - import { run_on_all_selected_displays } from '$lib/ts/stores/displays'; + import { get_display_by_id, run_on_all_selected_displays } from '$lib/ts/stores/displays'; import { get_thumbnail_url } from '$lib/ts/stores/thumbnails'; import { liveQuery, type Observable } from 'dexie'; import { db } from '$lib/ts/database'; @@ -215,7 +215,17 @@ if (!is_loading) is_loading = true; percentage_sum += fod.loading_data.percentage; total_seconds_until_finish += fod.loading_data.seconds_until_finish; - display_data.push(fod.loading_data); + const display = await get_display_by_id(fod.display_id); + if (!display) continue; + const display_data_element = { + loading_data: fod.loading_data, + display_name: display.name + }; + if (fod.loading_data.type === 'sync_download') { + display_data.unshift(display_data_element); // insert sync_download element at beginning + } else { + display_data.push(display_data_element); + } } else { percentage_sum += 100; } diff --git a/control/frontend/src/lib/ts/file_transfer_handler.ts b/control/frontend/src/lib/ts/file_transfer_handler.ts index b8e3d21..300d492 100644 --- a/control/frontend/src/lib/ts/file_transfer_handler.ts +++ b/control/frontend/src/lib/ts/file_transfer_handler.ts @@ -89,13 +89,32 @@ export async function add_upload( await start_task_processing(); } -export async function add_sync(selected_file_id: string, selected_display_ids: string[]) { +export async function add_sync_recursively( + selected_file_id: string, + selected_display_ids: string[] +) { const file_data = await find_file_data_on_active_selected_display( selected_file_id, selected_display_ids ); if (!file_data) return console.warn('Sync canceled: no file_data'); + if (file_data.file.type === 'inode/directory') { + const new_path = file_data.file.path + file_data.file.name + '/'; + const elements_in_folder = await get_folder_elements(new_path, selected_display_ids); + if (elements_in_folder.length === 0) { + await create_path_on_all_selected_displays(new_path, selected_display_ids); + } else { + for (const el of elements_in_folder) { + await add_sync_recursively(get_file_primary_key(el), selected_display_ids); + } + } + return; // cannot sync folder + } + + if (file_data.short_displays_without_file.length === 0) return; // file is present on all selected displays + await create_path_on_all_selected_displays(file_data.file.path, selected_display_ids); + tasks.push({ data: { type: 'sync', diff --git a/control/frontend/src/routes/FileView.svelte b/control/frontend/src/routes/FileView.svelte index 53e45eb..a505cc9 100755 --- a/control/frontend/src/routes/FileView.svelte +++ b/control/frontend/src/routes/FileView.svelte @@ -21,7 +21,7 @@ get_file_by_id, run_for_selected_files_on_selected_displays, update_current_folder_on_selected_displays, - get_displays_where_path_exists, + get_displays_where_path_not_exists, create_folder_on_all_selected_displays } from '$lib/ts/stores/files'; import { slide } from 'svelte/transition'; @@ -37,7 +37,7 @@ import { delete_files, rename_file } from '$lib/ts/api_handler'; import HighlightedText from '$lib/components/HighlightedText.svelte'; import { liveQuery, type Observable } from 'dexie'; - import { download_file, add_upload } from '$lib/ts/file_transfer_handler'; + import { download_file, add_upload, add_sync_recursively } from '$lib/ts/file_transfer_handler'; let current_name: string = $state(''); let current_valid: boolean = $state(false); @@ -59,8 +59,8 @@ const s = $selected_file_ids; one_file_selected = liveQuery(async () => { return s.length === 1 && (await get_file_by_id(s[0]))?.type !== 'inode/directory'; - }) - }) + }); + }); let popup_content: PopupContent = $state({ open: false, @@ -128,7 +128,7 @@ current_name = ''; current_valid = false; display_names_where_path_does_not_exist = ( - await get_displays_where_path_exists($current_file_path, $selected_display_ids, true) + await get_displays_where_path_not_exists($current_file_path, $selected_display_ids) ).map((display) => display.name); popup_content = { open: true, @@ -148,6 +148,21 @@ closable: true }; }; + + async function sync_selected_files( + selected_file_ids: string[], + selected_display_ids: string[], + current_folder_elements: Inode[] + ) { + if (selected_file_ids.length === 0 && current_folder_elements.length > 0) { + selected_file_ids = current_folder_elements.map((inode) => get_file_primary_key(inode)); + } + if (selected_file_ids.length === 0) return; + // Mit For-Schleife über ausgewählte Elemente gehen + for (const file_id of selected_file_ids) { + await add_sync_recursively(file_id, selected_display_ids); + } + } {#snippet new_folder_popup()} @@ -232,7 +247,7 @@ {`${$selected_file_ids.length === 1 ? 'Folgendes Objekt' : `Folgende ${$selected_file_ids.length} Objekte`} löschen? (Wiederherstellung nicht möglich)`} -
+
{#each $selected_files || [] as file} {/each} @@ -320,13 +335,20 @@