diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/commands/bulk_rename.rs | 26 | ||||
-rw-r--r-- | src/config/general/app.rs | 2 | ||||
-rw-r--r-- | src/ui/views/tui_view.rs | 2 |
3 files changed, 16 insertions, 14 deletions
diff --git a/src/commands/bulk_rename.rs b/src/commands/bulk_rename.rs index bca4c9f..87d69fe 100644 --- a/src/commands/bulk_rename.rs +++ b/src/commands/bulk_rename.rs @@ -100,19 +100,21 @@ pub fn _bulk_rename(context: &mut AppContext) -> JoshutoResult { let mut user_input = String::with_capacity(4); std::io::stdin().read_line(&mut user_input)?; - user_input = user_input.to_lowercase(); - - let user_input_trimmed = user_input.trim(); - if user_input_trimmed != "n" || user_input_trimmed != "no" { - for (p, q) in entries.iter().zip(paths_renamed.iter()) { - let mut handle = process::Command::new("mv") - .arg("-iv") - .arg("--") - .arg(p.file_name()) - .arg(q) - .spawn()?; - handle.wait()?; + + let user_input_fmt = user_input.trim().to_lowercase(); + match user_input_fmt.as_str() { + "y" | "yes" => { + for (p, q) in entries.iter().zip(paths_renamed.iter()) { + let mut handle = process::Command::new("mv") + .arg("-iv") + .arg("--") + .arg(p.file_name()) + .arg(q) + .spawn()?; + handle.wait()?; + } } + _ => {}, } wait_for_enter()?; diff --git a/src/config/general/app.rs b/src/config/general/app.rs index c890259..3680820 100644 --- a/src/config/general/app.rs +++ b/src/config/general/app.rs @@ -1,5 +1,5 @@ -use super::DEFAULT_CONFIG_FILE_PATH; use super::app_raw::AppConfigRaw; +use super::DEFAULT_CONFIG_FILE_PATH; use crate::config::option::{DisplayOption, PreviewOption, SortOption, TabOption}; use crate::error::JoshutoResult; diff --git a/src/ui/views/tui_view.rs b/src/ui/views/tui_view.rs index 541ffed..d8f2802 100644 --- a/src/ui/views/tui_view.rs +++ b/src/ui/views/tui_view.rs @@ -2,9 +2,9 @@ use tui::buffer::Buffer; use tui::layout::Rect; use tui::widgets::Widget; -use crate::ui::views::{TuiFolderView, TuiHSplitView}; use crate::config::option::DisplayMode; use crate::context::AppContext; +use crate::ui::views::{TuiFolderView, TuiHSplitView}; pub struct TuiView<'a> { pub context: &'a AppContext, |