Modify taskwarrior block to support more general filter instead of filter_tags

This deprecates `filter_tags`. `filter_tags` prepended with '+' and
concatenated them to build `filter`.

e.g.

filter_tags = [ "tag1", "tag2"]

becomes

filter = "+tag1 +tag2"

Author: matt-snider

blocks.md

@@ -1322,7 +1322,7 @@ format_singular = "{count} open task"
 format_everything_done = "nothing to do!"
 warning_threshold = 10
 critical_threshold = 20
-filter_tags = ["work", "important"]
+filter = "+work +important"
 ```
 
 #### Options
@@ -1332,7 +1332,8 @@ Key | Values | Required | Default
 `interval` | Update interval, in seconds. | No | `600` (10min)
 `warning_threshold` | The threshold of pending (or started) tasks when the block turns into a warning state. | No | `10`
 `critical_threshold` | The threshold of pending (or started) tasks when the block turns into a critical state. | No | `20`
-`filter_tags` | A list of tags a task has to have before its counted as a pending task. | No | ```<empty>```
+`filter_tags` | Deprecated in favour of `filter`. A list of tags a task has to have before its counted as a pending task. | No | ```<empty>```
+`filter` | A filter that a task has to match to be counted as a pending task. | No | ```<empty```
 `format` | A string to customise the output of this block. See below for available placeholders. Text may need to be escaped, refer to [Escaping Text](#escaping-text). | No | `"{count}"`
 `format_singular` | Same as `format` but for when exactly one task is pending. | No | `"{count}"`
 `format_everything_done` | Same as `format` but for when all tasks are completed. | No | `"{count}"`

src/blocks/taskwarrior.rs

@@ -21,7 +21,7 @@ pub struct Taskwarrior {
     update_interval: Duration,
     warning_threshold: u32,
     critical_threshold: u32,
-    filter_tags: Vec<String>,
+    filter: String,
     block_mode: TaskwarriorBlockMode,
     format: FormatTemplate,
     format_singular: FormatTemplate,
@@ -53,9 +53,14 @@ pub struct TaskwarriorConfig {
     pub critical_threshold: u32,
 
     /// A list of tags a task has to have before it's used for counting pending tasks
+    /// (DEPRECATED) use filter instead
     #[serde(default = "TaskwarriorConfig::default_filter_tags")]
     pub filter_tags: Vec<String>,
 
+    /// The search criteria that matching tasks must have to be counted
+    #[serde(default = "TaskwarriorConfig::default_filter")]
+    pub filter: String,
+
     /// Format override
     #[serde(default = "TaskwarriorConfig::default_format")]
     pub format: String,
@@ -96,6 +101,10 @@ impl TaskwarriorConfig {
         vec![]
     }
 
+    fn default_filter() -> String {
+        String::new()
+    }
+
     fn default_format() -> String {
         "{count}".to_owned()
     }
@@ -123,7 +132,11 @@ impl ConfigBlock for Taskwarrior {
             update_interval: block_config.interval,
             warning_threshold: block_config.warning_threshold,
             critical_threshold: block_config.critical_threshold,
-            filter_tags: block_config.filter_tags,
+            filter: if block_config.filter_tags.len() > 0 {
+                tags_to_filter(&block_config.filter_tags)
+            } else {
+                block_config.filter
+            },
             block_mode: TaskwarriorBlockMode::OnlyFilteredPendingTasks,
             output,
             format: FormatTemplate::from_string(&block_config.format).block_error(
@@ -171,14 +184,14 @@ fn tags_to_filter(tags: &[String]) -> String {
         .join(" ")
 }
 
-fn get_number_of_pending_tasks(tags: &[String]) -> Result<u32> {
+fn get_number_of_pending_tasks(filter: &str) -> Result<u32> {
     String::from_utf8(
         Command::new("sh")
             .args(&[
                 "-c",
                 &format!(
                     "task rc.gc=off -COMPLETED -DELETED {} count",
-                    tags_to_filter(tags)
+                    filter
                 ),
             ])
             .output()
@@ -202,11 +215,11 @@ impl Block for Taskwarrior {
         if !has_taskwarrior()? {
             self.output.set_text("?")
         } else {
-            let filter_tags = match self.block_mode {
-                TaskwarriorBlockMode::OnlyFilteredPendingTasks => self.filter_tags.clone(),
-                TaskwarriorBlockMode::AllPendingTasks => vec![],
+            let filter = match self.block_mode {
+                TaskwarriorBlockMode::OnlyFilteredPendingTasks => &self.filter,
+                TaskwarriorBlockMode::AllPendingTasks => "",
             };
-            let number_of_pending_tasks = get_number_of_pending_tasks(&filter_tags)?;
+            let number_of_pending_tasks = get_number_of_pending_tasks(filter)?;
             let values = map!("{count}" => number_of_pending_tasks);
             self.output.set_text(match number_of_pending_tasks {
                 0 => self.format_everything_done.render_static_str(&values)?,