From d08c45045d336eee6a3bf42940a206bd2e38e6f9 Mon Sep 17 00:00:00 2001 From: Dastan-glitch Date: Tue, 27 Jun 2023 04:48:14 +0300 Subject: [PATCH] bin/tau: change assign usage from key:value to @value --- bin/tau/tau-cli/src/filter.rs | 13 +------------ bin/tau/tau-cli/src/primitives.rs | 8 ++++---- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/bin/tau/tau-cli/src/filter.rs b/bin/tau/tau-cli/src/filter.rs index 2b0b511b9..fefabd6c6 100644 --- a/bin/tau/tau-cli/src/filter.rs +++ b/bin/tau/tau-cli/src/filter.rs @@ -83,18 +83,7 @@ pub fn apply_filter(tasks: &mut Vec, filter: &str) { } // Filter by assignee(s). - _ if filter.contains("assign:") => { - let kv: Vec<&str> = filter.split(':').collect(); - if kv.len() == 2 { - if let Some(value) = Value::from(kv[1]).as_str() { - if value.is_empty() { - tasks.retain(|task| task.assign.is_empty()) - } else { - tasks.retain(|task| task.assign.contains(&value.to_string())) - } - } - } - } + _ if filter.starts_with('@') => tasks.retain(|task| task.assign.contains(&filter.into())), // Filter by project(s). _ if filter.contains("project:") => { diff --git a/bin/tau/tau-cli/src/primitives.rs b/bin/tau/tau-cli/src/primitives.rs index db248db5d..29a4c8808 100644 --- a/bin/tau/tau-cli/src/primitives.rs +++ b/bin/tau/tau-cli/src/primitives.rs @@ -173,6 +173,10 @@ pub fn task_from_cli(values: Vec) -> Result { tags.push(field[0].into()); continue } + if field[0].starts_with('@') { + assign.push(field[0].into()); + continue + } title.push_str(field[0]); title.push(' '); continue @@ -190,10 +194,6 @@ pub fn task_from_cli(values: Vec) -> Result { desc = Some(field[1].into()); } - if field[0] == "assign" { - assign = field[1].split(',').map(|s| s.into()).collect(); - } - if field[0] == "due" { due = due_as_timestamp(field[1]) }