deblan-mirror/reaction
1
0
Fork 0
mirror of https://framagit.org/ppom/reaction synced 2026-03-14 20:55:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix trigger count on start

Browse source 
schedule_exec was called before inserting the data in triggers,
resulting in action count being set again after decrement in schedule
exec.
This could lead to:
- trigger not disappearing after done
- second action with no "after" not being run
- ...
This commit is contained in:
ppom 2025-08-05 12:00:00 +02:00
commit f4d002c615
No known key found for this signature in database
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/daemon/filter/mod.rs
View file

@ -303,20 +303,24 @@ impl FilterManager {
.collect::<Vec<_>>();
for (m, map) in cloned_triggers.into_iter() {
let mut new_map = BTreeMap::default();
for (t, remaining) in map.into_iter() {
if remaining > 0 && t + longuest_action_duration > now {
// Insert back the upcoming times
new_map.insert(t, number_of_actions);
let map: BTreeMap<_, _> = map
.into_iter()
// Keep only up-to-date triggers
.filter(|(t, remaining)| *remaining > 0 && *t + longuest_action_duration > now)
// Reset action count
.map(|(t, _)| (t, number_of_actions))
.collect();
if map.is_empty() {
state.triggers.remove(&m);
} else {
let times = map.clone();
state.triggers.insert(m.clone(), map);
for (t, _) in times {
// Schedule the upcoming times
self.schedule_exec(m.clone(), t, now, &mut state, true, false);
}
}
if new_map.is_empty() {
state.triggers.remove(&m);
} else {
state.triggers.insert(m, new_map);
}
}
}
}