troldspejlet/handlr
troldspejlet/handlr
1
0
Fork 0
mirror of https://github.com/chmln/handlr.git synced 2024-11-14 21:49:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle %F

Browse source
This commit is contained in:
Greg 2020-04-15 17:22:24 -04:00
parent 9a39c056e8
commit 13d3b0f5f8
No known key found for this signature in database
GPG key ID: 2E44FAEEDC94B1E2
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common.rs
View file

@ -30,7 +30,7 @@ impl Handler {
} }
pub fn get_path(name: &str) -> Option<PathBuf> { pub fn get_path(name: &str) -> Option<PathBuf> {
let locally = { let locally = {
let mut local_dir = dirs::data_dir().unwrap(); let mut local_dir = dirs::data_dir()?;
local_dir.push("applications"); local_dir.push("applications");
local_dir.push(name); local_dir.push(name);
Some(local_dir).filter(|p| p.exists()) Some(local_dir).filter(|p| p.exists())
@ -86,7 +86,11 @@ impl DesktopEntry {
) -> Result<(String, Vec<String>)> { ) -> Result<(String, Vec<String>)> {
let arg = arg.unwrap_or_default(); let arg = arg.unwrap_or_default();
let arg = shlex::quote(&arg); let arg = shlex::quote(&arg);
let replaced = self.exec.replace("%f", &arg).replace("%U", &arg); let replaced = self
.exec
.replace("%f", &arg)
.replace("%U", &arg)
.replace("%F", &arg);
let mut split = shlex::split(&replaced).ok_or(Error::BadCmd)?; let mut split = shlex::split(&replaced).ok_or(Error::BadCmd)?;
Ok((split.remove(0), split)) Ok((split.remove(0), split))