arnekeller/tmux-thumbs
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/tmux-thumbs.git synced 2024-11-22 21:05:00 +00:00
Code Issues Projects Releases Wiki Activity

Handle better wrong executions of tmux-thumbs

Browse Source
This commit is contained in:
Ferran Basora 2020-05-02 15:29:32 +00:00
parent 674bec31fc
commit eeb2b5f98f
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/swapper.rs
View File

@ -250,21 +250,23 @@ impl<'a> Swapper<'a> {
pub fn execute_command(&mut self) { pub fn execute_command(&mut self) {
let content = self.content.clone().unwrap(); let content = self.content.clone().unwrap();
let mut splitter = content.splitn(2, ':'); let mut splitter = content.splitn(2, ':');
let upcase = splitter.next().unwrap().trim_end();
let text = splitter.next().unwrap().trim_end();
let execute_command = if upcase == "true" { if let Some(upcase) = splitter.next() {
if let Some(text) = splitter.next() {
let execute_command = if upcase.trim_end() == "true" {
self.upcase_command.clone() self.upcase_command.clone()
} else { } else {
self.command.clone() self.command.clone()
}; };
let final_command = str::replace(execute_command.as_str(), "{}", text); let final_command = str::replace(execute_command.as_str(), "{}", text.trim_end());
let retrieve_command = vec!["bash", "-c", final_command.as_str()]; let retrieve_command = vec!["bash", "-c", final_command.as_str()];
let params = retrieve_command.iter().map(|arg| arg.to_string()).collect(); let params = retrieve_command.iter().map(|arg| arg.to_string()).collect();
self.executor.execute(params); self.executor.execute(params);
} }
}
}
} }
#[cfg(test)] #[cfg(test)]
@ -359,6 +361,10 @@ fn main() -> std::io::Result<()> {
let command = args.value_of("command").unwrap(); let command = args.value_of("command").unwrap();
let upcase_command = args.value_of("upcase_command").unwrap(); let upcase_command = args.value_of("upcase_command").unwrap();
if dir.is_empty() {
panic!("Invalid tmux-thumbs execution. Are you trying to execute tmux-thumbs directly?")
}
let mut executor = RealShell::new(); let mut executor = RealShell::new();
let mut swapper = Swapper::new( let mut swapper = Swapper::new(
Box::new(&mut executor), Box::new(&mut executor),