From 8588fb9a045152de4a409646d1f7cd9d3e6bb687 Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Wed, 14 Aug 2024 15:56:40 +0300 Subject: [PATCH] refactor(main): improved debug output --- src/main.rs | 16 +++++++--------- src/tasks.rs | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main.rs b/src/main.rs index e7f3c1a..bee9463 100644 --- a/src/main.rs +++ b/src/main.rs @@ -298,6 +298,8 @@ async fn main() { let mut lines = stdin().lines(); loop { + trace!("All Root Tasks:\n{}", relays.iter().map(|(url, tasks)| + format!("{}: [{}]", url, tasks.children_of(None).map(|id| tasks.get_task_title(id)).join("; "))).join("\n")); println!(); let tasks = selected_relay.as_ref().and_then(|url| relays.get(url)).unwrap_or(&local_tasks); print!( @@ -320,10 +322,13 @@ async fn main() { .. } = notification { - print_event(&event); + debug!( + "At {} found {} kind {} content \"{}\" tags {:?}", + event.created_at, event.id, event.kind, event.content, event.tags.iter().map(|tag| tag.as_vec()).collect_vec() + ); match relays.get_mut(&relay_url) { Some(tasks) => tasks.add(*event), - None => warn!("Event received from unknown relay {relay_url}: {:?}", event) + None => warn!("Event received from unknown relay {relay_url}: {:?}", *event) } count += 1; } @@ -582,10 +587,3 @@ async fn main() { info!("Submitting pending updates..."); or_print(sender.await); } - -fn print_event(event: &Event) { - debug!( - "At {} found {} kind {} \"{}\" {:?}", - event.created_at, event.id, event.kind, event.content, event.tags - ); -} diff --git a/src/tasks.rs b/src/tasks.rs index 719aba0..a3f3385 100644 --- a/src/tasks.rs +++ b/src/tasks.rs @@ -336,7 +336,7 @@ impl Tasks { self.position.and_then(|id| self.get_by_id(&id)) } - pub(crate) fn children_of(&self, id: Option) -> impl IntoIterator + '_ { + pub(crate) fn children_of(&self, id: Option) -> impl Iterator + '_ { self.tasks .values() .filter(move |t| t.parent_id() == id.as_ref()) @@ -686,7 +686,7 @@ impl Tasks { ) } - fn get_task_title(&self, id: &EventId) -> String { + pub(crate) fn get_task_title(&self, id: &EventId) -> String { self.tasks.get(id).map_or(id.to_string(), |t| t.get_title()) }