Add more reloading triggers

4 files changed, 31 insertions, 3 deletions

diff --git a/src/commands/delete_files.rs b/src/commands/delete_files.rs
index 85fe4b6..c70cee7 100644
--- a/src/commands/delete_files.rs
+++ b/src/commands/delete_files.rs
@@ -6,6 +6,7 @@ use termion::event::Key;
 use crate::commands::{JoshutoCommand, JoshutoRunnable, ReloadDirList};
 use crate::context::JoshutoContext;
 use crate::error::JoshutoResult;
+use crate::history::DirectoryHistory;
 use crate::ui::widgets::TuiPrompt;
 use crate::ui::TuiBackend;
 use crate::util::load_child::LoadChild;
@@ -90,6 +91,12 @@ impl std::fmt::Display for DeleteFiles {
 impl JoshutoRunnable for DeleteFiles {
     fn execute(&self, context: &mut JoshutoContext, backend: &mut TuiBackend) -> JoshutoResult<()> {
         Self::delete_files(context, backend)?;
+
+        let options = &context.config_t.sort_option;
+        let curr_path = context.tabs[context.curr_tab_index].curr_path.clone();
+        for tab in context.tabs.iter_mut() {
+            tab.history.reload(&curr_path, options);
+        }
         LoadChild::load_child(context)?;
         Ok(())
     }
diff --git a/src/commands/new_directory.rs b/src/commands/new_directory.rs
index ab7c170..ce27bc9 100644
--- a/src/commands/new_directory.rs
+++ b/src/commands/new_directory.rs
@@ -3,7 +3,9 @@ use std::path;
 use crate::commands::{JoshutoCommand, JoshutoRunnable, ReloadDirList};
 use crate::context::JoshutoContext;
 use crate::error::JoshutoResult;
+use crate::history::DirectoryHistory;
 use crate::ui::TuiBackend;
+use crate::util::load_child::LoadChild;
 
 #[derive(Clone, Debug)]
 pub struct NewDirectory {
@@ -32,7 +34,14 @@ impl JoshutoRunnable for NewDirectory {
         for path in &self.paths {
             std::fs::create_dir_all(path)?;
         }
-        ReloadDirList::reload(context.curr_tab_index, context)?;
+
+        let options = &context.config_t.sort_option;
+        let curr_path = context.tabs[context.curr_tab_index].curr_path.clone();
+        for tab in context.tabs.iter_mut() {
+            tab.history.reload(&curr_path, options);
+        }
+
+        LoadChild::load_child(context)?;
         Ok(())
     }
 }
diff --git a/src/history.rs b/src/history.rs
index 5abb78b..f4a0391 100644
--- a/src/history.rs
+++ b/src/history.rs
@@ -20,6 +20,7 @@ pub trait DirectoryHistory {
         path: &Path,
         sort_option: &sort::SortOption,
     ) -> std::io::Result<()>;
+    fn reload(&mut self, path: &Path, sort_option: &sort::SortOption) -> std::io::Result<()>;
     fn depreciate_all_entries(&mut self);
 
     fn depreciate_entry(&mut self, path: &Path);
@@ -99,6 +100,17 @@ impl DirectoryHistory for JoshutoHistory {
         Ok(())
     }
 
+    fn reload(&mut self, path: &Path, sort_option: &sort::SortOption) -> std::io::Result<()> {
+        match self.entry(path.to_path_buf()) {
+            Entry::Occupied(mut entry) => {
+                let dirlist = entry.get_mut();
+                dirlist.reload_contents(sort_option)?;
+            }
+            Entry::Vacant(entry) => {}
+        }
+        Ok(())
+    }
+
     fn depreciate_all_entries(&mut self) {
         self.iter_mut().for_each(|(_, v)| v.depreciate());
     }
diff --git a/src/run.rs b/src/run.rs
index 90035b6..928b708 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -67,8 +67,8 @@ pub fn run(config_t: JoshutoConfig, keymap_t: JoshutoCommandMapping) -> std::io:
                         context.message_queue.push_back(msg);
                         let options = &context.config_t.sort_option;
                         for tab in context.tabs.iter_mut() {
-                            tab.history.depreciate_entry(&src);
-                            tab.history.depreciate_entry(&dest);
+                            tab.history.reload(&src, options);
+                            tab.history.reload(&dest, options);
                         }
                         LoadChild::load_child(&mut context)?;
                     }