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

Merge branch 'master' of github.com:chmln/handlr

Browse source
This commit is contained in:
Gregory 2020-05-30 18:40:14 -04:00
commit d45027a408
No known key found for this signature in database
GPG key ID: 2E44FAEEDC94B1E2
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/common.rs
View file

@ -60,20 +60,32 @@ impl Handler {
}
pub fn open(&self, arg: String) -> Result<()> {
let (cmd, args) = self.get_entry()?.get_cmd(Some(arg))?;
std::process::Command::new(cmd)
.args(args)
.stdout(std::process::Stdio::null())
.spawn()?;
if self.get_entry()?.term {
std::process::Command::new(cmd)
.args(args)
.status()?;
} else {
std::process::Command::new(cmd)
.args(args)
.stdout(std::process::Stdio::null())
.spawn()?;
}
Ok(())
}
pub fn launch(&self, args: Vec<String>) -> Result<()> {
let (cmd, mut base_args) = self.get_entry()?.get_cmd(None)?;
base_args.extend_from_slice(&args);
std::process::Command::new(cmd)
.args(base_args)
.stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::null())
.spawn()?;
if self.get_entry()?.term {
std::process::Command::new(cmd)
.args(base_args)
.status()?;
} else {
std::process::Command::new(cmd)
.args(base_args)
.stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::null())
.spawn()?;
}
Ok(())
}
}
@ -84,6 +96,7 @@ pub struct DesktopEntry {
pub(crate) name: String,
pub(crate) exec: String,
pub(crate) file_name: String,
pub(crate) term: bool,
pub(crate) mimes: Vec<Mime>,
}
@ -153,6 +166,12 @@ impl TryFrom<PathBuf> for DesktopEntry {
mimes.pop();
entry.mimes = mimes;
}
"Terminal" => {
entry.term = match inner_rules.next().unwrap().as_str() {
"true" => true,
_ => false,
}
}
_ => {}
}
}