gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

make calculation of DependencyMap easier to read

Browse Source
This commit is contained in:
Dustin J. Mitchell
2023-02-03 01:08:19 +00:00
committed by Dustin J. Mitchell
parent 7b0104e177
commit c701a81699
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
taskchampion/taskchampion/src/replica.rs
View File

@@ -122,27 +122,37 @@ impl Replica {
let mut dm = DependencyMap::new(); let mut dm = DependencyMap::new();
// temporary cache tracking whether tasks are considered Pending or not. // temporary cache tracking whether tasks are considered Pending or not.
let mut is_pending = HashMap::new(); let mut is_pending_cache = HashMap::new();
let ws = self.working_set()?; let ws = self.working_set()?;
// for each task in the working set
for i in 1..=ws.largest_index() { for i in 1..=ws.largest_index() {
// get the task UUID
if let Some(u) = ws.by_index(i) { if let Some(u) = ws.by_index(i) {
// get the task
if let Some(taskmap) = self.taskdb.get_task(u)? { if let Some(taskmap) = self.taskdb.get_task(u)? {
// search the task's keys
for p in taskmap.keys() { for p in taskmap.keys() {
// for one matching `dep_..`
if let Some(dep_str) = p.strip_prefix("dep_") { if let Some(dep_str) = p.strip_prefix("dep_") {
// and extract the UUID from the key
if let Ok(dep) = Uuid::parse_str(dep_str) { if let Ok(dep) = Uuid::parse_str(dep_str) {
// the dependency is pending if
let dep_pending = { let dep_pending = {
if let Some(dep_pending) = is_pending.get(&dep) { // we've determined this before and cached the result
if let Some(dep_pending) = is_pending_cache.get(&dep) {
*dep_pending *dep_pending
} else if let Some(dep_taskmap) = } else if let Some(dep_taskmap) =
// or if we get the task
self.taskdb.get_task(dep)? self.taskdb.get_task(dep)?
{ {
// and its status is "pending"
let dep_pending = matches!( let dep_pending = matches!(
dep_taskmap dep_taskmap
.get("status") .get("status")
.map(|tm| Status::from_taskmap(tm)), .map(|tm| Status::from_taskmap(tm)),
Some(Status::Pending) Some(Status::Pending)
); );
is_pending.insert(dep, dep_pending); is_pending_cache.insert(dep, dep_pending);
dep_pending dep_pending
} else { } else {
false false