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

fix(tasks): undo tracking with history-based position

This commit is contained in:
xeruf 2024-08-19 13:48:24 +03:00
parent 506a73060a
commit e0d241ec5a
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tasks.rs
View File

@ -616,6 +616,11 @@ impl Tasks {
return; return;
} }
if !id.and_then(|id| self.tasks.get(&id)).is_some_and(|t| t.parent_id() == pos.as_ref()) {
debug!("Flushing Tasks because of move beyond child");
self.flush();
}
let now = Timestamp::now(); let now = Timestamp::now();
let offset: u64 = self.history_until(Timestamp::now()).skip_while(|e| e.created_at.as_u64() > now.as_u64() + Self::MAX_OFFSET).count() as u64; let offset: u64 = self.history_until(Timestamp::now()).skip_while(|e| e.created_at.as_u64() > now.as_u64() + Self::MAX_OFFSET).count() as u64;
if offset >= Self::MAX_OFFSET { if offset >= Self::MAX_OFFSET {
@ -625,10 +630,6 @@ impl Tasks {
build_tracking(id) build_tracking(id)
.custom_created_at(Timestamp::from(now.as_u64() + offset)) .custom_created_at(Timestamp::from(now.as_u64() + offset))
); );
if !id.and_then(|id| self.tasks.get(&id)).is_some_and(|t| t.parent_id() == pos.as_ref()) {
debug!("Flushing Tasks because of move beyond child");
self.flush();
}
} }
// Updates // Updates
@ -784,13 +785,10 @@ impl Tasks {
} }
fn remove(&mut self, event: &Event) { fn remove(&mut self, event: &Event) {
if let Some(pos) = self.get_position() {
if pos == event.id {
self.move_up()
}
}
self.tasks.remove(&event.id); self.tasks.remove(&event.id);
self.get_own_history().map(|t| t.remove(event)); self.get_own_history().map(
|t| t.retain(|e| e != event &&
!referenced_events(e).is_some_and(|id| id == &event.id)));
self.referenced_tasks(event, |t| { t.props.remove(event); }); self.referenced_tasks(event, |t| { t.props.remove(event); });
} }