enhance(tasks): revamp time formatting

Cargo.toml

@@ -5,7 +5,7 @@ repository  = "https://forge.ftt.gmbh/janek/mostr"
 readme = "README.md"
 license = "GPL 3.0"
 authors = ["melonion"]
-version = "0.9.3"
+version = "0.10.0"
 rust-version = "1.82"
 edition = "2021"
 default-run = "mostr"
@@ -21,15 +21,15 @@ regex = "1.11"
 log = "0.4"
 env_logger = "0.11"
 colog = "1.3"
-colored = "2.2"
+colored = "3.0"
 rustyline = { git = "https://github.com/xeruf/rustyline", rev = "5364854" }
 # OS-Specific Abstractions
 keyring = "3"
-directories = "5.0"
-whoami = "1.5"
+directories = "6.0"
+whoami = "1.6"
 # slint = "1.8"
 # Application Utils
-itertools = "0.12"
+itertools = "0.14"
 chrono = "0.4"
 parse_datetime = "0.5"
 interim = { version = "0.1", features = ["chrono"] }

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.84.0"
+channel = "1.87"

src/tasks.rs

@@ -736,8 +736,8 @@ impl TasksRelay {
             "path" => self.get_task_path(Some(task.get_id())),
             "rpath" => self.get_relative_path(task.get_id()),
             // TODO format strings configurable
-            "time" => format_secs("MMMm", self.time_tracked(task.get_id())),
-            "rtime" => format_secs("HHH:MM", self.total_time_tracked(task.get_id())),
+            "time" => format_secs("TTTT", self.time_tracked(task.get_id())),
+            "rtime" => format_secs("TT:TT", self.total_time_tracked(task.get_id())),
             prop => task.get(prop).unwrap_or_default(),
         }
     }
@@ -1551,7 +1551,7 @@ impl Display for TasksRelay {
 
         writeln!(lock,
                  "{count} visible tasks{}",
-                 format_secs(" tracked a total of HHhMMm", total_time)
+                 format_secs(" tracked a total of T", total_time)
         )?;
         Ok(())
     }
@@ -1593,24 +1593,23 @@ where
     }
 }
 
-/// Formats the given seconds according to the given format.
-/// - MMM - minutes
-/// - MM - minutes of the hour
-/// - HH - hours
-///
+/// Formats seconds using a formatting scheme.
 /// Returns an empty string if under one minute.
 fn format_secs(format: &str, secs: u64) -> String {
-    // TODO format to only hours/days for large values
     Some(secs / 60)
         .filter(|t| t > &0)
         .map_or(String::new(), |mins| {
+            let hours = mins / 60;
             format
-                .replace("MMM", &format!("{:3}", mins))
-                .replace("HHH", &format!("{:>3}", mins.div(60)))
-                .replace("HH", &format!("{:>2}", mins.div(60)))
-                .replace("H", &mins.div(60).to_string())
-                .replace("MM", &format!("{:02}", mins.rem(60)))
-                .replace("M", &mins.to_string())
+                .replace("TTTT", 
+                         &(if mins > 999 { format!("h{:03}", hours) }
+                         else { format!("{:>3}m", mins) }))
+                .replace("TT:TT",
+                         &(if hours > 99 { format!("h{:>4}", hours) }
+                         else { format!("{:>2}:{:02}", hours, mins.rem(60)) }))
+                .replace("T",
+                         &(if hours > 99 { format!("{}h", hours) }
+                         else { format!("{}h{:02}m", hours, mins) }))
         })
 }