GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-22 20:23:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add Replica::get_working_set_index and use it

Browse source 
This is probably ridiculously inefficient, as it will load the working
set for each and every task listed.  Optimize later!
This commit is contained in:
Dustin J. Mitchell 2020-11-24 12:05:30 -05:00
parent 2dd86edd4a
commit 1c5e9b009b
3 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cli/src/cmd/info.rs
View file

@ -30,11 +30,16 @@ define_subcommand! {
subcommand_invocation! {
fn run(&self, command: &CommandInvocation) -> Fallible<()> {
let task = shared::get_task(&mut command.get_replica(), &self.task)?;
let mut replica = command.get_replica();
let task = shared::get_task(&mut replica, &self.task)?;
let uuid = task.get_uuid();
let mut t = Table::new();
t.set_format(table::format());
t.add_row(row![b->"Uuid", task.get_uuid()]);
t.add_row(row![b->"Uuid", uuid]);
if let Some(i) = replica.get_working_set_index(uuid)? {
t.add_row(row![b->"Id", i]);
}
t.add_row(row![b->"Description", task.get_description()]);
t.add_row(row![b->"Status", task.get_status()]);
t.printstd();

11
cli/src/cmd/list.rs
View file

@ -23,11 +23,16 @@ define_subcommand! {
subcommand_invocation! {
fn run(&self, command: &CommandInvocation) -> Fallible<()> {
let mut replica = command.get_replica();
let mut t = Table::new();
t.set_format(table::format());
t.set_titles(row![b->"uuid", b->"description"]);
for (uuid, task) in command.get_replica().all_tasks().unwrap() {
t.add_row(row![uuid, task.get_description()]);
t.set_titles(row![b->"id", b->"description"]);
for (uuid, task) in replica.all_tasks().unwrap() {
let mut id = uuid.to_string();
if let Some(i) = replica.get_working_set_index(&uuid)? {
id = i.to_string();
}
t.add_row(row![id, task.get_description()]);
}
t.printstd();
Ok(())

19
taskchampion/src/replica.rs
View file

@ -105,6 +105,19 @@ impl Replica {
return Ok(None);
}
/// Get the working set index for the given task uuid
pub fn get_working_set_index(&mut self, uuid: &Uuid) -> Fallible<Option<usize>> {
let working_set = self.taskdb.working_set()?;
for (i, u) in working_set.iter().enumerate() {
if let Some(ref u) = u {
if u == uuid {
return Ok(Some(i));
}
}
}
Ok(None)
}
/// Create a new task. The task must not already exist.
pub fn new_task(&mut self, uuid: Uuid, status: Status, description: String) -> Fallible<Task> {
// check that it doesn't exist; this is a convenience check, as the task
@ -223,6 +236,10 @@ mod tests {
let t = rep.get_task(&uuid).unwrap().unwrap();
assert_eq!(t.get_status(), Status::Deleted);
assert_eq!(t.get_description(), "gone");
rep.gc().unwrap();
assert!(rep.get_working_set_index(t.get_uuid()).unwrap().is_none());
}
#[test]
@ -241,6 +258,8 @@ mod tests {
assert_eq!(ws.len(), 2);
assert!(ws[0].is_none());
assert_eq!(ws[1].as_ref().unwrap().get_uuid(), &uuid);
assert_eq!(rep.get_working_set_index(t.get_uuid()).unwrap().unwrap(), 1);
}
#[test]