fix: being stuck in filtering bar, default keymap (#113)

intuis · Sep 8, 2024 · ec1680e · ec1680e
1 parent 35c143b
commit ec1680e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/rm-config/defaults/keymap.toml b/rm-config/defaults/keymap.toml
@@ -44,8 +44,7 @@ keybindings = [
   { on = "f", action = "ShowFiles" },
   { on = "s", action = "ShowStats" },
 
-  { on = "d", action = "DeleteWithoutFiles" },
-  { on = "D", action = "DeleteWithFiles" },
+  { on = "d", action = "Delete" },
 ]
 
 [search_tab]

diff --git a/rm-main/src/tui/components/table.rs b/rm-main/src/tui/components/table.rs
@@ -83,7 +83,7 @@ impl<T: Clone> GenericTable<T> {
         let new_selection = state.selected().unwrap_or_default() + amount;
 
         if new_selection > self.get_len() {
-            state.select(Some(self.get_len() - 1));
+            state.select(Some(self.get_len().saturating_sub(1)));
         } else {
             state.select(Some(new_selection));
         };

diff --git a/rm-main/src/tui/tabs/torrents/mod.rs b/rm-main/src/tui/tabs/torrents/mod.rs
@@ -226,7 +226,7 @@ impl Component for TorrentsTab {
                 self.popup_manager.handle_update_action(action)
             }
             UpdateAction::CancelTorrentTask => {
-                if !self.task_manager.is_finished_status_task() {
+                if self.task_manager.is_status_task_in_progress() {
                     return;
                 }
 

diff --git a/rm-main/src/tui/tabs/torrents/table_manager.rs b/rm-main/src/tui/tabs/torrents/table_manager.rs
@@ -276,6 +276,11 @@ impl TableManager {
         self.widths = self.header_widths(&self.table.items);
         self.update_rows_number();
         self.sort();
+
+        let mut state = self.table.state.borrow_mut();
+        if state.selected().is_none() && !self.table.items.is_empty() {
+            state.select(Some(0));
+        }
     }
 
     pub fn set_filter(&mut self, filter: String) {

diff --git a/rm-main/src/tui/tabs/torrents/task_manager.rs b/rm-main/src/tui/tabs/torrents/task_manager.rs
@@ -206,9 +206,9 @@ impl TaskManager {
         self.ctx.send_update_action(UpdateAction::CancelTorrentTask);
     }
 
-    pub fn is_finished_status_task(&self) -> bool {
+    pub fn is_status_task_in_progress(&self) -> bool {
         if let CurrentTask::Status(task) = &self.current_task {
-            !matches!(task.task_status, CurrentTaskState::Loading(_))
+            matches!(task.task_status, CurrentTaskState::Loading(_))
         } else {
             false
         }