vstorage 0.6.0

Common API for various icalendar/vcard storages.
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133

// Copyright 2025 Hugo Osvaldo Barrera
//
// SPDX-License-Identifier: EUPL-1.2

//! Resolve conflicts during synchronisation.

use std::sync::Arc;

use crate::Href;
use crate::base::Property;
use crate::sync::analysis::{ItemWithData, ResolvedMapping};
use crate::sync::status::StatusVersions;

use super::operation::{ItemOp, MappingUidSource, PropertyOp, WriteInA, WriteInB, WriteMode};
use super::status::{MappingUid, Side};

pub use super::plan::resolve_conflicts;

/// Conflict information for items that have diverged.
#[derive(PartialEq, Debug, Clone)]
pub struct ConflictInfo {
    pub a: ItemWithData,
    pub b: ItemWithData,
    pub old: Option<StatusVersions>,
    pub collection_a: Href,
    pub collection_b: Href,
}

/// Trait for resolving conflicts in operation streams.
pub trait ConflictResolver: Send + Sync {
    /// Resolve an item conflict, returning the resolved operation.
    ///
    /// The returned operation must be an [`ItemOp`] variant that performs
    /// the appropriate sync action  based on the resolution strategy.
    fn resolve_item(&self, conflict: ConflictInfo, mapping_uid: MappingUid) -> ItemOp;

    /// Resolve a property conflict.
    ///
    /// The returned operation must be a `PropertyOp` variant that writes
    /// or deletes the property based on the resolution strategy.
    fn resolve_property(
        &self,
        property: Property,
        value_a: String,
        value_b: String,
        mapping: Arc<ResolvedMapping>,
        mapping_uid: MappingUid,
    ) -> PropertyOp;
}

/// Conflict resolver that always keeps side A.
///
/// Treat side A as the authoritative source and update side B to match it.
#[derive(Debug, Clone, Copy)]
pub struct KeepAResolver;

impl ConflictResolver for KeepAResolver {
    fn resolve_item(&self, conflict: ConflictInfo, mapping_uid: MappingUid) -> ItemOp {
        let ConflictInfo { a, b, old, .. } = conflict;
        let mode = match old {
            Some(old) => WriteMode::UpdateExisting { old },
            None => WriteMode::UpdateNew {
                target: b.state.version,
            },
        };
        ItemOp::WriteInB(WriteInB {
            source_a: a.into(),
            mode,
            mapping_uid: MappingUidSource::Immediate(mapping_uid),
            on_complete: None,
        })
    }

    fn resolve_property(
        &self,
        property: Property,
        value_a: String,
        _value_b: String,
        mapping: Arc<ResolvedMapping>,
        mapping_uid: MappingUid,
    ) -> PropertyOp {
        PropertyOp::Write {
            property,
            value: value_a,
            side: Side::B,
            mapping,
            mapping_uid: MappingUidSource::Immediate(mapping_uid),
            deletion_completion: None,
        }
    }
}

/// Conflict resolver that always keeps side B.
///
/// Treat side B as the authoritative source and update side A to match it.
#[derive(Debug, Clone, Copy)]
pub struct KeepBResolver;

impl ConflictResolver for KeepBResolver {
    fn resolve_item(&self, conflict: ConflictInfo, mapping_uid: MappingUid) -> ItemOp {
        let ConflictInfo { a, b, old, .. } = conflict;
        let mode = match old {
            Some(old) => WriteMode::UpdateExisting { old },
            None => WriteMode::UpdateNew {
                target: a.state.version,
            },
        };
        ItemOp::WriteInA(WriteInA {
            source_b: b.into(),
            mode,
            mapping_uid: MappingUidSource::Immediate(mapping_uid),
            on_complete: None,
        })
    }

    fn resolve_property(
        &self,
        property: Property,
        _value_a: String,
        value_b: String,
        mapping: Arc<ResolvedMapping>,
        mapping_uid: MappingUid,
    ) -> PropertyOp {
        PropertyOp::Write {
            property,
            value: value_b,
            side: Side::A,
            mapping,
            mapping_uid: MappingUidSource::Immediate(mapping_uid),
            deletion_completion: None,
        }
    }
}