Cargo.lock

@@ -681,15 +681,6 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -774,7 +765,6 @@ dependencies = [
 name = "mostr"
 version = "0.1.0"
 dependencies = [
- "itertools",
  "nostr-sdk",
  "once_cell",
  "tokio",

Cargo.toml

@@ -16,4 +16,3 @@ nostr-sdk = "0.30"
 tokio = { version = "1.0.0", features = ["rt", "rt-multi-thread", "macros"] }
 once_cell = "1.19.0"
 xdg = "2.5.2"
-itertools = "0.12.1"

src/task.rs

@@ -2,8 +2,6 @@ use std::collections::{BTreeSet, HashSet};
 use std::fmt;
 use std::ops::Div;
 
-use itertools::Either::{Left, Right};
-use itertools::Itertools;
 use nostr_sdk::{Alphabet, Event, EventBuilder, EventId, Kind, Tag, Timestamp};
 
 use crate::EventSender;
@@ -15,22 +13,18 @@ pub(crate) struct Task {
     pub(crate) props: BTreeSet<Event>,
     /// Cached sorted tags of the event
     pub(crate) tags: Option<BTreeSet<Tag>>,
-    parents: Vec<EventId>,
 }
 
 impl Task {
     pub(crate) fn new(event: Event) -> Task {
-        let (parents, tags) = event.tags.iter().partition_map(|tag| {
-            match tag {
-                Tag::Event { event_id, .. } => return Left(event_id),
-                _ => Right(tag.clone())
-            }
-        });
         Task {
             children: Default::default(),
             props: Default::default(),
-            tags: Some(tags).filter(|t: &BTreeSet<Tag>| !t.is_empty()),
+            tags: if event.tags.is_empty() {
-            parents,
+                None
+            } else {
+                Some(event.tags.iter().cloned().collect())
+            },
             event,
         }
     }
@@ -40,7 +34,13 @@ impl Task {
     }
 
     pub(crate) fn parent_id(&self) -> Option<EventId> {
-        self.parents.first().cloned()
+        for tag in self.event.tags.iter() {
+            match tag {
+                Tag::Event { event_id, .. } => return Some(*event_id),
+                _ => {}
+            }
+        }
+        None
     }
 
     pub(crate) fn get_title(&self) -> String {
@@ -127,8 +127,8 @@ impl Task {
         }
         total
     }
-
+    
-    fn filter_tags<P>(&self, predicate: P) -> Option<String>
+    fn filter_tags<P>(&self, predicate: P) -> Option<String> 
     where P: FnMut(&&Tag) -> bool{
         self.tags.as_ref().map(|tags| {
             tags.into_iter()
@@ -147,8 +147,7 @@ impl Task {
             "name" => Some(self.event.content.clone()),
             "time" => Some(format!("{}m", self.time_tracked().div(60))),
             "hashtags" => self.filter_tags(|tag| tag.single_letter_tag().is_some_and(|sltag| sltag.character == Alphabet::T)),
-            "tags" => self.filter_tags(|_| true),
+            "tags" => self.filter_tags(|tag| !tag.single_letter_tag().is_some_and(|sltag| sltag.character == Alphabet::E)),
-            "alltags" => Some(format!("{:?}", self.tags)),
             "props" => Some(format!(
                 "{:?}",
                 self.props

src/tasks.rs

@@ -194,8 +194,7 @@ impl Tasks {
                         "rpath" => join_tasks(
                             self.traverse_up_from(Some(task.event.id))
                                 .take_while(|t| Some(t.event.id) != self.position)
-                        )
+                        ).unwrap_or(task.event.id.to_string()),
-                        .unwrap_or(task.event.id.to_string()),
                         "rtime" => {
                             let time = self.total_time_tracked(&task.event.id);
                             format!("{:02}:{:02}", time / 3600, time / 60 % 60)
@@ -203,7 +202,7 @@ impl Tasks {
                         prop => task.get(prop).unwrap_or(String::new()),
                     })
                     .collect::<Vec<String>>()
-                    .join(" \t")
+                    .join("\t")
             );
         }
         println!();
@@ -259,22 +258,20 @@ impl Tasks {
 
     // Updates
 
-    /// Expects sanitized input
     pub(crate) fn build_task(&self, input: &str) -> EventBuilder {
         let mut tags: Vec<Tag> = self.tags.iter().cloned().collect();
         self.position.inspect(|p| tags.push(Tag::event(*p)));
         return match input.split_once(": ") {
             None => EventBuilder::new(Kind::from(TASK_KIND), input, tags),
             Some(s) => {
-                tags.append(&mut s.1.split_ascii_whitespace().map(|t| Hashtag(t.to_string())).collect());
+                tags.append(&mut s.1.split(" ").map(|t| Hashtag(t.to_string())).collect());
                 EventBuilder::new(Kind::from(TASK_KIND), s.0, tags)
             }
         };
     }
 
-    /// Sanitizes input
     pub(crate) fn make_task(&mut self, input: &str) -> Option<EventId> {
-        self.sender.submit(self.build_task(input.trim())).map(|e| {
+        self.sender.submit(self.build_task(input)).map(|e| {
             let id = e.id;
             self.add_task(e);
             let state = self.state.clone().unwrap_or("Open".to_string());
@@ -461,11 +458,7 @@ fn test_depth() {
     let empty_id = empty_task.event.id.to_string();
     assert_eq!(empty_task.get_title(), empty_id);
     assert_eq!(tasks.get_task_path(empty), empty_id);
-
+    
     let zero = EventId::all_zeros();
     assert_eq!(tasks.get_task_path(Some(zero)), zero.to_string());
-
-    use itertools::Itertools;
-    assert_eq!("test  toast".split(' ').collect_vec().len(), 3);
-    assert_eq!("test  toast".split_ascii_whitespace().collect_vec().len(), 2);
 }