GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 06:22:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

slightly simplify transact_inner()

Browse source
This commit is contained in:
Damien Elmes 2021-05-28 14:45:36 +10:00
parent af50c445dd
commit e3db8641d1
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rslib/src/collection/transact.rs
View file

@ -14,21 +14,15 @@ impl Collection {
self.begin_undoable_operation(op); self.begin_undoable_operation(op);
func(self) func(self)
// any changes mean an mtime bump .and_then(|output| {
.and_then(|out| { // any changes mean an mtime bump
if !have_op || (self.current_undo_step_has_changes() && !self.undoing_or_redoing()) if !have_op || (self.current_undo_step_has_changes() && !self.undoing_or_redoing())
{ {
self.set_modified()?; self.set_modified()?;
} }
Ok(out) // then commit
})
// then commit
.and_then(|out| {
self.storage.commit_rust_trx()?; self.storage.commit_rust_trx()?;
Ok(out) // finalize undo
})
// finalize undo step
.map(|output| {
let changes = if have_op { let changes = if have_op {
let changes = self.op_changes(); let changes = self.op_changes();
self.maybe_clear_study_queues_after_op(&changes); self.maybe_clear_study_queues_after_op(&changes);
@ -43,7 +37,7 @@ impl Collection {
} }
}; };
self.end_undoable_operation(); self.end_undoable_operation();
OpOutput { output, changes } Ok(OpOutput { output, changes })
}) })
// roll back on error // roll back on error
.or_else(|err| { .or_else(|err| {