msy 0.4.2

Modern musl rsync alternative - Fast, parallel file synchronization
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
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
// Bidirectional sync engine
//
// Orchestrates the complete bidirectional sync workflow

use crate::bisync::{
    classify_changes, conflict_filename, resolve_changes, BisyncStateDb, Change, ChangeType,
    ConflictResolution, ResolvedChanges, Side, SyncAction, SyncState,
};
use crate::error::{Result, SyncError};
use crate::transport::Transport;
use std::path::{Path, PathBuf};
use std::sync::Arc;
use std::time::SystemTime;

/// Options for bidirectional sync
#[derive(Debug, Clone)]
pub struct BisyncOptions {
    pub conflict_resolution: ConflictResolution,
    pub max_delete_percent: u8, // 0-100, 0 = unlimited
    pub dry_run: bool,
    pub clear_state: bool,
    pub force_resync: bool, // Ignore corrupt state and rebuild from scratch
}

impl Default for BisyncOptions {
    fn default() -> Self {
        Self {
            conflict_resolution: ConflictResolution::Newer,
            max_delete_percent: 50,
            dry_run: false,
            clear_state: false,
            force_resync: false,
        }
    }
}

/// Statistics from bidirectional sync
#[derive(Debug, Clone, Default)]
pub struct BisyncStats {
    pub files_synced_to_dest: usize,
    pub files_synced_to_source: usize,
    pub files_deleted_from_source: usize,
    pub files_deleted_from_dest: usize,
    pub conflicts_resolved: usize,
    pub conflicts_renamed: usize,
    pub bytes_transferred: u64,
    pub duration_ms: u128,
}

/// Conflict information for reporting
#[derive(Debug, Clone)]
pub struct ConflictInfo {
    pub path: PathBuf,
    #[allow(dead_code)] // Used for future detailed reporting
    pub source_mtime: Option<SystemTime>,
    #[allow(dead_code)]
    pub source_size: Option<u64>,
    #[allow(dead_code)]
    pub dest_mtime: Option<SystemTime>,
    #[allow(dead_code)]
    pub dest_size: Option<u64>,
    #[allow(dead_code)]
    pub resolution: ConflictResolution,
    pub action: String,
}

/// Result of bidirectional sync
#[derive(Debug)]
pub struct BisyncResult {
    pub stats: BisyncStats,
    pub conflicts: Vec<ConflictInfo>,
    pub errors: Vec<String>,
}

/// Bidirectional sync engine
pub struct BisyncEngine {
    source_transport: Arc<dyn Transport>,
    dest_transport: Arc<dyn Transport>,
}

impl BisyncEngine {
    pub fn new(source_transport: Arc<dyn Transport>, dest_transport: Arc<dyn Transport>) -> Self {
        Self {
            source_transport,
            dest_transport,
        }
    }

    /// Perform bidirectional sync
    pub async fn sync(
        &self,
        source: &Path,
        dest: &Path,
        opts: BisyncOptions,
    ) -> Result<BisyncResult> {
        let start = std::time::Instant::now();

        // 0. Acquire lock to prevent concurrent syncs to same pair
        let _lock = crate::bisync::SyncLock::acquire(source, dest)?;

        // 1. Open state database
        let mut state_db = BisyncStateDb::open(source, dest, opts.force_resync)?;

        if opts.clear_state {
            state_db.clear_all()?;
        }

        // 2. Load prior state
        let prior_state = state_db.load_all()?;

        // 3. Scan both sides using transports
        let source_files = self.source_transport.scan(source).await?;
        let dest_files = self.dest_transport.scan(dest).await?;

        // 4. Classify changes
        let changes = classify_changes(&source_files, &dest_files, &prior_state)?;

        // 5. Check deletion limit
        check_deletion_limit(&changes, opts.max_delete_percent)?;

        // 6. Resolve conflicts
        let resolved = resolve_changes(changes.clone(), opts.conflict_resolution)?;

        // 7. Collect conflict info for reporting
        let conflicts = collect_conflict_info(&changes, opts.conflict_resolution);

        // 7b. Log conflicts to history file (unless dry-run)
        if !opts.dry_run && !conflicts.is_empty() {
            state_db.log_conflicts(&conflicts)?;
        }

        // 8. Execute sync actions (or dry run)
        let (stats, errors) = if opts.dry_run {
            // Dry run - just report what would happen
            let stats = simulate_actions(&resolved);
            (stats, Vec::new())
        } else {
            // Actually perform sync
            let (stats, errors) = execute_actions(
                &self.source_transport,
                &self.dest_transport,
                source,
                dest,
                &resolved,
            )
            .await?;

            // 9. Update state database
            update_state(&mut state_db, &resolved)?;

            (stats, errors)
        };

        let duration_ms = start.elapsed().as_millis();
        let final_stats = BisyncStats {
            duration_ms,
            ..stats
        };

        Ok(BisyncResult {
            stats: final_stats,
            conflicts,
            errors,
        })
    }
}

/// Check if deletion limit would be exceeded
fn check_deletion_limit(changes: &[Change], max_delete_percent: u8) -> Result<()> {
    if max_delete_percent == 0 {
        return Ok(()); // Unlimited
    }

    let total_files = changes.len();
    if total_files == 0 {
        return Ok(());
    }

    let deletions = changes
        .iter()
        .filter(|c| {
            matches!(
                c.change_type,
                ChangeType::DeletedFromSource | ChangeType::DeletedFromDest
            )
        })
        .count();

    let deletion_percent = (deletions as f64 / total_files as f64) * 100.0;

    if deletion_percent > max_delete_percent as f64 {
        return Err(SyncError::Config(format!(
            "Deletion limit exceeded: {} deletions ({:.1}%) > {}% limit. \
             Use --max-delete 0 for unlimited or increase threshold.",
            deletions, deletion_percent, max_delete_percent
        )));
    }

    Ok(())
}

/// Collect conflict information for reporting
fn collect_conflict_info(changes: &[Change], strategy: ConflictResolution) -> Vec<ConflictInfo> {
    changes
        .iter()
        .filter(|c| {
            matches!(
                c.change_type,
                ChangeType::ModifiedBoth
                    | ChangeType::CreateCreateConflict
                    | ChangeType::ModifyDeleteConflict
            )
        })
        .map(|c| {
            let action = match &c.change_type {
                ChangeType::ModifiedBoth => "both modified".to_string(),
                ChangeType::CreateCreateConflict => "created on both sides".to_string(),
                ChangeType::ModifyDeleteConflict => "modified vs deleted".to_string(),
                _ => "conflict".to_string(),
            };

            ConflictInfo {
                path: c.path.clone(),
                source_mtime: c.source_entry.as_ref().map(|e| e.modified),
                source_size: c.source_entry.as_ref().map(|e| e.size),
                dest_mtime: c.dest_entry.as_ref().map(|e| e.modified),
                dest_size: c.dest_entry.as_ref().map(|e| e.size),
                resolution: strategy,
                action,
            }
        })
        .collect()
}

/// Simulate actions for dry run
fn simulate_actions(resolved: &ResolvedChanges) -> BisyncStats {
    let mut stats = BisyncStats::default();

    for action in &resolved.actions {
        match action {
            SyncAction::CopyToSource(entry) => {
                stats.files_synced_to_source += 1;
                stats.bytes_transferred += entry.size;
            }
            SyncAction::CopyToDest(entry) => {
                stats.files_synced_to_dest += 1;
                stats.bytes_transferred += entry.size;
            }
            SyncAction::DeleteFromSource(_) => {
                stats.files_deleted_from_source += 1;
            }
            SyncAction::DeleteFromDest(_) => {
                stats.files_deleted_from_dest += 1;
            }
            SyncAction::RenameConflict { source, dest, .. } => {
                stats.files_synced_to_source += 1;
                stats.files_synced_to_dest += 1;
                stats.bytes_transferred += source.size + dest.size;
            }
        }
    }

    stats.conflicts_resolved = resolved.conflicts_resolved;
    stats.conflicts_renamed = resolved.conflicts_renamed;

    stats
}

/// Execute sync actions
async fn execute_actions(
    source_transport: &Arc<dyn Transport>,
    dest_transport: &Arc<dyn Transport>,
    source_root: &Path,
    dest_root: &Path,
    resolved: &ResolvedChanges,
) -> Result<(BisyncStats, Vec<String>)> {
    let mut stats = BisyncStats::default();
    let mut errors = Vec::new();

    for action in &resolved.actions {
        let result = execute_single_action(
            source_transport,
            dest_transport,
            source_root,
            dest_root,
            action,
        )
        .await;

        match result {
            Ok(bytes) => {
                match action {
                    SyncAction::CopyToSource(_) => stats.files_synced_to_source += 1,
                    SyncAction::CopyToDest(_) => stats.files_synced_to_dest += 1,
                    SyncAction::DeleteFromSource(_) => stats.files_deleted_from_source += 1,
                    SyncAction::DeleteFromDest(_) => stats.files_deleted_from_dest += 1,
                    SyncAction::RenameConflict { .. } => {
                        stats.files_synced_to_source += 1;
                        stats.files_synced_to_dest += 1;
                    }
                }
                stats.bytes_transferred += bytes;
            }
            Err(e) => {
                errors.push(format!("Failed to sync {:?}: {}", action, e));
            }
        }
    }

    stats.conflicts_resolved = resolved.conflicts_resolved;
    stats.conflicts_renamed = resolved.conflicts_renamed;

    Ok((stats, errors))
}

/// Execute a single sync action
async fn execute_single_action(
    source_transport: &Arc<dyn Transport>,
    dest_transport: &Arc<dyn Transport>,
    source_root: &Path,
    dest_root: &Path,
    action: &SyncAction,
) -> Result<u64> {
    match action {
        SyncAction::CopyToSource(entry) => {
            // Copy from dest to source
            let src = dest_root.join(&*entry.relative_path);
            let dst = source_root.join(&*entry.relative_path);
            copy_file_across_transports(dest_transport, source_transport, &src, &dst).await
        }
        SyncAction::CopyToDest(entry) => {
            // Copy from source to dest
            let src = source_root.join(&*entry.relative_path);
            let dst = dest_root.join(&*entry.relative_path);
            copy_file_across_transports(source_transport, dest_transport, &src, &dst).await
        }
        SyncAction::DeleteFromSource(path) => {
            let target = source_root.join(path);
            source_transport.remove(&target, false).await?;
            Ok(0)
        }
        SyncAction::DeleteFromDest(path) => {
            let target = dest_root.join(path);
            dest_transport.remove(&target, false).await?;
            Ok(0)
        }
        SyncAction::RenameConflict {
            source,
            dest,
            timestamp,
        } => {
            // Rename both files with conflict suffix
            let source_path = source_root.join(&*source.relative_path);
            let dest_path = dest_root.join(&*dest.relative_path);

            let source_conflict = conflict_filename(&source_path, timestamp, "source");
            let dest_conflict = conflict_filename(&dest_path, timestamp, "dest");

            // Read -> Write -> Delete to rename across transports
            let source_data = source_transport.read_file(&source_path).await?;
            let source_mtime = source_transport.get_mtime(&source_path).await?;
            source_transport
                .write_file(&source_conflict, &source_data, source_mtime)
                .await?;
            source_transport.remove(&source_path, false).await?;

            let dest_data = dest_transport.read_file(&dest_path).await?;
            let dest_mtime = dest_transport.get_mtime(&dest_path).await?;
            dest_transport
                .write_file(&dest_conflict, &dest_data, dest_mtime)
                .await?;
            dest_transport.remove(&dest_path, false).await?;

            Ok(0)
        }
    }
}

/// Copy a file across transports (e.g., local to SSH, or SSH to local)
async fn copy_file_across_transports(
    from_transport: &Arc<dyn Transport>,
    to_transport: &Arc<dyn Transport>,
    src: &Path,
    dst: &Path,
) -> Result<u64> {
    // Read from source transport
    let data = from_transport.read_file(src).await?;
    let mtime = from_transport.get_mtime(src).await?;

    // Write to destination transport
    to_transport.write_file(dst, &data, mtime).await?;

    Ok(data.len() as u64)
}

/// Update state database after sync
fn update_state(state_db: &mut BisyncStateDb, resolved: &ResolvedChanges) -> Result<()> {
    let now = SystemTime::now();

    for action in &resolved.actions {
        match action {
            SyncAction::CopyToSource(entry) => {
                // File now exists on both sides with same content
                // Store state for both source and dest
                let source_state = SyncState {
                    path: (*entry.relative_path).clone(),
                    side: Side::Source,
                    mtime: entry.modified,
                    size: entry.size,
                    checksum: None,
                    last_sync: now,
                };
                state_db.store(&source_state)?;

                let dest_state = SyncState {
                    path: (*entry.relative_path).clone(),
                    side: Side::Dest,
                    mtime: entry.modified,
                    size: entry.size,
                    checksum: None,
                    last_sync: now,
                };
                state_db.store(&dest_state)?;
            }
            SyncAction::CopyToDest(entry) => {
                // File now exists on both sides with same content
                // Store state for both source and dest
                let source_state = SyncState {
                    path: (*entry.relative_path).clone(),
                    side: Side::Source,
                    mtime: entry.modified,
                    size: entry.size,
                    checksum: None,
                    last_sync: now,
                };
                state_db.store(&source_state)?;

                let dest_state = SyncState {
                    path: (*entry.relative_path).clone(),
                    side: Side::Dest,
                    mtime: entry.modified,
                    size: entry.size,
                    checksum: None,
                    last_sync: now,
                };
                state_db.store(&dest_state)?;
            }
            SyncAction::DeleteFromSource(path) => {
                state_db.delete(path)?;
            }
            SyncAction::DeleteFromDest(path) => {
                state_db.delete(path)?;
            }
            SyncAction::RenameConflict { source, dest, .. } => {
                // Both files kept with new names - update state
                let source_state = SyncState {
                    path: (*source.relative_path).clone(),
                    side: Side::Source,
                    mtime: source.modified,
                    size: source.size,
                    checksum: None,
                    last_sync: now,
                };
                state_db.store(&source_state)?;

                let dest_state = SyncState {
                    path: (*dest.relative_path).clone(),
                    side: Side::Dest,
                    mtime: dest.modified,
                    size: dest.size,
                    checksum: None,
                    last_sync: now,
                };
                state_db.store(&dest_state)?;
            }
        }
    }

    Ok(())
}

#[cfg(test)]
mod tests {
    use super::*;

    #[test]
    fn test_check_deletion_limit_ok() {
        let changes = vec![
            Change {
                path: PathBuf::from("file1.txt"),
                change_type: ChangeType::NewInSource,
                source_entry: None,
                dest_entry: None,
            },
            Change {
                path: PathBuf::from("file2.txt"),
                change_type: ChangeType::DeletedFromSource,
                source_entry: None,
                dest_entry: None,
            },
        ];

        // 1 deletion out of 2 files = 50%
        assert!(check_deletion_limit(&changes, 50).is_ok());
    }

    #[test]
    fn test_check_deletion_limit_exceeded() {
        let changes = vec![
            Change {
                path: PathBuf::from("file1.txt"),
                change_type: ChangeType::DeletedFromSource,
                source_entry: None,
                dest_entry: None,
            },
            Change {
                path: PathBuf::from("file2.txt"),
                change_type: ChangeType::DeletedFromDest,
                source_entry: None,
                dest_entry: None,
            },
        ];

        // 2 deletions out of 2 files = 100% > 50% limit
        assert!(check_deletion_limit(&changes, 50).is_err());
    }

    #[test]
    fn test_check_deletion_limit_unlimited() {
        let changes = vec![Change {
            path: PathBuf::from("file1.txt"),
            change_type: ChangeType::DeletedFromSource,
            source_entry: None,
            dest_entry: None,
        }];

        // max_delete_percent = 0 means unlimited
        assert!(check_deletion_limit(&changes, 0).is_ok());
    }
}