top: tui impl R

Author: Bluemangoo

src/uu/top/src/top.rs

@@ -200,10 +200,6 @@ fn selected_fields() -> Vec<String> {
 
 fn collect(settings: &Settings, fields: &[String], tui_stat: &TuiStat) -> Vec<Vec<String>> {
     let pickers = pickers(fields);
-    let sorter_nth = fields
-        .iter()
-        .position(|f| f == &tui_stat.sorter)
-        .unwrap_or(0);
 
     let pids = sysinfo()
         .read()
@@ -225,7 +221,18 @@ fn collect(settings: &Settings, fields: &[String], tui_stat: &TuiStat) -> Vec<Ve
                 .collect::<Vec<_>>()
         })
         .collect::<Vec<Vec<Box<dyn Column>>>>();
-    collected.sort_by(|a, b| a[sorter_nth].cmp_dyn(&*b[sorter_nth]));
+
+    let sorter = if tui_stat.sort_by_pid {
+        "PID"
+    } else {
+        &tui_stat.sorter
+    };
+    let sorter_nth = fields.iter().position(|f| f == sorter).unwrap_or(0);
+    if tui_stat.sort_by_pid {
+        collected.sort_by(|a, b| a[sorter_nth].cmp_dyn(&*b[sorter_nth])); // reverse
+    } else {
+        collected.sort_by(|a, b| b[sorter_nth].cmp_dyn(&*a[sorter_nth]));
+    }
     collected
         .into_iter()
         .map(|it| it.into_iter().map(|c| c.as_string()).collect())

src/uu/top/src/tui/input.rs

@@ -75,6 +75,15 @@ pub fn handle_input(
                 stat.memory_graph_mode = stat.memory_graph_mode.next();
                 should_update.store(true, Ordering::Relaxed);
             }
+            char!('R') => {
+                {
+                    let mut stat = tui_stat.write().unwrap();
+                    stat.sort_by_pid = !stat.sort_by_pid;
+                }
+
+                data.write().unwrap().1 = ProcList::new(settings, &tui_stat.read().unwrap());
+                should_update.store(true, Ordering::Relaxed);
+            }
             char!('t') => {
                 let mut stat = tui_stat.write().unwrap();
                 stat.cpu_graph_mode = stat.cpu_graph_mode.next();

src/uu/top/src/tui/mod.rs

@@ -359,11 +359,16 @@ impl<'a> Tui<'a> {
         let colorful = self.stat.colorful;
         let highlight_sorted = self.stat.highlight_sorted;
         let highlight_bold = self.stat.highlight_bold;
+        let sorter = if self.stat.sort_by_pid {
+            "PID"
+        } else {
+            &self.stat.sorter
+        };
         let highlight_column = self
             .proc_list
             .fields
             .iter()
-            .position(|f| f == &self.stat.sorter)
+            .position(|f| f == sorter)
             .unwrap_or(0);
         let build_constraint = |field: &str| match field {
             "PID" => Constraint::Length(7),

src/uu/top/src/tui/stat.rs

@@ -23,6 +23,7 @@ pub(crate) struct TuiStat {
     pub full_command_line: bool,
     pub delay: Duration,
     pub sorter: String,
+    pub sort_by_pid: bool,
     pub highlight_sorted: bool,
     pub highlight_bold: bool,
 }
@@ -52,6 +53,7 @@ impl TuiStat {
             full_command_line: true,
             delay: Duration::from_millis(1500), // 1.5s
             sorter: filter,
+            sort_by_pid: false,
             highlight_sorted: false,
             highlight_bold: false,
         }