From ab76c242a1225efc680dc88bd761cc202e1e29df Mon Sep 17 00:00:00 2001 From: MarekSpodBiedry <73122968+MarekSpodBiedry@users.noreply.github.com> Date: Sat, 10 Oct 2026 21:20:22 +0200 Subject: [PATCH] File > Scripts > Browse: filter the picker to script files (#2452) (#2499) --- crates/ui-egui/src/file_dialog/tests.rs | 12 ++++++++++++ crates/ui-egui/src/file_ui.rs | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/src/file_dialog/tests.rs b/crates/ui-egui/src/file_dialog/tests.rs index 2c114c496c..14e90f76a8 100644 --- a/crates/ui-egui/src/file_dialog/tests.rs +++ b/crates/ui-egui/src/file_dialog/tests.rs @@ -187,6 +187,18 @@ fn filtered_picker_requests_only_the_given_extensions() { )); } +#[test] +fn scripts_browse_lists_only_script_files() { + let (mut app, open, _) = app(); + menus::invoke(&mut app, &egui::Context::default(), "file.scripts.browse", json!({})).unwrap(); + app.poll_file_dialog(&egui::Context::default(), None); + assert!(matches!( + open.borrow().first().map(|(r, _)| r), + Some(FileDialogRequest::Open { multiple: false, extensions: Some(exts), .. }) + if exts.iter().map(String::as_str).collect::>() == ["psjs", "ccjs", "jsx", "js", "jsxbin", "json", "txt"] + )); +} + #[test] fn last_used_dir_takes_the_most_recent_parent() { assert_eq!(last_used_dir(&[]), None); diff --git a/crates/ui-egui/src/file_ui.rs b/crates/ui-egui/src/file_ui.rs index 8e1c8eb95b..e7c85e6ac6 100644 --- a/crates/ui-egui/src/file_ui.rs +++ b/crates/ui-egui/src/file_ui.rs @@ -39,6 +39,9 @@ fn form(app: &mut PhotocraftApp, command: &str, label: &str, fields: Value, choi json!({"dialog": app.ui.open_dialog(DialogKind::Command, f)}) } +/// File › Scripts › Browse… lists these script files (plus the JSON/text the engine parses). +const SCRIPT_EXTENSIONS: &[&str] = &["psjs", "ccjs", "jsx", "js", "jsxbin", "json", "txt"]; + /// Menu items fronted here (dialogs before the engine command). `None` when not ours. pub fn invoke(app: &mut PhotocraftApp, ctx: &egui::Context, id: &str, params: &Value) -> Option> { if !no_params(params) { @@ -86,7 +89,7 @@ pub fn invoke(app: &mut PhotocraftApp, ctx: &egui::Context, id: &str, params: &V form(app, id, "Image Statistics", json!({"mode": "median", "input": dir, "align": false}), json!({"mode": modes})) } "file.scripts.browse" => { - return Some(app.pick_file_bytes(|app, name, bytes| { + return Some(app.pick_file_bytes_filtered(SCRIPT_EXTENSIONS, |app, name, bytes| { let r = app.run("file.scripts.browse", json!({"script": String::from_utf8_lossy(&bytes)})); if r.is_ok() { app.ui.status = format!("Ran script {name}");