Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ windows-sys = { version = "0.61", features = [
] }

[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "dragonfly", target_os = "netbsd", target_os = "openbsd"))'.dependencies]
percent-encoding = "2"
libc = "0.2"
# XDG Desktop Portal
pollster = { version = "0.4", optional = true }
Expand Down
13 changes: 8 additions & 5 deletions src/backend/xdg_desktop_portal/portal/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::{
ffi::{CStr, CString},
ffi::{CStr, CString, OsStr},
os::unix::ffi::OsStrExt,
path::PathBuf,
};

Expand All @@ -15,11 +16,13 @@ pub use file_dialog::{FileFilter, FilePath, HandleToken, OpenFileOptions, SaveFi
pub fn uris_to_paths(uris: Vec<CString>) -> Vec<PathBuf> {
uris.into_iter()
.filter_map(|uri| {
uri.into_string()
.inspect_err(|err| log::error!("Ignoring uri: {err:?}"))
.ok()
let bytes: Vec<u8> = percent_encoding::percent_decode(uri.as_bytes()).collect();
let Some(path) = bytes.strip_prefix(b"file://") else {
log::error!("Ignoring uri: {bytes:?} lacks `file://`");
return None;
};
Some(PathBuf::from(OsStr::from_bytes(path)))
})
.filter_map(|uri| uri.strip_prefix("file://").map(PathBuf::from))
.collect()
}

Expand Down
Loading