top: fix uptime format

Author: Bluemangoo

Cargo.lock

@@ -33,6 +33,9 @@ windows-sys = { workspace = true, features = [
 [target.'cfg(target_os="linux")'.build-dependencies]
 pkg-config = "0.3.31"
 
+[dev-dependencies]
+regex = { workspace = true }
+
 [lib]
 path = "src/top.rs"
 

src/uu/top/Cargo.toml

@@ -5,8 +5,9 @@
 
 use crate::picker::sysinfo;
 use bytesize::ByteSize;
+use uucore::error::UResult;
 use uucore::uptime::{
-    get_formated_uptime, get_formatted_loadavg, get_formatted_nusers, get_formatted_time,
+    get_formatted_loadavg, get_formatted_nusers, get_formatted_time, get_uptime, UptimeError,
 };
 
 pub(crate) fn header(scale_summary_mem: Option<&String>) -> String {
@@ -39,12 +40,39 @@ fn format_memory(memory_b: u64, unit: u64) -> f64 {
     ByteSize::b(memory_b).0 as f64 / unit as f64
 }
 
+fn format_uptime_procps(up_secs: i64) -> UResult<String> {
+    if up_secs < 0 {
+        Err(UptimeError::SystemUptime)?;
+    }
+    let up_days = up_secs / 86400;
+    let up_hours = (up_secs - (up_days * 86400)) / 3600;
+    let up_mins = (up_secs - (up_days * 86400) - (up_hours * 3600)) / 60;
+    let day_str = match up_days.cmp(&1) {
+        std::cmp::Ordering::Equal => format!("{up_days:1} day, "),
+        std::cmp::Ordering::Greater => format!("{up_days:1} days, "),
+        _ => String::new(),
+    };
+    let hour_min_str = if up_hours > 0 {
+        format!("{up_hours:2}:{up_mins:02}")
+    } else {
+        format!("{up_mins:02} min")
+    };
+    Ok(format!("{}{}", day_str, hour_min_str))
+}
+
+#[inline]
+fn get_formated_uptime_procps() -> UResult<String> {
+    let time_str = format_uptime_procps(get_uptime(None)?)?;
+    Ok(format!("up {}", time_str))
+}
+
+#[inline]
 fn uptime() -> String {
-    get_formated_uptime(None).unwrap_or_default()
+    get_formated_uptime_procps().unwrap_or_default()
 }
 
 #[cfg(target_os = "linux")]
-pub fn get_nusers_systemd() -> uucore::error::UResult<usize> {
+pub fn get_nusers_systemd() -> UResult<usize> {
     use std::ffi::CStr;
     use std::ptr;
     use uucore::error::USimpleError;
@@ -249,3 +277,31 @@ fn memory(scale_summary_mem: Option<&String>) -> String {
         unit_name = unit_name
     )
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_format_uptime() {
+        let test_times = [
+            1,
+            10,
+            60,
+            100,
+            200,
+            3600,
+            5000,
+            3600 * 24,
+            3600 * 24 + 60,
+            3600 * 24 + 3600,
+        ];
+        let re = regex::Regex::new(r"(\d+ days?,)?\s*\d+( min|:\d+)").unwrap();
+
+        test_times.iter().for_each(|up_secs| {
+            let result = format_uptime_procps(*up_secs).unwrap();
+
+            assert!(re.is_match(&result));
+        })
+    }
+}