leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: improve desktop entry field code handling

Browse source 
- The %f and %u field codes may now be expanded within a word
- Handle field code escapes (%%)
- Support the %c and %k field codes

This will notably fix desktop entries and context menu actions
that pass files as a long argument, such as `--option=%f`.
This commit is contained in:
Michael Aaron Murphy 2026-04-24 23:27:33 +02:00
parent d5dbcc7677
commit d775f3e5e8
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
5 changed files with 165 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/app.rs
View file

@ -884,31 +884,39 @@ impl App {
#[cfg(feature = "desktop")]
fn launch_desktop_entries(paths: &[impl AsRef<Path>]) {
use cosmic::desktop::fde::DesktopEntry;
let locales = cosmic::desktop::fde::get_languages_from_env();
for path in paths.iter().map(AsRef::as_ref) {
match DesktopEntry::from_path::<&str>(path, None) {
Ok(entry) => match entry.exec() {
Some(exec) => match mime_app::exec_to_command(exec, &[] as &[&str; 0]) {
Some(commands) => {
let cwd_opt = entry.desktop_entry("Path");
Some(exec) => {
match mime_app::exec_to_command(
exec,
entry.name(&locales).as_deref().unwrap_or_default(),
Some(path),
&[] as &[&str; 0],
) {
Some(commands) => {
let cwd_opt = entry.desktop_entry("Path");
for mut command in commands {
if let Some(cwd) = cwd_opt {
command.current_dir(cwd);
}
for mut command in commands {
if let Some(cwd) = cwd_opt {
command.current_dir(cwd);
}
if let Err(err) = spawn_detached(&mut command) {
log::warn!("failed to execute {}: {}", path.display(), err);
if let Err(err) = spawn_detached(&mut command) {
log::warn!("failed to execute {}: {}", path.display(), err);
}
}
}
None => {
log::warn!(
"failed to parse {}: invalid Desktop Entry/Exec",
path.display()
);
}
}
None => {
log::warn!(
"failed to parse {}: invalid Desktop Entry/Exec",
path.display()
);
}
},
}
None => {
log::warn!(
"failed to parse {}: missing Desktop Entry/Exec",