Skip to content

Commit

Permalink
fix: support open dialog with multiple dirs
Browse files Browse the repository at this point in the history
  • Loading branch information
betamos committed Jun 15, 2022
1 parent 0eef7ba commit 53d0a1a
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 1 deletion.
52 changes: 52 additions & 0 deletions core/tauri/src/api/dialog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,32 @@ pub mod blocking {
response
}

/// Shows the dialog to select multiple folders.
/// This is a blocking operation,
/// and should *NOT* be used when running on the main thread context.
///
/// # Examples
///
/// ```rust,no_run
/// use tauri::api::dialog::blocking::FileDialogBuilder;
/// #[tauri::command]
/// use tauri::api::dialog::blocking::FileDialogBuilder;
/// #[tauri::command]
/// fn my_command() {
/// let folder_paths = FileDialogBuilder::new().pick_folders();
/// // do something with the optional folder paths here
/// // the folder paths value is `None` if the user closed the dialog
/// }
/// ```
pub fn pick_folders(self) -> Option<Vec<PathBuf>> {
#[allow(clippy::let_and_return)]
let response = run_dialog_sync!(self.0.pick_folders());
#[cfg(not(target_os = "linux"))]
let response =
response.map(|paths| paths.into_iter().map(|p| p.path().to_path_buf()).collect());
response
}

/// Shows the dialog to save a file.
/// This is a blocking operation,
/// and should *NOT* be used when running on the main thread context.
Expand Down Expand Up @@ -515,6 +541,32 @@ mod nonblocking {
run_file_dialog!(self.0.pick_folder(), f)
}

/// Shows the dialog to select multiple folders.
/// This is not a blocking operation,
/// and should be used when running on the main thread to avoid deadlocks with the event loop.
///
/// # Examples
///
/// ```rust,no_run
/// use tauri::api::dialog::FileDialogBuilder;
/// tauri::Builder::default()
/// .build(tauri::generate_context!("test/fixture/src-tauri/tauri.conf.json"))
/// .expect("failed to build tauri app")
/// .run(|_app, _event| {
/// FileDialogBuilder::new().pick_folders(|file_paths| {
/// // do something with the optional folder paths here
/// // the folder paths value is `None` if the user closed the dialog
/// })
/// })
/// ```
pub fn pick_folders<F: FnOnce(Option<Vec<PathBuf>>) + Send + 'static>(self, f: F) {
#[cfg(not(target_os = "linux"))]
let f = |paths: Option<Vec<rfd::FileHandle>>| {
f(paths.map(|list| list.into_iter().map(|p| p.path().to_path_buf()).collect()))
};
run_file_dialog!(self.0.pick_folders(), f)
}

/// Shows the dialog to save a file.
///
/// This is not a blocking operation,
Expand Down
12 changes: 11 additions & 1 deletion core/tauri/src/endpoints/dialog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,17 @@ impl Cmd {

let scopes = context.window.state::<Scopes>();

let res = if options.directory {
let res = if options.directory && options.multiple {
let folders = dialog_builder.pick_folders();
if let Some(folders) = &folders {
for folder in folders {
scopes
.allow_directory(folder, options.recursive)
.map_err(crate::error::into_anyhow)?;
}
}
folders.into()
} else if options.directory {
let folder = dialog_builder.pick_folder();
if let Some(path) = &folder {
scopes
Expand Down

0 comments on commit 53d0a1a

Please sign in to comment.