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

Provider: correctly syncs deleted items

Browse source
This commit is contained in:
daladim 2021-02-28 11:02:16 +01:00
parent a76a0c86ac
commit e60ad19fa5
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/provider.rs
View file

@ -50,10 +50,15 @@ where
}; };
let server_mod = cal_server.get_tasks_modified_since(Some(self.last_sync), None); let server_mod = cal_server.get_tasks_modified_since(Some(self.last_sync), None);
let server_del = cal_server.get_tasks_deleted_since(self.last_sync);
let local_mod = cal_local.get_tasks_modified_since(Some(self.last_sync), None); let local_mod = cal_local.get_tasks_modified_since(Some(self.last_sync), None);
let local_del = cal_local.get_tasks_deleted_since(self.last_sync);
let mut tasks_to_add_to_local = Vec::new(); let mut tasks_to_add_to_local = Vec::new();
let mut tasks_id_to_remove_from_local = Vec::new(); let mut tasks_id_to_remove_from_local = Vec::new();
for deleted_id in server_del {
tasks_id_to_remove_from_local.push(deleted_id);
}
for (new_id, new_item) in &server_mod { for (new_id, new_item) in &server_mod {
if server_mod.contains_key(new_id) { if server_mod.contains_key(new_id) {
log::warn!("Conflict for task {} ({}). Using the server version.", new_item.name(), new_id); log::warn!("Conflict for task {} ({}). Using the server version.", new_item.name(), new_id);
@ -63,6 +68,10 @@ where
} }
let mut tasks_to_add_to_server = Vec::new(); 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 {
tasks_id_to_remove_from_server.push(deleted_id);
}
for (new_id, new_item) in &local_mod { for (new_id, new_item) in &local_mod {
if server_mod.contains_key(new_id) { if server_mod.contains_key(new_id) {
log::warn!("Conflict for task {} ({}). Using the server version.", new_item.name(), new_id); log::warn!("Conflict for task {} ({}). Using the server version.", new_item.name(), new_id);
@ -72,6 +81,7 @@ where
} }
remove_from_calendar(&tasks_id_to_remove_from_local, cal_local); 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_local, cal_local);
move_to_calendar(&mut tasks_to_add_to_server, cal_server); move_to_calendar(&mut tasks_to_add_to_server, cal_server);
} }