add padding and preserve order

intuis · Jul 5, 2024 · 17cafec · 17cafec
1 parent 1e6b8b7
commit 17cafec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/rm-config/src/main_config.rs b/rm-config/src/main_config.rs
@@ -52,7 +52,7 @@ fn default_refresh() -> u64 {
     5
 }
 
-#[derive(Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Serialize, Deserialize, Hash, PartialEq, Eq)]
 pub enum Header {
     Name,
     SizeWhenDone,
@@ -61,6 +61,7 @@ pub enum Header {
     DownloadRate,
     UploadRate,
     DownloadDir,
+    Padding,
 }
 
 impl Header {
@@ -73,6 +74,7 @@ impl Header {
             Header::DownloadRate => Constraint::Length(12),
             Header::UploadRate => Constraint::Length(12),
             Header::DownloadDir => Constraint::Max(70),
+            Header::Padding => Constraint::Length(2),
         }
     }
 
@@ -85,6 +87,7 @@ impl Header {
             Header::DownloadRate => "Download",
             Header::UploadRate => "Upload",
             Header::DownloadDir => "Directory",
+            Header::Padding => "",
         }
     }
 }

diff --git a/rm-main/src/ui/tabs/torrents/rustmission_torrent.rs b/rm-main/src/ui/tabs/torrents/rustmission_torrent.rs
@@ -37,6 +37,7 @@ impl RustmissionTorrent {
                     Header::DownloadRate => Line::from(download_speed_format(&self.download_speed)),
                     Header::UploadRate => Line::from(upload_speed_format(&self.upload_speed)),
                     Header::DownloadDir => Line::from(self.download_dir.as_str()),
+                    Header::Padding => Line::raw(""),
                 }
             };
             cells.push(cell);

diff --git a/rm-main/src/ui/tabs/torrents/table_manager.rs b/rm-main/src/ui/tabs/torrents/table_manager.rs
@@ -2,7 +2,7 @@ use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
 use ratatui::{prelude::*, widgets::Row};
 use rm_config::main_config::Header;
 use std::{
-    collections::BTreeMap,
+    collections::HashMap,
     sync::{Arc, Mutex},
 };
 
@@ -117,7 +117,7 @@ impl TableManager {
             return Self::default_widths(&headers);
         }
 
-        let mut map = BTreeMap::new();
+        let mut map = HashMap::new();
 
         for header in headers {
             map.insert(header, header.default_constraint());
@@ -155,6 +155,12 @@ impl TableManager {
             }
         }
 
-        map.values().cloned().collect()
+        let mut constraints = vec![];
+
+        for header in headers {
+            constraints.push(map.remove(header).expect("this header exists"))
+        }
+
+        constraints
     }
 }