Musselman/kitchen-freezer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix sync bug on conflicts

Browse source
This commit is contained in:
daladim 2021-02-28 12:21:29 +01:00
parent 571420126f
commit 6c4ffa020c
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/provider.rs
View file

@ -51,9 +51,9 @@ where
let server_mod = cal_server.get_tasks_modified_since(Some(self.last_sync));
let server_del = cal_server.get_items_deleted_since(self.last_sync);
let local_mod = cal_local.get_tasks_modified_since(Some(self.last_sync));
let local_del = cal_local.get_items_deleted_since(self.last_sync);
// Pull remote changes from the server
let mut tasks_to_add_to_local = Vec::new();
let mut tasks_id_to_remove_from_local = Vec::new();
for deleted_id in server_del {
@ -66,10 +66,21 @@ where
}
tasks_to_add_to_local.push((*new_item).clone());
}
// Even in case of conflicts, "the server always wins", so it is safe to remove tasks from the local cache as soon as now
remove_from_calendar(&tasks_id_to_remove_from_local, cal_local);
// Push local changes to the server
let local_mod = cal_local.get_tasks_modified_since(Some(self.last_sync));
let mut tasks_to_add_to_server = Vec::new();
let mut tasks_id_to_remove_from_server = Vec::new();
for deleted_id in local_del {
if server_mod.contains_key(&deleted_id) {
log::warn!("Conflict for task {}, that has been locally deleted and updated in the server. Using the server version.", deleted_id);
continue;
}
tasks_id_to_remove_from_server.push(deleted_id);
}
for (new_id, new_item) in &local_mod {
@ -80,7 +91,6 @@ where
tasks_to_add_to_server.push((*new_item).clone());
}
remove_from_calendar(&tasks_id_to_remove_from_local, cal_local);
remove_from_calendar(&tasks_id_to_remove_from_server, cal_server);
move_to_calendar(&mut tasks_to_add_to_local, cal_local);
move_to_calendar(&mut tasks_to_add_to_server, cal_server);