From 13dac88dedb2e5ae163390d9ca8591b1b1a08e0c Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Mon, 26 Aug 2024 22:41:35 +0300 Subject: [PATCH] fix: more consistent time-tracking history --- src/main.rs | 6 ++++-- src/tasks.rs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index 6eafb02..12fe670 100644 --- a/src/main.rs +++ b/src/main.rs @@ -562,7 +562,8 @@ async fn main() -> Result<()> { if let Some(arg) = arg { if tasks.track_from(arg) { let (label, times) = tasks.times_tracked(); - println!("{}\n{}", label.italic(), times.rev().take(15).join("\n")); + println!("{}\n{}", label.italic(), + times.rev().take(15).collect_vec().iter().rev().join("\n")); } // TODO show history of author / pubkey } else { @@ -578,7 +579,8 @@ async fn main() -> Result<()> { Some(arg) => { if parse_tracking_stamp(arg).and_then(|stamp| tasks.track_at(stamp, None)).is_some() { let (label, times) = tasks.times_tracked(); - println!("{}\n{}", label.italic(), times.rev().take(15).join("\n")); + println!("{}\n{}", label.italic(), + times.rev().take(15).collect_vec().iter().rev().join("\n")); } // So the error message is not covered up continue; diff --git a/src/tasks.rs b/src/tasks.rs index d503e3a..5485bd3 100644 --- a/src/tasks.rs +++ b/src/tasks.rs @@ -189,7 +189,7 @@ impl Tasks { for event in set { let new = some_non_empty(&event.tags.iter() .filter_map(|t| t.content()) - .map(|str| EventId::from_str(str).ok().map_or(str.to_string(), |id| self.get_task_title(&id))) + .map(|str| EventId::from_str(str).ok().map_or(str.to_string(), |id| self.get_task_path(Some(id)))) .join(" ")); if new != last { // TODO alternate color with grey between days