From f84a7c0520cb8635b1c6fd5abc4ded02784cb21a Mon Sep 17 00:00:00 2001 From: E44 <129310925+programmer-44@users.noreply.github.com> Date: Sun, 18 Jan 2026 11:57:26 +0100 Subject: [PATCH] refactor(control): rename get_current_folder_elements to get_folder_elements --- control/frontend/src/lib/ts/file_transfer_handler.ts | 4 ++-- control/frontend/src/lib/ts/stores/files.ts | 6 +++--- control/frontend/src/routes/FileView.svelte | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/control/frontend/src/lib/ts/file_transfer_handler.ts b/control/frontend/src/lib/ts/file_transfer_handler.ts index 92aea3f..b8e3d21 100644 --- a/control/frontend/src/lib/ts/file_transfer_handler.ts +++ b/control/frontend/src/lib/ts/file_transfer_handler.ts @@ -1,8 +1,8 @@ import { db } from './database'; import { get_display_by_id } from './stores/displays'; import { - get_current_folder_elements, create_path_on_all_selected_displays, + get_folder_elements, get_file_by_id, remove_all_files_without_display, remove_file_from_display_recusively @@ -32,7 +32,7 @@ export async function add_upload( await create_path_on_all_selected_displays(current_file_path, selected_display_ids); const used_file_names: string[] = await ( - await get_current_folder_elements(current_file_path, selected_display_ids) + await get_folder_elements(current_file_path, selected_display_ids) ).map((e) => e.name); for (const file of file_list) { diff --git a/control/frontend/src/lib/ts/stores/files.ts b/control/frontend/src/lib/ts/stores/files.ts index a657d80..cc01db8 100755 --- a/control/frontend/src/lib/ts/stores/files.ts +++ b/control/frontend/src/lib/ts/stores/files.ts @@ -310,8 +310,8 @@ function get_folder_elements_difference( return { deleted: only_in_old, new: only_in_new }; } -export async function get_current_folder_elements( - current_file_path: string, +export async function get_folder_elements( + file_path: string, selected_display_ids: string[] ): Promise { const existing_file_keys_on_selected_displays: [string, string, number, string][] = ( @@ -320,7 +320,7 @@ export async function get_current_folder_elements( const existing_files_on_selected_displays_in_path: Inode[] = await db.files .where('[path+name+size+type]') .anyOf(existing_file_keys_on_selected_displays) - .filter((e) => e.path === current_file_path) + .filter((e) => e.path === file_path) .toArray(); return sort_files(existing_files_on_selected_displays_in_path); diff --git a/control/frontend/src/routes/FileView.svelte b/control/frontend/src/routes/FileView.svelte index c1d7c05..53e45eb 100755 --- a/control/frontend/src/routes/FileView.svelte +++ b/control/frontend/src/routes/FileView.svelte @@ -17,7 +17,7 @@ import { selected_display_ids, selected_file_ids } from '$lib/ts/stores/select'; import { current_file_path, - get_current_folder_elements, + get_folder_elements, get_file_by_id, run_for_selected_files_on_selected_displays, update_current_folder_on_selected_displays, @@ -52,7 +52,7 @@ $effect(() => { const path = $current_file_path, display_ids = $selected_display_ids; - current_folder_elements = liveQuery(() => get_current_folder_elements(path, display_ids)); + current_folder_elements = liveQuery(() => get_folder_elements(path, display_ids)); }); let one_file_selected: Observable | undefined = $state(); $effect(() => {