CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-06-06 13:53:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: Remove UNC prefix in paths returned to the frontend (#1168)

Browse Source 
* feat: Remove UNC prefix in paths returned to the frontend

* that one doesn't count

* map instead of mut

* revert accidental ipc::response change

* move dunce to workspace root
This commit is contained in:
Fabian-Lars
2024-04-17 15:49:32 +02:00
committed by GitHub
parent 6698774f3f
commit bb51a41d67
7 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dialog/src/commands.rs
+21 -5
View File
@@ -129,7 +129,12 @@ pub(crate) async fn open<R: Runtime>(
}
}
}
OpenResponse::Folders(folders)
OpenResponse::Folders(folders.map(|folders| {
folders
.iter()
.map(|p| dunce::simplified(p).to_path_buf())
.collect()
}))
} else {
let folder = dialog_builder.blocking_pick_folder();
if let Some(path) = &folder {
@@ -137,7 +142,7 @@ pub(crate) async fn open<R: Runtime>(
s.allow_directory(path, options.recursive);
}
}
OpenResponse::Folder(folder)
OpenResponse::Folder(folder.map(|p| dunce::simplified(&p).to_path_buf()))
}
}
#[cfg(mobile)]
@@ -154,7 +159,15 @@ pub(crate) async fn open<R: Runtime>(
.allow_file(&file.path)?;
}
}
OpenResponse::Files(files)
OpenResponse::Files(files.map(|files| {
files
.into_iter()
.map(|mut f| {
f.path = dunce::simplified(&f.path).to_path_buf();
f
})
.collect()
}))
} else {
let file = dialog_builder.blocking_pick_file();
if let Some(file) = &file {
@@ -165,7 +178,10 @@ pub(crate) async fn open<R: Runtime>(
.state::<tauri::scope::Scopes>()
.allow_file(&file.path)?;
}
OpenResponse::File(file)
OpenResponse::File(file.map(|mut f| {
f.path = dunce::simplified(&f.path).to_path_buf();
f
}))
};
Ok(res)
}
@@ -208,7 +224,7 @@ pub(crate) async fn save<R: Runtime>(
window.state::<tauri::scope::Scopes>().allow_file(p)?;
}
Ok(path)
Ok(path.map(|p| dunce::simplified(&p).to_path_buf()))
}
}