maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Adapt to filter returning Iterator

Browse source
This commit is contained in:
Malte Brandy 2018-06-09 16:03:13 +02:00
parent 06af1a749f
commit c03420d8fe
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
3 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
home-manager/packages/rust-scripts/src/generate.rs
View file

@ -279,10 +279,10 @@ fn gen_match(a: &Task, b: &Task) -> bool {
}
impl TaskGenerator for TaskCache {
fn get_by_gen(&self, generator: &Task) -> Option<&Task> {
self.filter(|t| gen_match(t, generator)).into_iter().next()
self.filter(|t| gen_match(t, generator)).next()
}
fn get_by_gen_mut(&mut self, generator: &Task) -> Option<&mut Task> {
self.filter_mut(|t| gen_match(t, generator)).into_iter().next()
self.filter_mut(|t| gen_match(t, generator)).next()
}
fn generate<T>(&mut self, generators: T) -> Result<()>
@ -304,7 +304,6 @@ where
.or_insert_with(|| {
self
.filter(|t| t.gen_name() == Some(name))
.iter()
.filter_map(|t| t.gen_id().map(|id| (id.clone(), t.uuid().clone())))
.collect()
})

29
home-manager/packages/rust-scripts/src/kassandra.rs
View file

@ -215,8 +215,8 @@ impl Kassandra {
.collect()
}
fn get_sorted_tasks<T: Fn(&Task) -> bool>(&self, filter: T) -> Vec<&Task> {
let mut tasks = self.cache.filter(filter);
fn get_sorted_tasks(&self, filter: impl Fn(&Task) -> bool) -> Vec<&Task> {
let mut tasks = self.cache.filter(filter).collect::<Vec<_>>();
tasks.sort_unstable_by_key(|t| t.entry().date());
tasks
}
@ -333,7 +333,8 @@ What's the progress?",
.filter(|t| {
t.gen_name() == Some(&"Sortiere Tasktree".into()) && t.pending()
})
.len() > 0
.next()
.is_some()
{
while let Some(uuid) = self.get_sorted_uuids(|t| {
!t.obsolete() && task_needs_sorting(&self.cache, t.uuid()).unwrap_or(false)
@ -390,10 +391,12 @@ What's the progress?",
let mut parent = None;
loop {
match {
let mut options = self.cache.filter(|t| {
t.pending() && t.partof().map(|partof| partof == parent).unwrap_or(false) &&
(parent.is_some() || self.cache.is_project(t.uuid()))
});
let mut options = self.cache
.filter(|t| {
t.pending() && t.partof().map(|partof| partof == parent).unwrap_or(false) &&
(parent.is_some() || self.cache.is_project(t.uuid()))
})
.collect::<Vec<_>>();
options.sort_unstable_by_key(|t| t.entry().date());
match self.dialog.select_option(
format_msg(&self.cache, parent, "currently at")?,
@ -588,7 +591,8 @@ What's the progress?",
.filter(|t| {
t.gen_name() == Some(&"Leere Inbox".into()) && t.pending()
})
.len() > 0
.next()
.is_some()
{
while let Some(uuid) = self.get_sorted_uuids(|t| task_inbox(&self.cache, t))
.into_iter()
@ -718,7 +722,8 @@ What's the progress?",
.filter(|t| {
t.gen_name() == Some(&"Aktualisiere Buchhaltung".into()) && t.pending()
})
.len() > 0
.next()
.is_some()
{
str2cmd(&term_cmd("sh -c"))
.arg("jali -l. && task gen_id:'Aktualisiere Buchhaltung' done")
@ -731,12 +736,14 @@ What's the progress?",
pub fn select_next_task(&mut self) -> Result<()> {
while self.cache
.filter(|t| t.start().is_some() && t.pending())
.len() == 0 &&
.next()
.is_none() &&
self.cache
.filter(|t| {
t.pending() && self.is_relevant(t) && !task_blocked(&self.cache, t)
})
.len() > 0
.next()
.is_some()
{
if let Some(uuid) = {
let next_tasks = self.get_sorted_tasks(|t| {

5
home-manager/packages/rust-scripts/src/tasktree.rs
View file

@ -117,10 +117,12 @@ impl TreeCache for TaskCache {
fn get_children(&self, uuid: &Uuid) -> Vec<&Task> {
self.filter(|t| t.partof().unwrap_or(None) == Some(*uuid))
.collect()
}
fn get_children_mut(&mut self, uuid: &Uuid) -> Vec<&mut Task> {
self.filter_mut(|t| t.partof().unwrap_or(None) == Some(*uuid))
.collect()
}
fn get_project_path(&self, uuid: &Uuid) -> Result<String> {
@ -150,8 +152,7 @@ impl TreeCache for TaskCache {
.map(|path| path.as_ref() != t.project())
.unwrap_or(false) ||
(self.is_project(t.uuid()) != t.has_tag("project")))
}).iter()
.map(|t| t.uuid().clone())
}).map(|t| t.uuid().clone())
.collect::<Vec<_>>();
for task_uuid in task_uuids {
let new_project_name = get_project_name(self, self.get(&task_uuid).expect("Bug"))