Adds view for hashtags

todotxt-rs · Dec 19, 2024 · fb810a2 · fb810a2
1 parent 6cd7ade
commit fb810a2
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,7 +30,7 @@ version = "0.4"
 features = ["std"]
 
 [dependencies.todo-txt]
-version = "4.0"
+version = "4.1"
 features = ["config", "extended"]
 
 [build-dependencies]

diff --git a/resources/resource.xml b/resources/resource.xml
@@ -8,6 +8,7 @@
         <file>inbox.png</file>
         <file>projects.png</file>
         <file>search.png</file>
+        <file>tags.png</file>
         <file compressed="true">style.css</file>
         <file compressed="true">style_dark.css</file>
         <file compressed="true">style_light.css</file>

diff --git a/resources/tags.png b/resources/tags.png
diff --git a/src/application/mod.rs b/src/application/mod.rs
@@ -22,6 +22,7 @@ enum Page {
     Flag,
     Done,
     Search,
+    Tags,
 }
 
 impl From<u32> for Page {
@@ -30,10 +31,11 @@ impl From<u32> for Page {
             0 => Page::Inbox,
             1 => Page::Projects,
             2 => Page::Contexts,
-            3 => Page::Agenda,
-            4 => Page::Flag,
-            5 => Page::Done,
-            6 => Page::Search,
+            3 => Page::Tags,
+            4 => Page::Agenda,
+            5 => Page::Flag,
+            6 => Page::Done,
+            7 => Page::Search,
             _ => panic!("Invalid page {n}"),
         }
     }
@@ -67,6 +69,7 @@ pub struct Model {
     logger: relm4::Controller<crate::logger::Model>,
     projects: relm4::Controller<crate::widgets::tags::Model>,
     search: relm4::Controller<crate::search::Model>,
+    tags: relm4::Controller<crate::widgets::tags::Model>,
 }
 
 impl Model {
@@ -120,6 +123,7 @@ impl Model {
             Page::Flag => "flag",
             Page::Done => "done",
             Page::Search => "search",
+            Page::Tags => "tags",
         };
 
         let image = gtk::Image::from_icon_name(title);
@@ -250,6 +254,7 @@ impl Model {
         self.flag.sender().emit(crate::flag::Msg::Update);
         self.inbox.sender().emit(crate::inbox::Msg::Update);
         self.search.sender().emit(crate::search::MsgInput::Update);
+        self.tags.sender().emit(crate::widgets::tags::MsgInput::Update);
     }
 
     fn watch(&self, sender: relm4::ComponentSender<Self>) {
@@ -348,6 +353,13 @@ impl relm4::Component for Model {
                 crate::widgets::task::MsgOutput::Edit(task) => Msg::Edit(task),
             });
 
+        let tags = crate::widgets::tags::Model::builder()
+            .launch(crate::widgets::tags::Type::Hashtags)
+            .forward(sender.input_sender(), |output| match output {
+                crate::widgets::tags::MsgOutput::Complete(task) => Msg::Complete(task),
+                crate::widgets::tags::MsgOutput::Edit(task) => Msg::Edit(task),
+            });
+
         let model = Self {
             agenda,
             config: init,
@@ -359,6 +371,7 @@ impl relm4::Component for Model {
             logger,
             projects,
             search,
+            tags,
         };
 
         let widgets = view_output!();
@@ -468,6 +481,7 @@ impl relm4::Component for Model {
                         append_page: (model.inbox.widget(), None::<&gtk::Label>),
                         append_page: (model.projects.widget(), None::<&gtk::Label>),
                         append_page: (model.contexts.widget(), None::<&gtk::Label>),
+                        append_page: (model.tags.widget(), None::<&gtk::Label>),
                         append_page: (model.agenda.widget(), None::<&gtk::Label>),
                         append_page: (model.flag.widget(), None::<&gtk::Label>),
                         append_page: (model.done.widget(), None::<&gtk::Label>),

diff --git a/src/inbox.rs b/src/inbox.rs
@@ -22,7 +22,7 @@ impl Model {
             .iter()
             .filter(|x| {
                 !x.finished
-                    && x.projects().is_empty()
+                    && x.projects.is_empty()
                     && (preferences.defered
                         || x.threshold_date.is_none()
                         || x.threshold_date.unwrap() <= today)

diff --git a/src/tasks/task.rs b/src/tasks/task.rs
@@ -25,7 +25,7 @@ impl Task {
             })
             .into_owned();
 
-        let regex = regex::Regex::new(r"(?P<space>^|[\s])(?P<tag>[\+@][\w\-\\]+)").unwrap();
+        let regex = regex::Regex::new(r"(?P<space>^|[\s])(?P<tag>[\+@#][\w\-\\]+)").unwrap();
         subject = regex
             .replace_all(&subject, "$space<b>$tag</b>")
             .into_owned();

diff --git a/src/widgets/tags.rs b/src/widgets/tags.rs
@@ -5,6 +5,7 @@ use relm4::ComponentController as _;
 pub enum Type {
     Projects,
     Contexts,
+    Hashtags,
 }
 
 #[derive(Debug)]
@@ -32,6 +33,7 @@ impl Model {
         let tags = match self.tag {
             Type::Projects => list.projects(),
             Type::Contexts => list.contexts(),
+            Type::Hashtags => list.hashtags(),
         };
 
         let tags = tags
@@ -78,7 +80,7 @@ impl Model {
 
                 (preferences.done || !x.finished)
                     && !tags.is_empty()
-                    && Self::has_filter(tags, filters)
+                    && Self::has_filter(&tags, filters)
                     && (preferences.defered
                         || x.threshold_date.is_none()
                         || x.threshold_date.unwrap() <= today)
@@ -92,8 +94,9 @@ impl Model {
 
     fn tags<'a>(&self, task: &'a crate::tasks::Task) -> &'a [String] {
         match self.tag {
-            Type::Projects => task.projects(),
-            Type::Contexts => task.contexts(),
+            Type::Projects => &task.projects,
+            Type::Contexts => &task.contexts,
+            Type::Hashtags => &task.hashtags,
         }
     }