Merge branch 'master' into rosetta

Author: dalance

Cargo.lock

@@ -45,7 +45,7 @@ dockworker    = { version = "0.6.0", optional = true }
 getch         = "0.3.1"
 libc          = "0.2"
 minus         = { version = "5.6", features = ["static_output", "search"] }
-once_cell     = "1.21.1"
+once_cell     = "1.21.2"
 serde         = "1.0"
 serde_derive  = "1.0"
 termbg        = "0.6.2"

Cargo.toml

@@ -20,6 +20,7 @@ pub trait Column {
     ) -> String;
     fn display_unit(&self, align: &ConfigColumnAlign) -> String;
     fn display_content(&self, pid: i32, align: &ConfigColumnAlign) -> Option<String>;
+    fn display_json(&self, pid: i32) -> String;
     fn find_partial(&self, pid: i32, keyword: &str, content_to_lowercase: bool) -> bool;
     fn find_exact(&self, pid: i32, keyword: &str, content_to_lowercase: bool) -> bool;
     fn sorted_pid(&self, order: &ConfigSortOrder) -> Vec<i32>;
@@ -33,6 +34,7 @@ pub trait Column {
     );
     fn update_width(&mut self, pid: i32, max_width: Option<usize>);
     fn get_width(&self) -> usize;
+    fn is_numeric(&self) -> bool;
 }
 
 #[macro_export]
@@ -85,6 +87,30 @@ macro_rules! column_default_display_content {
     };
 }
 
+#[macro_export]
+macro_rules! column_default_display_json {
+    () => {
+        fn display_json(&self, pid: i32) -> String {
+            let value = if self.is_numeric() {
+                self.raw_contents
+                    .get(&pid)
+                    .map(|x| x.to_string())
+                    .unwrap_or("".to_string())
+            } else {
+                let value = self
+                    .fmt_contents
+                    .get(&pid)
+                    .map(|x| x.clone())
+                    .unwrap_or("".to_string());
+                let value = value.replace("\\", "\\\\");
+                let value = value.replace("\"", "\\\"");
+                format!("\"{}\"", value)
+            };
+            format!("\"{}\": {}", self.header, value)
+        }
+    };
+}
+
 #[macro_export]
 macro_rules! column_default_find_partial {
     () => {
@@ -201,18 +227,29 @@ macro_rules! column_default_get_width {
     };
 }
 
+#[macro_export]
+macro_rules! column_default_is_numeric {
+    ($x:expr) => {
+        fn is_numeric(&self) -> bool {
+            $x
+        }
+    };
+}
+
 #[macro_export]
 macro_rules! column_default {
-    ($x:ty) => {
+    ($x:ty, $y:expr) => {
         $crate::column_default_display_header!();
         $crate::column_default_display_unit!();
         $crate::column_default_display_content!();
+        $crate::column_default_display_json!();
         $crate::column_default_find_partial!();
         $crate::column_default_find_exact!();
         $crate::column_default_sorted_pid!($x);
         $crate::column_default_apply_visible!();
         $crate::column_default_reset_width!();
         $crate::column_default_update_width!();
         $crate::column_default_get_width!();
+        $crate::column_default_is_numeric!($y);
     };
 }

src/column.rs

@@ -76,5 +76,5 @@ impl Column for Ccgroup {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(String);
+    column_default!(String, false);
 }

src/columns/ccgroup.rs

@@ -41,5 +41,5 @@ impl Column for Cgroup {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(String);
+    column_default!(String, false);
 }

src/columns/cgroup.rs

@@ -53,7 +53,7 @@ impl Column for Command {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(String);
+    column_default!(String, false);
 }
 
 #[cfg(target_os = "macos")]
@@ -85,7 +85,7 @@ impl Column for Command {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(String);
+    column_default!(String, false);
 }
 
 #[cfg(target_os = "windows")]
@@ -98,7 +98,7 @@ impl Column for Command {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(String);
+    column_default!(String, false);
 }
 
 #[cfg(target_os = "freebsd")]
@@ -126,5 +126,5 @@ impl Column for Command {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(String);
+    column_default!(String, false);
 }

src/columns/command.rs

@@ -47,7 +47,7 @@ impl Column for ContextSw {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(u64);
+    column_default!(u64, true);
 }
 
 #[cfg(target_os = "macos")]
@@ -60,7 +60,7 @@ impl Column for ContextSw {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(u64);
+    column_default!(u64, true);
 }
 
 #[cfg(target_os = "freebsd")]
@@ -74,5 +74,5 @@ impl Column for ContextSw {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(u64);
+    column_default!(u64, true);
 }

src/columns/context_sw.rs

@@ -38,7 +38,7 @@ impl Column for CpuTime {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(u64);
+    column_default!(u64, true);
 }
 
 #[cfg(target_os = "macos")]
@@ -55,7 +55,7 @@ impl Column for CpuTime {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(u64);
+    column_default!(u64, true);
 }
 
 #[cfg(target_os = "windows")]
@@ -70,7 +70,7 @@ impl Column for CpuTime {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(u64);
+    column_default!(u64, true);
 }
 
 #[cfg(target_os = "freebsd")]
@@ -89,5 +89,5 @@ impl Column for CpuTime {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(u64);
+    column_default!(u64, true);
 }

src/columns/cpu_time.rs

@@ -137,7 +137,7 @@ impl Column for Docker {
         self.available
     }
 
-    column_default!(String);
+    column_default!(String, false);
 }
 
 #[cfg(target_os = "macos")]
@@ -158,5 +158,5 @@ impl Column for Docker {
         self.available
     }
 
-    column_default!(String);
+    column_default!(String, false);
 }

src/columns/docker.rs

@@ -34,5 +34,5 @@ impl Column for Eip {
         self.raw_contents.insert(proc.pid, raw_content);
     }
 
-    column_default!(u64);
+    column_default!(u64, true);
 }