add time sum in view command

Author: zekroTJA

Cargo.lock

@@ -11,6 +11,7 @@ chrono = "0.4.38"
 clap = { version = "4", features = ["derive"] }
 dirs = "5"
 edit = "0.1.5"
+fancy-duration = { version = "0.9.2", features = ["chrono"] }
 figment = { version = "0.10", features = ["json", "yaml", "toml", "env"] }
 inquire = { version = "0.7.4", features = ["date", "editor"] }
 regex = "1.11.1"

Cargo.toml

@@ -1,16 +1,14 @@
-use std::fmt;
-
 use super::Command;
 use crate::{
     config::Config,
     store::Store,
     util::{parse_date, select_date},
 };
 use anyhow::Result;
-use chrono::Local;
+use chrono::{Duration, Local};
 use clap::Args;
-use regex::Regex;
-use yansi::{Paint, Style};
+use fancy_duration::AsFancyDuration;
+use yansi::Paint;
 
 /// Display tracking list entries
 #[derive(Args)]
@@ -38,7 +36,20 @@ impl Command for View {
         let mut entries = store.list(date)?;
         entries.sort_by_key(|e| e.timestamp);
 
+        let mut sum = Duration::zero();
+        let mut pause_time = Duration::zero();
+        let mut last_timestamp = None;
+
         for (i, e) in entries.iter().enumerate() {
+            if let Some(last_timestamp) = last_timestamp {
+                match e.message_matches(&config.pause_regex)? {
+                    true => pause_time += e.timestamp - last_timestamp,
+                    false => sum += e.timestamp - last_timestamp,
+                }
+            }
+
+            last_timestamp = Some(e.timestamp);
+
             print!(
                 "{}{}{} ",
                 "[".dim(),
@@ -49,6 +60,12 @@ impl Command for View {
             println!("{}", e.formatted(config, self.long)?);
         }
 
+        println!(
+            "\n     {} ({})",
+            sum.fancy_duration().truncate(2).to_string().cyan().bold(),
+            format!("{} pause", pause_time.fancy_duration().truncate(2)).green()
+        );
+
         Ok(())
     }
 }

src/commands/view.rs

@@ -3,7 +3,7 @@ use anyhow::Result;
 use chrono::{Datelike, Duration, Local, NaiveDate};
 use inquire::DateSelect;
 use regex::Regex;
-use std::{fmt, io::Write};
+use std::fmt;
 use yansi::{Paint, Style};
 
 static STYLE_START: Style = Style::new().cyan();
@@ -28,7 +28,7 @@ impl Entry {
             "{} {} {}",
             self.timestamp_formatted().rgb(244, 9, 84),
             ":".dim(),
-            style_entry(&self.message, config)?
+            self.style_message(config)?
         )?;
         if let Some(ref long_message) = self.long {
             if long {
@@ -39,6 +39,22 @@ impl Entry {
         }
         Ok(())
     }
+
+    pub fn message_matches(&self, rx: &str) -> Result<bool> {
+        Ok(Regex::new(rx)?.is_match(&self.message))
+    }
+
+    fn style_message<'a>(&'a self, config: &Config) -> Result<Box<dyn fmt::Display + 'a>> {
+        Ok(if self.message_matches(&config.start_regex)? {
+            Box::new(self.message.paint(STYLE_START))
+        } else if self.message_matches(&config.pause_regex)? {
+            Box::new(self.message.paint(STYLE_PAUSE))
+        } else if self.message_matches(&config.end_regex)? {
+            Box::new(self.message.paint(STYLE_END))
+        } else {
+            Box::new(&self.message)
+        })
+    }
 }
 
 fn format_long(long: &str) -> String {
@@ -50,18 +66,6 @@ fn format_long(long: &str) -> String {
     str
 }
 
-fn style_entry<'a>(v: &'a str, config: &Config) -> Result<Box<dyn fmt::Display + 'a>> {
-    Ok(if Regex::new(&config.start_regex)?.is_match(v) {
-        Box::new(v.paint(STYLE_START))
-    } else if Regex::new(&config.pause_regex)?.is_match(v) {
-        Box::new(v.paint(STYLE_PAUSE))
-    } else if Regex::new(&config.end_regex)?.is_match(v) {
-        Box::new(v.paint(STYLE_END))
-    } else {
-        Box::new(v)
-    })
-}
-
 pub fn parse_date(date: &str) -> Result<NaiveDate> {
     let today = Local::now().date_naive();
 
@@ -106,7 +110,7 @@ impl<'a> FormatableEntry<'a> {
     }
 }
 
-impl<'a> fmt::Display for FormatableEntry<'a> {
+impl fmt::Display for FormatableEntry<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.entry
             .format(f, self.config, self.long)