big rework and dependency update

 - abstract JoshutoContext implementation behind functions
 - rework io workers in an attempt to fix a bug
 - update dependencies
 - remove JoshutoContextWorker

1 files changed, 18 insertions, 17 deletions

diff --git a/src/commands/selection.rs b/src/commands/selection.rs
index dccb114..aced34f 100644
--- a/src/commands/selection.rs
+++ b/src/commands/selection.rs
@@ -35,35 +35,36 @@ impl std::fmt::Display for SelectFiles {
 
 impl JoshutoRunnable for SelectFiles {
     fn execute(&self, context: &mut JoshutoContext, backend: &mut TuiBackend) -> JoshutoResult<()> {
-        let curr_tab = &mut context.tabs[context.curr_tab_index];
         if self.toggle {
             if !self.all {
-                let curr_list = curr_tab.curr_list_mut();
-                if let Some(curr_list) = curr_list {
-                    if let Some(s) = curr_list.get_curr_mut() {
-                        s.set_selected(!s.is_selected());
-                        CursorMoveDown::new(1).execute(context, backend)?;
-                    }
+                if let Some(s) = context
+                    .tab_context_mut()
+                    .curr_tab_mut()
+                    .curr_list_mut()
+                    .and_then(|s| s.get_curr_mut())
+                {
+                    s.set_selected(!s.is_selected());
+                    CursorMoveDown::new(1).execute(context, backend)?;
                 }
             } else {
-                let curr_list = curr_tab.curr_list_mut();
-                if let Some(curr_list) = curr_list {
+                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 !self.all {
-            let curr_list = curr_tab.curr_list_mut();
-            if let Some(curr_list) = curr_list {
-                if let Some(s) = curr_list.get_curr_mut() {
-                    s.set_selected(!s.is_selected());
-                    CursorMoveDown::new(1).execute(context, backend)?;
-                }
+            if let Some(s) = context
+                .tab_context_mut()
+                .curr_tab_mut()
+                .curr_list_mut()
+                .and_then(|s| s.get_curr_mut())
+            {
+                s.set_selected(!s.is_selected());
+                CursorMoveDown::new(1).execute(context, backend)?;
             }
         } else {
-            let curr_list = curr_tab.curr_list_mut();
-            if let Some(curr_list) = curr_list {
+            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(true);
                 }