From f240413e2a5935f0991e5f2a7b7d36e7b37fb2c6 Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Wed, 21 Aug 2024 12:31:29 +0300 Subject: [PATCH] style: various small cleanups --- .gitignore | 1 + src/helpers.rs | 1 - src/main.rs | 9 +++++---- src/tasks.rs | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 554ba2e..5c9c38f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /target /examples +/.idea relays keys *.html \ No newline at end of file diff --git a/src/helpers.rs b/src/helpers.rs index 06ae77f..3657d1d 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -1,4 +1,3 @@ -use std::io::{stdin, stdout, Write}; use std::ops::Sub; use chrono::{DateTime, Local, TimeDelta, TimeZone, Utc}; diff --git a/src/main.rs b/src/main.rs index 86d17cf..82c4e95 100644 --- a/src/main.rs +++ b/src/main.rs @@ -156,7 +156,7 @@ async fn main() -> Result<()> { } else { let mut builder = colog::default_builder(); builder.filter(Some("nostr-relay-pool"), LevelFilter::Error); - //.filter(Some("nostr-relay-pool::relay::internal"), LevelFilter::Off) + //.filter(Some("nostr-relay-pool::relay::internal"), LevelFilter::Off) builder }.write_style(WriteStyle::Always).target(Target::Pipe(Box::new(rl.get_printer()))).init(); @@ -319,8 +319,8 @@ async fn main() -> Result<()> { loop { trace!("All Root Tasks:\n{}", relays.iter().map(|(url, tasks)| - format!("{}: [{}]", - url.as_ref().map(ToString::to_string).unwrap_or(LOCAL_RELAY_NAME.to_string()), + format!("{}: [{}]", + url.as_ref().map(ToString::to_string).unwrap_or(LOCAL_RELAY_NAME.to_string()), tasks.children_of(None).map(|id| tasks.get_task_title(id)).join("; "))).join("\n")); println!(); let tasks = relays.get(&selected_relay).unwrap(); @@ -546,6 +546,7 @@ async fn main() -> Result<()> { let (label, times) = tasks.times_tracked(); println!("{}\n{}", label.italic(), times.rev().take(15).join("\n")); } + // TODO show history from author / pubkey } else { let (label, mut times) = tasks.times_tracked(); println!("{}\n{}", label.italic(), times.join("\n")); @@ -559,7 +560,7 @@ async fn main() -> Result<()> { Some(arg) => { if parse_tracking_stamp(arg).map(|stamp| tasks.track_at(stamp, None)).is_none() { // So the error message is not covered up - continue + continue; } } } diff --git a/src/tasks.rs b/src/tasks.rs index 023c981..974021a 100644 --- a/src/tasks.rs +++ b/src/tasks.rs @@ -396,7 +396,7 @@ impl Tasks { let mut tracking_stamp: Option = None; for elem in timestamps(self.history.get(&self.sender.pubkey()).into_iter().flatten(), &vec![t.get_id()]) - .map(|(e, o)| e) { + .map(|(e, _)| e) { if tracking_stamp.is_some() && elem > now { break; }