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

[tests] Conflicts handling

Browse source
This commit is contained in:
daladim 2021-02-28 00:19:00 +01:00
parent 89d2c3fcef
commit 91f62aa200
2 changed files with 132 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

210
src/provider.rs
View file

@ -1,114 +1,96 @@
//! This modules abstracts data sources and merges them in a single virtual one
use std::error::Error;
use chrono::{DateTime, Utc};
use crate::traits::CalDavSource;
use crate::Calendar;
use crate::Task;
use crate::task::TaskId;
pub struct Provider<S, L>
where
S: CalDavSource,
L: CalDavSource,
{
/// The remote server
server: S,
/// The local cache
local: L,
/// The last time the provider successfully synchronized both sources
last_sync: DateTime<Utc>,
}
impl<S,L> Provider<S, L>
where
S: CalDavSource,
L: CalDavSource,
{
/// Create a provider that will merge both sources
pub fn new(server: S, local: L, last_sync: DateTime<Utc>) -> Self {
Self { server, local, last_sync }
}
pub fn server(&self) -> &S { &self.server }
pub fn local(&self) -> &L { &self.local }
pub async fn sync(&mut self) -> Result<(), Box<dyn Error>> {
self.pull_items_from_server().await?;
self.resolve_conflicts().await;
self.push_items_to_server().await;
// what to do with errors? Return Err directly? Go ahead as far as we can?
Ok(())
}
pub async fn pull_items_from_server(&mut self) -> Result<(), Box<dyn Error>> {
let cals_server = self.server.get_calendars_mut().await?;
for cal_server in cals_server {
let cal_local = match self.local.get_calendar_mut(cal_server.url().clone()).await {
None => {
log::error!("TODO: implement here");
continue;
},
Some(cal) => cal,
};
let server_mod = cal_server.get_tasks_modified_since(Some(self.last_sync), None);
let local_mod = cal_local.get_tasks_modified_since(Some(self.last_sync), None);
let mut tasks_to_add_to_local = Vec::new();
let mut tasks_id_to_remove_from_local = Vec::new();
for (new_id, new_item) in &server_mod {
if server_mod.contains_key(new_id) {
log::warn!("Conflict for task {} ({}). Using the server version.", new_item.name(), new_id);
tasks_id_to_remove_from_local.push(new_id.clone());
}
tasks_to_add_to_local.push((*new_item).clone());
}
let mut tasks_to_add_to_server = Vec::new();
for (new_id, new_item) in &local_mod {
if server_mod.contains_key(new_id) {
log::warn!("Conflict for task {} ({}). Using the server version.", new_item.name(), new_id);
continue;
}
tasks_to_add_to_server.push((*new_item).clone());
}
remove_from_calendar(&tasks_id_to_remove_from_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);
}
Ok(())
}
pub async fn resolve_conflicts(&mut self) {
log::error!("We should do something here");
}
pub async fn push_items_to_server(&mut self) {
}
}
fn move_to_calendar(tasks: &mut Vec<Task>, calendar: &mut Calendar) {
while tasks.len() > 0 {
let task = tasks.remove(0);
calendar.add_task(task);
}
}
fn remove_from_calendar(ids: &Vec<TaskId>, calendar: &mut Calendar) {
for id in ids {
log::info!(" Removing {:?} from local calendar", id);
calendar.delete_task(id);
}
}
//! This modules abstracts data sources and merges them in a single virtual one
use std::error::Error;
use chrono::{DateTime, Utc};
use crate::traits::CalDavSource;
use crate::Calendar;
use crate::Task;
use crate::task::TaskId;
pub struct Provider<S, L>
where
S: CalDavSource,
L: CalDavSource,
{
/// The remote server
server: S,
/// The local cache
local: L,
/// The last time the provider successfully synchronized both sources
last_sync: DateTime<Utc>,
}
impl<S,L> Provider<S, L>
where
S: CalDavSource,
L: CalDavSource,
{
/// Create a provider that will merge both sources
pub fn new(server: S, local: L, last_sync: DateTime<Utc>) -> Self {
Self { server, local, last_sync }
}
pub fn server(&self) -> &S { &self.server }
pub fn local(&self) -> &L { &self.local }
pub async fn sync(&mut self) -> Result<(), Box<dyn Error>> {
let cals_server = self.server.get_calendars_mut().await?;
for cal_server in cals_server {
let cal_local = match self.local.get_calendar_mut(cal_server.url().clone()).await {
None => {
log::error!("TODO: implement here");
continue;
},
Some(cal) => cal,
};
let server_mod = cal_server.get_tasks_modified_since(Some(self.last_sync), None);
let local_mod = cal_local.get_tasks_modified_since(Some(self.last_sync), None);
let mut tasks_to_add_to_local = Vec::new();
let mut tasks_id_to_remove_from_local = Vec::new();
for (new_id, new_item) in &server_mod {
if server_mod.contains_key(new_id) {
log::warn!("Conflict for task {} ({}). Using the server version.", new_item.name(), new_id);
tasks_id_to_remove_from_local.push(new_id.clone());
}
tasks_to_add_to_local.push((*new_item).clone());
}
let mut tasks_to_add_to_server = Vec::new();
for (new_id, new_item) in &local_mod {
if server_mod.contains_key(new_id) {
log::warn!("Conflict for task {} ({}). Using the server version.", new_item.name(), new_id);
continue;
}
tasks_to_add_to_server.push((*new_item).clone());
}
remove_from_calendar(&tasks_id_to_remove_from_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);
}
Ok(())
}
}
fn move_to_calendar(tasks: &mut Vec<Task>, calendar: &mut Calendar) {
while tasks.len() > 0 {
let task = tasks.remove(0);
calendar.add_task(task);
}
}
fn remove_from_calendar(ids: &Vec<TaskId>, calendar: &mut Calendar) {
for id in ids {
log::info!(" Removing {:?} from local calendar", id);
calendar.delete_task(id);
}
}