added move_up

src/directory.rs

@@ -205,35 +205,50 @@ impl Directory {
         let selected_subtree = self.subtree_indices(self.selection());
         let sibling_subtree = self.subtree_indices(index);
 
-        let delta = if selected_subtree.len() < sibling_subtree.len() {
+        let select_len = selected_subtree.len();
-            let select_len = selected_subtree.len();
+        let sibling_len = sibling_subtree.len();
-            let sibling_len = sibling_subtree.len();
 
-            let selected_copy = self.dirs[selected_subtree].to_owned();
+        let selected_copy = self.dirs[selected_subtree].to_owned();
-            let sibling_copy = self.dirs[sibling_subtree].to_owned();
+        let sibling_copy = self.dirs[sibling_subtree].to_owned();
-            let back_to_back = sibling_copy.into_iter().chain(selected_copy);
+        let back_to_back = sibling_copy.into_iter().chain(selected_copy);
 
-            let full_range = self.selection() .. self.selection()+select_len+sibling_len;
+        let full_range = self.selection() .. self.selection()+select_len+sibling_len;
-            for (dst, item) in self.dirs[full_range].iter_mut().zip(back_to_back) {
+        for (dst, item) in self.dirs[full_range].iter_mut().zip(back_to_back) {
-                *dst = item;
+            *dst = item;
-            }
+        }
 
-            sibling_len
+        self.selection += u16::try_from(sibling_len).unwrap_or(u16::MAX);
-        } else if selected_subtree.len() == sibling_subtree.len() {
+    }
-            let (selected, sibling) = self.dirs.split_at_mut(index);
 
-            let len = selected.len();
+    fn move_up(&mut self) {
-            let lhs = &mut selected[len - selected_subtree.len() .. ];
+        let current_depth = self.selected().depth;
-            let rhs = &mut sibling[0 .. sibling_subtree.len()];
 
-            lhs.swap_with_slice(rhs);
+        let Some(index) = (0 .. self.selection())
-
+            .rev()
-            selected_subtree.len()
+            .take_while(|&i| self.dirs[i].depth >= current_depth)
-        } else {
+            .filter(|&i| self.dirs[i].depth == current_depth)
-            todo!()
+            .next()
+        else {
+            return
         };
 
-        self.selection += u16::try_from(delta).unwrap_or(u16::MAX);
+        let selected_subtree = self.subtree_indices(self.selection());
+        let sibling_subtree = self.subtree_indices(index);
+
+        let select_len = selected_subtree.len();
+        let sibling_len = sibling_subtree.len();
+
+        let selected_copy = self.dirs[selected_subtree].to_owned();
+        let sibling_copy = self.dirs[sibling_subtree].to_owned();
+        let back_to_back = selected_copy.into_iter().chain(sibling_copy);
+
+        let full_range = index .. index+select_len+sibling_len;
+        for (dst, item) in self.dirs[full_range].iter_mut().zip(back_to_back) {
+            *dst = item;
+        }
+
+        self.selection -= u16::try_from(sibling_len).unwrap_or(u16::MAX);
+
     }
 
     fn selected(&self) -> &Item {
@@ -332,6 +347,9 @@ impl Directory {
             },
             KeyCode::Down => {
                 self.move_down();
+            },
+            KeyCode::Up => {
+                self.move_up();
             }
             _ => (),
         }