move preserve_selection to diplay config

Signed-off-by: Luterán Lajos <luteranlajos@protonmail.ch>

Author: luteran42

Cargo.lock

@@ -6,7 +6,7 @@ use_trash = true
 watch_files = true
 xdg_open = false
 xdg_open_fork = false
-case_sensitive_ext = false
+case_insensitive_ext = false
 
 custom_commands = []
 
@@ -21,7 +21,7 @@ column_ratio = [1, 4, 4]
 scroll_offset = 6
 show_borders = true
 show_hidden = false
-show_icons = true
+show_icons = false
 # none, absolute, relative
 line_number_style = "none"
 

config/joshuto.toml

@@ -18,7 +18,7 @@ xdg_open_fork = false
 
 # If true, all file extensions checks will be case sensitive.
 # Applies to `[extension]` in `mimetype.toml` and `[ext]` in `theme.toml` and `icons.toml`
-case_sensitive_ext = false
+case_insensitive_ext = false
 
 # Use system trash can instead of permanently removing files
 use_trash = true

docs/configuration/joshuto.toml.md

@@ -6,6 +6,7 @@ use std::process;
 
 use rand::Rng;
 
+use crate::context::remove_external_preview;
 use crate::context::AppContext;
 use crate::error::{AppError, AppErrorKind, AppResult};
 use crate::ui::AppBackend;
@@ -125,10 +126,10 @@ pub fn _bulk_rename(context: &mut AppContext) -> AppResult {
 }
 
 pub fn bulk_rename(context: &mut AppContext, backend: &mut AppBackend) -> AppResult {
-    context.remove_external_preview();
+    remove_external_preview(context);
     backend.terminal_drop();
     let res = _bulk_rename(context);
-    backend.terminal_restore(context.config_ref().mouse_support)?;
+    backend.terminal_restore()?;
     reload::soft_reload_curr_tab(context)?;
     res
 }

src/commands/bulk_rename.rs

@@ -3,7 +3,7 @@ use std::path;
 use crate::commands::reload;
 use crate::context::AppContext;
 use crate::error::AppResult;
-use crate::history::DirectoryHistory;
+use crate::history::{generate_entries_to_root, DirectoryHistory};
 use crate::util::cwd;
 
 // ChangeDirectory command
@@ -28,25 +28,18 @@ pub fn change_directory(context: &mut AppContext, mut path: &path::Path) -> AppR
     };
 
     cd(new_cwd.as_path(), context)?;
-    let config = context.config_ref().clone();
-    let options = context.config_ref().display_options_ref().clone();
-    let ui_context = context.ui_context_ref().clone();
-    let tab_options = context
-        .tab_context_ref()
-        .curr_tab_ref()
-        .option_ref()
-        .clone();
+    let dirlists = generate_entries_to_root(
+        new_cwd.as_path(),
+        context.tab_context_ref().curr_tab_ref().history_ref(),
+        context.ui_context_ref(),
+        context.config_ref().display_options_ref(),
+        context.tab_context_ref().curr_tab_ref().option_ref(),
+    )?;
     context
         .tab_context_mut()
         .curr_tab_mut()
         .history_mut()
-        .populate_to_root(
-            new_cwd.as_path(),
-            &config,
-            &ui_context,
-            &options,
-            &tab_options,
-        )?;
+        .insert_entries(dirlists);
     Ok(())
 }
 

src/commands/change_directory.rs

@@ -57,7 +57,7 @@ pub fn custom_search(
             .stdout(Stdio::piped())
             .spawn()?
             .wait_with_output()?;
-        backend.terminal_restore(context.config_ref().mouse_support)?;
+        backend.terminal_restore()?;
         cmd_result
     } else {
         cmd.output()?

src/commands/custom_search.rs

@@ -5,11 +5,12 @@ use termion::event::Key;
 
 use crate::context::AppContext;
 use crate::error::{AppError, AppErrorKind, AppResult};
-use crate::history::DirectoryHistory;
 use crate::io::{FileOperation, FileOperationOptions, IoWorkerThread};
 use crate::ui::widgets::TuiPrompt;
 use crate::ui::AppBackend;
 
+use super::tab_ops;
+
 fn prompt(context: &mut AppContext, backend: &mut AppBackend, paths_len: usize) -> bool {
     let ch = {
         let prompt_str = format!("Delete {} files? (Y/n)", paths_len);
@@ -93,14 +94,7 @@ pub fn delete_selected_files(
         delete_files(context, paths, background, permanently)?;
     }
 
-    let curr_tab = context.tab_context_ref().curr_tab_ref();
-    let config = context.config_ref().clone();
-    let options = context.config_ref().display_options_ref().clone();
-    let curr_path = curr_tab.cwd().to_path_buf();
-    for (_, tab) in context.tab_context_mut().iter_mut() {
-        let tab_options = tab.option_ref().clone();
-        tab.history_mut()
-            .reload(&curr_path, &config, &options, &tab_options)?;
-    }
+    let curr_path = context.tab_context_ref().curr_tab_ref().cwd().to_path_buf();
+    tab_ops::reload_all_tabs(context, curr_path.as_path())?;
     Ok(())
 }

src/commands/delete_files.rs

@@ -51,7 +51,7 @@ pub fn fzf_multi(
 }
 
 fn fzf_impl(
-    context: &mut AppContext,
+    _context: &mut AppContext,
     backend: &mut AppBackend,
     items: Vec<String>,
     args: Vec<String>,
@@ -68,7 +68,7 @@ fn fzf_impl(
     let mut fzf = match cmd.spawn() {
         Ok(child) => child,
         Err(e) => {
-            backend.terminal_restore(context.config_ref().mouse_support)?;
+            backend.terminal_restore()?;
             return Err(AppError::from(e));
         }
     };
@@ -82,7 +82,7 @@ fn fzf_impl(
     }
 
     let fzf_output = fzf.wait_with_output();
-    backend.terminal_restore(context.config_ref().mouse_support)?;
+    backend.terminal_restore()?;
 
     if let Ok(output) = fzf_output {
         if output.status.success() {

src/commands/fzf.rs

@@ -3,18 +3,14 @@ use std::path;
 use crate::commands::cursor_move;
 use crate::context::AppContext;
 use crate::error::AppResult;
-use crate::history::DirectoryHistory;
+
+use super::tab_ops;
 
 pub fn new_directory(context: &mut AppContext, p: &path::Path) -> AppResult {
     std::fs::create_dir_all(p)?;
-    let config = context.config_ref().clone();
-    let options = context.config_ref().display_options_ref().clone();
+
     let curr_path = context.tab_context_ref().curr_tab_ref().cwd().to_path_buf();
-    for (_, tab) in context.tab_context_mut().iter_mut() {
-        let tab_options = tab.option_ref().clone();
-        tab.history_mut()
-            .reload(&curr_path, &config, &options, &tab_options)?;
-    }
+    tab_ops::reload_all_tabs(context, curr_path.as_path())?;
 
     if context.config_ref().focus_on_create {
         cursor_move::to_path(context, p)?;

src/commands/new_directory.rs

@@ -23,10 +23,10 @@ fn _get_options<'a>(path: &path::Path, config: &AppConfig) -> Vec<&'a ProgramEnt
         .extension()
         .and_then(|ext| ext.to_str())
         .and_then(|ext| {
-            if config.case_sensitive_ext {
-                MIMETYPE_T.app_list_for_ext(ext)
-            } else {
+            if config.case_insensitive_ext {
                 MIMETYPE_T.app_list_for_ext(&ext.to_lowercase())
+            } else {
+                MIMETYPE_T.app_list_for_ext(ext)
             }
         })
     {
@@ -67,7 +67,7 @@ where
     } else {
         backend.terminal_drop();
         let res = execute_and_wait(option, files);
-        backend.terminal_restore(context.config_ref().mouse_support)?;
+        backend.terminal_restore()?;
         res?;
     }
     Ok(())
@@ -86,7 +86,7 @@ fn _open_with_xdg(
         backend.terminal_drop();
         let handle = open::that_in_background(path);
         let result = handle.join();
-        backend.terminal_restore(context.config_ref().mouse_support)?;
+        backend.terminal_restore()?;
         if let Ok(result) = result {
             result?;
         }
@@ -143,7 +143,7 @@ where
                         let mut option = ProgramEntry::new(String::from(cmd));
                         option.args(args_iter);
                         let res = execute_and_wait(&option, files);
-                        backend.terminal_restore(context.config_ref().mouse_support)?;
+                        backend.terminal_restore()?;
                         res?
                     }
                 }