Fix separator's meaningless sort #42

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [Unreleased](https://github.com/dalance/procs/compare/v0.9.11...Unreleased) - ReleaseDate
 
+* [Fixed] separator's meaningless sort [#42](https://github.com/dalance/procs/issues/42)
+
 ## [v0.9.11](https://github.com/dalance/procs/compare/v0.9.10...v0.9.11) - 2020-02-16
 
 ## [v0.9.10](https://github.com/dalance/procs/compare/v0.9.9...v0.9.10) - 2020-02-16

src/column.rs

@@ -8,6 +8,10 @@ pub trait Column {
         true
     }
 
+    fn sortable(&self) -> bool {
+        true
+    }
+
     fn display_header(
         &self,
         align: &ConfigColumnAlign,

src/columns/separator.rs

@@ -36,5 +36,9 @@ impl Column for Separator {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
+    fn sortable(&self) -> bool {
+        false
+    }
+
     column_default!(String);
 }

src/view.rs

@@ -380,4 +380,30 @@ impl View {
 
     #[cfg(target_os = "windows")]
     fn pager(_config: &Config) {}
+
+    pub fn inc_sort_column(&mut self) -> usize {
+        let current = self.sort_info.idx;
+        let max_idx = self.columns.len();
+
+        for i in 1..max_idx {
+            let idx = (current + i) % max_idx;
+            if self.columns[idx].column.sortable() {
+                return idx;
+            }
+        }
+        return current;
+    }
+
+    pub fn dec_sort_column(&mut self) -> usize {
+        let current = self.sort_info.idx;
+        let max_idx = self.columns.len();
+
+        for i in 1..max_idx {
+            let idx = (current + max_idx - i) % max_idx;
+            if self.columns[idx].column.sortable() {
+                return idx;
+            }
+        }
+        return current;
+    }
 }

src/watcher.rs

@@ -99,7 +99,7 @@ impl Watcher {
         let term_info = TermInfo::new(false);
         term_info.clear_screen()?;
 
-        let mut sort_offset = 0;
+        let mut sort_idx = None;
         let mut sort_order = None;
         let mut min_widths = HashMap::new();
         let mut prev_term_width = 0;
@@ -108,9 +108,8 @@ impl Watcher {
             let mut view = View::new(opt, config, true);
 
             // Override sort_info by key
-            let max_idx = view.columns.len();
             if !opt.tree {
-                view.sort_info.idx = (view.sort_info.idx + sort_offset) % max_idx;
+                view.sort_info.idx = sort_idx.unwrap_or(view.sort_info.idx);
                 view.sort_info.order = sort_order.clone().unwrap_or(view.sort_info.order);
             }
 
@@ -147,8 +146,8 @@ impl Watcher {
                         view.term_info.clear_screen()?;
                         break 'outer;
                     }
-                    Command::Next => sort_offset = (sort_offset + 1) % max_idx,
-                    Command::Prev => sort_offset = (sort_offset + max_idx - 1) % max_idx,
+                    Command::Next => sort_idx = Some(view.inc_sort_column()),
+                    Command::Prev => sort_idx = Some(view.dec_sort_column()),
                     Command::Ascending => sort_order = Some(ConfigSortOrder::Ascending),
                     Command::Descending => sort_order = Some(ConfigSortOrder::Descending),
                     _ => (),