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

More Results in the trait

Browse source
This commit is contained in:
daladim 2021-03-21 19:58:37 +01:00
parent 9a2a61a17b
commit a8ccdef0bb
6 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/provider.rs
View file

@ -80,7 +80,7 @@ where
// Step 1 - "Server always wins", so a delteion from the server must be applied locally, even if it was locally modified.
let mut local_dels = match last_sync {
None => HashSet::new(),
Some(date) => cal_local.get_items_deleted_since(date).await,
Some(date) => cal_local.get_items_deleted_since(date).await?,
};
if last_sync.is_some() {
let server_deletions = cal_server.find_deletions_from(cal_local.get_item_ids().await).await;
@ -97,8 +97,8 @@ where
}
// Step 2 - Compare both changesets...
let server_mods = cal_server.get_items_modified_since(last_sync, None).await;
let mut local_mods = cal_local.get_items_modified_since(last_sync, None).await;
let server_mods = cal_server.get_items_modified_since(last_sync, None).await?;
let mut local_mods = cal_local.get_items_modified_since(last_sync, None).await?;
// ...import remote changes,...
let mut conflicting_tasks = Vec::new();