janek
/
mostr
1
0
Fork 1
Code Issues Pull Requests Releases Activity

Compare commits

base: janek:bdb8b6e814f7937a53bb318e882b673d23ef47a9
Branches Tags
janek:main
janek:taskprogress-recursive
..
compare: janek:49d8eef29c4c6fae3193f44f33c5ddd2b3ce855b
Branches Tags
janek:main
janek:taskprogress-recursive

2 Commits
bdb8b6e814 ... 49d8eef29c

Author SHA1 Message Date
xeruf 49d8eef29c fix(tasks): wrong position for immediate task entering 2024-10-15 15:42:17 +02:00
xeruf 74fff5a2b1 fix(main): only parse single-digit view depths 2024-10-15 03:28:40 +02:00
2 changed files with 12 additions and 8 deletions
Show Stats Expand all files Collapse all files

17
src/main.rs
View File

@ -686,13 +686,18 @@ async fn main() -> Result<()> {
} else {
tasks.clear_filters();
}
} else if let Ok(depth) = remaining.parse::<usize>() {
if pos != tasks.get_position_ref() {
tasks.move_to(pos.cloned());
}
tasks.set_view_depth(depth);
} else {
tasks.filter_or_create(pos.cloned().as_ref(), &remaining).map(|id| tasks.move_to(Some(id)));
match remaining.parse::<usize>() {
Ok(depth) if depth < 10 => {
if pos != tasks.get_position_ref() {
tasks.move_to(pos.cloned());
}
tasks.set_view_depth(depth);
}
_ => {
tasks.filter_or_create(pos.cloned().as_ref(), &remaining).map(|id| tasks.move_to(Some(id)));
}
}
}
}

3
src/tasks.rs
View File

@ -702,9 +702,8 @@ impl TasksRelay {
if filtered.is_empty() {
filtered = filtered_fuzzy;
}
let pos = self.get_position_ref();
let immediate = filtered.iter().filter(
|t| self.get_by_id(t).is_some_and(|t| t.parent_id() == pos)).collect_vec();
|t| self.get_by_id(t).is_some_and(|t| t.parent_id() == position)).collect_vec();
if immediate.len() == 1 {
return immediate.into_iter().cloned().collect_vec();
}