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

Split a function

Browse source
This commit is contained in:
daladim 2021-12-24 00:32:38 +01:00
parent a973146366
commit 56484a6d4d
1 changed files with 47 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/provider/mod.rs
View file

@ -299,30 +299,13 @@ where
} }
} }
for url_add in remote_additions { Self::apply_remote_additions(
progress.debug(&format!("> Applying remote addition {} locally", url_add)); remote_additions,
progress.feedback(SyncEvent::InProgress{ &mut *cal_local,
calendar: cal_name.clone(), &mut *cal_remote,
details: Self::item_name(&cal_local, &url_add).await, progress,
}); &cal_name
match cal_remote.get_item_by_url(&url_add).await { ).await;
Err(err) => {
progress.warn(&format!("Unable to get remote item {}: {}. Skipping it.", url_add, err));
continue;
},
Ok(item) => match item {
None => {
progress.error(&format!("Inconsistency: new item {} has vanished from the remote end", url_add));
continue;
},
Some(new_item) => {
if let Err(err) = cal_local.add_item(new_item.clone()).await {
progress.error(&format!("Not able to add item {} to local calendar: {}", url_add, err));
}
},
},
}
}
for url_change in remote_changes { for url_change in remote_changes {
progress.debug(&format!("> Applying remote change {} locally", url_change)); progress.debug(&format!("> Applying remote change {} locally", url_change));
@ -404,6 +387,46 @@ where
cal.get_item_by_url(url).await.map(|item| item.name()).unwrap_or_default().to_string() cal.get_item_by_url(url).await.map(|item| item.name()).unwrap_or_default().to_string()
} }
async fn apply_remote_additions(
remote_additions: HashSet<Url>,
cal_local: &mut T,
cal_remote: &mut U,
progress: &mut SyncProgress,
cal_name: &str
) {
//
//
//
//
//
// TODO: OPTIM: in the server -> local way, download all the content at once
//
for url_add in remote_additions {
progress.debug(&format!("> Applying remote addition {} locally", url_add));
progress.feedback(SyncEvent::InProgress{
calendar: cal_name.to_string(),
details: Self::item_name(&cal_local, &url_add).await,
});
match cal_remote.get_item_by_url(&url_add).await {
Err(err) => {
progress.warn(&format!("Unable to get remote item {}: {}. Skipping it.", url_add, err));
continue;
},
Ok(item) => match item {
None => {
progress.error(&format!("Inconsistency: new item {} has vanished from the remote end", url_add));
continue;
},
Some(new_item) => {
if let Err(err) = cal_local.add_item(new_item.clone()).await {
progress.error(&format!("Not able to add item {} to local calendar: {}", url_add, err));
}
},
},
}
}
}
} }