GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #314 from djmitche/issue312

Browse source 
Use `tag_<tag>` instead of `tag.<tag>`
This commit is contained in:
Dustin J. Mitchell 2021-10-30 09:31:36 -04:00 • committed by GitHub
commit af56efdbd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/src/tasks.md
View file

@ -31,7 +31,7 @@ The following keys, and key formats, are defined:
* `description` - the one-line summary of the task
* `modified` - the time of the last modification of this task
* `start` - the most recent time at which this task was started (a task with no `start` key is not active)
* `tag.<tag>` - indicates this task has tag `<tag>` (value is an empty string)
* `tag_<tag>` - indicates this task has tag `<tag>` (value is an empty string)
* `wait` - indicates the time before which this task should be hidden, as it is not actionable
The following are not yet implemented:

36
taskchampion/src/task/task.rs
View file

@ -118,7 +118,7 @@ impl Task {
/// Check if this task has the given tag
pub fn has_tag(&self, tag: &Tag) -> bool {
match tag.inner() {
TagInner::User(s) => self.taskmap.contains_key(&format!("tag.{}", s)),
TagInner::User(s) => self.taskmap.contains_key(&format!("tag_{}", s)),
TagInner::Synthetic(st) => self.has_synthetic_tag(st),
}
}
@ -130,11 +130,11 @@ impl Task {
self.taskmap
.iter()
.filter_map(|(k, _)| {
if let Some(tag) = k.strip_prefix("tag.") {
if let Some(tag) = k.strip_prefix("tag_") {
if let Ok(tag) = tag.try_into() {
return Some(tag);
}
// note that invalid "tag.*" are ignored
// note that invalid "tag_*" are ignored
}
None
})
@ -214,7 +214,7 @@ impl<'r> TaskMut<'r> {
if tag.is_synthetic() {
anyhow::bail!("Synthetic tags cannot be modified");
}
self.set_string(format!("tag.{}", tag), Some("".to_owned()))
self.set_string(format!("tag_{}", tag), Some("".to_owned()))
}
/// Remove a tag from this task. Does nothing if the tag is not present.
@ -222,7 +222,7 @@ impl<'r> TaskMut<'r> {
if tag.is_synthetic() {
anyhow::bail!("Synthetic tags cannot be modified");
}
self.set_string(format!("tag.{}", tag), None)
self.set_string(format!("tag_{}", tag), None)
}
// -- utility functions
@ -383,7 +383,7 @@ mod test {
let task = Task::new(
Uuid::new_v4(),
vec![
(String::from("tag.abc"), String::from("")),
(String::from("tag_abc"), String::from("")),
(String::from("start"), String::from("1234")),
]
.drain(..)
@ -402,8 +402,8 @@ mod test {
let task = Task::new(
Uuid::new_v4(),
vec![
(String::from("tag.abc"), String::from("")),
(String::from("tag.def"), String::from("")),
(String::from("tag_abc"), String::from("")),
(String::from("tag_def"), String::from("")),
// set `wait` so the synthetic tag WAITING is present
(String::from("wait"), String::from("33158909732")),
]
@ -428,10 +428,10 @@ mod test {
let task = Task::new(
Uuid::new_v4(),
vec![
(String::from("tag.ok"), String::from("")),
(String::from("tag."), String::from("")),
(String::from("tag.123"), String::from("")),
(String::from("tag.a!!"), String::from("")),
(String::from("tag_ok"), String::from("")),
(String::from("tag_"), String::from("")),
(String::from("tag_123"), String::from("")),
(String::from("tag_a!!"), String::from("")),
]
.drain(..)
.collect(),
@ -497,12 +497,12 @@ mod test {
fn test_add_tags() {
with_mut_task(|mut task| {
task.add_tag(&utag("abc")).unwrap();
assert!(task.taskmap.contains_key("tag.abc"));
assert!(task.taskmap.contains_key("tag_abc"));
task.reload().unwrap();
assert!(task.taskmap.contains_key("tag.abc"));
assert!(task.taskmap.contains_key("tag_abc"));
// redundant add has no effect..
task.add_tag(&utag("abc")).unwrap();
assert!(task.taskmap.contains_key("tag.abc"));
assert!(task.taskmap.contains_key("tag_abc"));
});
}
@ -511,13 +511,13 @@ mod test {
with_mut_task(|mut task| {
task.add_tag(&utag("abc")).unwrap();
task.reload().unwrap();
assert!(task.taskmap.contains_key("tag.abc"));
assert!(task.taskmap.contains_key("tag_abc"));
task.remove_tag(&utag("abc")).unwrap();
assert!(!task.taskmap.contains_key("tag.abc"));
assert!(!task.taskmap.contains_key("tag_abc"));
// redundant remove has no effect..
task.remove_tag(&utag("abc")).unwrap();
assert!(!task.taskmap.contains_key("tag.abc"));
assert!(!task.taskmap.contains_key("tag_abc"));
});
}
}