From 65d6804767c43c4fdda229210f68f4beb8242136 Mon Sep 17 00:00:00 2001 From: abraunegg Date: Wed, 21 Feb 2024 05:11:59 +1100 Subject: [PATCH] Update architecture documentation * Update architecture documentation --- docs/client-architecture.md | 14 ++++++++++++++ docs/puml/main_activity_flows.puml | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/client-architecture.md b/docs/client-architecture.md index 56fc0d76..18c23743 100644 --- a/docs/client-architecture.md +++ b/docs/client-architecture.md @@ -86,6 +86,13 @@ Due to this factor, when using `--resync` the online source is always going to b ### Default Operational Modes - Conflict Handling +#### Scenario +1. Create a local file +2. Perform a sync with Microsoft OneDrive using `onedrive --sync` +3. Modify file online +4. Modify file locally with different data|contents +5. Perform a sync with Microsoft OneDrive using `onedrive --sync` + ![conflict_handling_default](./puml/conflict_handling_default.png) #### Evidence of Conflict Handling @@ -128,6 +135,13 @@ Waiting for all internal threads to complete before exiting application ### Default Operational Modes - Conflict Handling with --resync +#### Scenario +1. Create a local file +2. Perform a sync with Microsoft OneDrive using `onedrive --sync` +3. Modify file online +4. Modify file locally with different data|contents +5. Perform a sync with Microsoft OneDrive using `onedrive --sync --resync` + ![conflict_handling_default_resync](./puml/conflict_handling_default_resync.png) #### Evidence of Conflict Handling diff --git a/docs/puml/main_activity_flows.puml b/docs/puml/main_activity_flows.puml index d5465d7a..d5a70080 100644 --- a/docs/puml/main_activity_flows.puml +++ b/docs/puml/main_activity_flows.puml @@ -2,7 +2,7 @@ start -:Validate access and\nexisting access token\nRefresh if needed; +:Validate access and existing access token\nRefresh if needed; :Query /delta API; note right: Query Microsoft OneDrive /delta API @@ -78,4 +78,4 @@ partition "Final True-Up" { :Process further online JSON changes if required; } stop -@enduml +@enduml \ No newline at end of file