Skip to content

Commit

Permalink
Merge pull request #496 from kdheepak/fix-shortcuts
Browse files Browse the repository at this point in the history 
Fix shortcuts failing
  • Loading branch information
@kdheepak
kdheepak committed May 27, 2023
2 parents dee5c0c + aee643f commit 4abb3bd
Showing 1 changed file with 28 additions and 0 deletions.
28 changes: 28 additions & 0 deletions src/app.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1870,8 +1870,10 @@ impl TaskwarriorTui {
let shell = &self.config.uda_shortcuts[s];

if shell.is_empty() {
self.resume_tui().await.unwrap();
return Err("Trying to run empty shortcut.".to_string());
}

let shell = format!(
"{} {}",
shell,
Expand Down Expand Up @@ -1917,6 +1919,7 @@ impl TaskwarriorTui {
}

self.resume_tui().await.unwrap();

r
}

Expand Down Expand Up @@ -2478,6 +2481,7 @@ impl TaskwarriorTui {
Ok(_) => self.update(true).await?,
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
if self.calendar_year > 0 {
Expand Down Expand Up @@ -2534,6 +2538,7 @@ impl TaskwarriorTui {
Ok(_) => self.update(true).await?,
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
}
Expand All @@ -2548,6 +2553,7 @@ impl TaskwarriorTui {
Ok(_) => self.update(true).await?,
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
}
Expand All @@ -2556,27 +2562,31 @@ impl TaskwarriorTui {
Ok(_) => self.update(true).await?,
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.quick_tag {
match self.task_quick_tag() {
Ok(_) => self.update(true).await?,
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.edit {
match self.task_edit().await {
Ok(_) => self.update(true).await?,
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.undo {
match self.task_undo() {
Ok(_) => self.update(true).await?,
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.modify {
Expand Down Expand Up @@ -2686,6 +2696,7 @@ impl TaskwarriorTui {
Err(e) => {
self.update(true).await?;
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.shortcut2 {
Expand All @@ -2694,6 +2705,7 @@ impl TaskwarriorTui {
Err(e) => {
self.update(true).await?;
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.shortcut3 {
Expand All @@ -2702,6 +2714,7 @@ impl TaskwarriorTui {
Err(e) => {
self.update(true).await?;
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.shortcut4 {
Expand All @@ -2710,6 +2723,7 @@ impl TaskwarriorTui {
Err(e) => {
self.update(true).await?;
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.shortcut5 {
Expand All @@ -2718,6 +2732,7 @@ impl TaskwarriorTui {
Err(e) => {
self.update(true).await?;
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.shortcut6 {
Expand All @@ -2726,6 +2741,7 @@ impl TaskwarriorTui {
Err(e) => {
self.update(true).await?;
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.shortcut7 {
Expand All @@ -2734,6 +2750,7 @@ impl TaskwarriorTui {
Err(e) => {
self.update(true).await?;
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.shortcut8 {
Expand All @@ -2742,6 +2759,7 @@ impl TaskwarriorTui {
Err(e) => {
self.update(true).await?;
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.shortcut9 {
Expand All @@ -2750,6 +2768,7 @@ impl TaskwarriorTui {
Err(e) => {
self.update(true).await?;
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
} else if input == self.keyconfig.zoom {
Expand Down Expand Up @@ -2808,6 +2827,7 @@ impl TaskwarriorTui {
Ok(_) => self.update(true).await?,
Err(e) => {
self.error = Some(e.to_string());
self.mode = Mode::Tasks(Action::Error);
}
}
}
Expand Down Expand Up @@ -2858,6 +2878,7 @@ impl TaskwarriorTui {
}
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
}
Expand Down Expand Up @@ -2939,6 +2960,7 @@ impl TaskwarriorTui {
}
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
}
Expand Down Expand Up @@ -2983,6 +3005,7 @@ impl TaskwarriorTui {
}
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
}
Expand Down Expand Up @@ -3084,6 +3107,7 @@ impl TaskwarriorTui {
}
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
}
Expand Down Expand Up @@ -3166,6 +3190,7 @@ impl TaskwarriorTui {
Err(e) => {
self.reset_command();
self.error = Some(e.to_string());
self.mode = Mode::Tasks(Action::Error);
}
}
}
Expand Down Expand Up @@ -3210,6 +3235,7 @@ impl TaskwarriorTui {
}
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
}
Expand Down Expand Up @@ -3403,6 +3429,7 @@ impl TaskwarriorTui {
}
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
}
Expand All @@ -3425,6 +3452,7 @@ impl TaskwarriorTui {
}
Err(e) => {
self.error = Some(e);
self.mode = Mode::Tasks(Action::Error);
}
}
}
Expand Down

0 comments on commit 4abb3bd

Please sign in to comment.