diff options
author | Jiayi Zhao <jeff.no.zhao@gmail.com> | 2020-12-13 12:42:53 -0500 |
---|---|---|
committer | Jiayi Zhao <jeff.no.zhao@gmail.com> | 2020-12-13 12:42:53 -0500 |
commit | 2e5cdd07c2d8c18bad4099c82e36af64dc473a64 (patch) | |
tree | a9d7dee0f5a603cc96d6415a4549436a0f1818e0 /src/commands | |
parent | 468e607c5d1cd5d554ae356fd3c8e78425840347 (diff) |
code cleanup and fix path not showing when too long
Diffstat (limited to 'src/commands')
-rw-r--r-- | src/commands/key_command.rs | 16 | ||||
-rw-r--r-- | src/commands/selection.rs | 8 | ||||
-rw-r--r-- | src/commands/set_mode.rs | 4 | ||||
-rw-r--r-- | src/commands/show_workers.rs | 3 |
4 files changed, 12 insertions, 19 deletions
diff --git a/src/commands/key_command.rs b/src/commands/key_command.rs index 1c32470..967bf2d 100644 --- a/src/commands/key_command.rs +++ b/src/commands/key_command.rs @@ -276,14 +276,12 @@ impl KeyCommand { )), }, }, - "tab_switch" => match arg { - arg => match arg.parse::<i32>() { - Ok(s) => Ok(Self::TabSwitch(s)), - Err(e) => Err(JoshutoError::new( - JoshutoErrorKind::IOInvalidData, - format!("{}: {}", command, e.to_string()), - )), - }, + "tab_switch" => match arg.parse::<i32>() { + Ok(s) => Ok(Self::TabSwitch(s)), + Err(e) => Err(JoshutoError::new( + JoshutoErrorKind::IOInvalidData, + format!("{}: {}", command, e.to_string()), + )), }, "toggle_hidden" => Ok(Self::ToggleHiddenFiles), inp => Err(JoshutoError::new( @@ -348,7 +346,7 @@ impl JoshutoRunnable for KeyCommand { Self::ToggleHiddenFiles => show_hidden::toggle_hidden(context), - Self::Sort(t) => sort::set_sort(context, t.clone()), + Self::Sort(t) => sort::set_sort(context, *t), Self::SortReverse => sort::toggle_reverse(context), Self::TabSwitch(i) => { diff --git a/src/commands/selection.rs b/src/commands/selection.rs index 7e9a636..b184474 100644 --- a/src/commands/selection.rs +++ b/src/commands/selection.rs @@ -15,11 +15,9 @@ pub fn select_files(context: &mut JoshutoContext, toggle: bool, all: bool) -> Jo s.set_selected(!s.is_selected()); cursor_move::down(context, 1)?; } - } else { - if let Some(curr_list) = context.tab_context_mut().curr_tab_mut().curr_list_mut() { - for curr in &mut curr_list.contents { - curr.set_selected(!curr.is_selected()); - } + } else if let Some(curr_list) = context.tab_context_mut().curr_tab_mut().curr_list_mut() { + for curr in &mut curr_list.contents { + curr.set_selected(!curr.is_selected()); } } } else if !all { diff --git a/src/commands/set_mode.rs b/src/commands/set_mode.rs index ebe5a09..978bb24 100644 --- a/src/commands/set_mode.rs +++ b/src/commands/set_mode.rs @@ -56,8 +56,8 @@ pub fn set_mode(context: &mut JoshutoContext, backend: &mut TuiBackend) -> Joshu }; if let Some(s) = user_input { - if s.starts_with(PREFIX) { - let s = &s[PREFIX.len()..]; + if let Some(stripped) = s.strip_prefix(PREFIX) { + let s = stripped; let mode = str_to_mode(s); let entry = context diff --git a/src/commands/show_workers.rs b/src/commands/show_workers.rs index 04e6b84..1ddb74c 100644 --- a/src/commands/show_workers.rs +++ b/src/commands/show_workers.rs @@ -1,12 +1,9 @@ -use crate::commands::KeyCommand; use crate::context::JoshutoContext; use crate::error::JoshutoResult; use crate::ui::views::TuiWorkerView; use crate::ui::TuiBackend; -use super::JoshutoRunnable; - pub fn show_workers(context: &mut JoshutoContext, backend: &mut TuiBackend) -> JoshutoResult<()> { let view = TuiWorkerView::new(); view.display(context, backend); |