File size: 10,019 Bytes
e5034c3 | 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 | use std::collections::{BTreeSet, HashMap};
use std::path::{Path, PathBuf};
use forge_domain::{FileHash, FileStatus, SyncProgress, SyncStatus};
/// Result of comparing local and server files
///
/// This struct stores remote file information and provides methods
/// to compute synchronization operations on-demand. It can derive file statuses
/// and identify which files need to be uploaded, deleted, or modified.
///
/// All paths stored internally are absolute, resolved against the `base_dir`
/// provided at construction time.
pub struct WorkspaceStatus {
/// Base directory used to absolutize all paths.
base_dir: PathBuf,
/// Remote file hashes from the server, with absolute paths.
remote_files: Vec<FileHash>,
}
impl WorkspaceStatus {
/// Creates a sync plan from remote file hashes.
///
/// Paths in `remote_files` that are relative are joined with `base_dir` to
/// produce absolute paths. Paths that are already absolute are kept as-is.
///
/// # Arguments
///
/// * `base_dir` - The workspace root directory used to absolutize paths
/// * `remote_files` - Vector of remote file hashes from the server
pub fn new(base_dir: impl Into<PathBuf>, remote_files: Vec<FileHash>) -> Self {
let base_dir = base_dir.into();
let remote_files = remote_files
.into_iter()
.map(|f| FileHash { path: absolutize(&base_dir, &f.path), hash: f.hash })
.collect();
Self { base_dir, remote_files }
}
/// Derives file sync statuses by comparing local and remote files.
///
/// Both local and remote paths are expected to be absolute. Paths in
/// `local_files` that are relative are joined with `base_dir` before
/// comparison.
///
/// # Returns
///
/// A sorted vector of `FileStatus` indicating the sync state of each file:
/// - `InSync`: File exists in both local and remote with matching hashes
/// - `Modified`: File exists in both but with different hashes
/// - `New`: File exists only locally
/// - `Deleted`: File exists only remotely
pub fn file_statuses(&self, local_files: Vec<FileHash>) -> Vec<FileStatus> {
let local_files: Vec<FileHash> = local_files
.into_iter()
.map(|f| FileHash { path: absolutize(&self.base_dir, &f.path), hash: f.hash })
.collect();
// Build hash maps for efficient lookup
let local_hashes: HashMap<&str, &str> = local_files
.iter()
.map(|f| (f.path.as_str(), f.hash.as_str()))
.collect();
let remote_hashes: HashMap<&str, &str> = self
.remote_files
.iter()
.map(|f| (f.path.as_str(), f.hash.as_str()))
.collect();
// Collect all unique file paths (BTreeSet keeps them sorted)
let mut all_paths: BTreeSet<&str> = BTreeSet::new();
all_paths.extend(local_hashes.keys().copied());
all_paths.extend(remote_hashes.keys().copied());
// Compute status for each file (already sorted by BTreeSet)
all_paths
.into_iter()
.filter_map(|path| {
let local_hash = local_hashes.get(path);
let remote_hash = remote_hashes.get(path);
let status = match (local_hash, remote_hash) {
(Some(l), Some(r)) if l == r => SyncStatus::InSync,
(Some(_), Some(_)) => SyncStatus::Modified,
(Some(_), None) => SyncStatus::New,
(None, Some(_)) => SyncStatus::Deleted,
(None, None) => return None, // Skip invalid entries
};
Some(FileStatus::new(path.to_string(), status))
})
.collect()
}
/// Returns the sync operation paths based on local file hashes.
///
/// Unlike `get_operations`, this method only requires file hashes (not full
/// content) and returns path lists suitable for driving a two-pass sync
/// where content is read on-demand during upload.
pub fn get_sync_paths(&self, local_hashes: Vec<FileHash>) -> SyncPaths {
let statuses = self.file_statuses(local_hashes);
let mut delete = Vec::new();
let mut upload = Vec::new();
for status in statuses {
match status.status {
SyncStatus::Modified | SyncStatus::New => {
upload.push(PathBuf::from(status.path));
}
SyncStatus::Deleted => {
delete.push(PathBuf::from(status.path));
}
SyncStatus::InSync | SyncStatus::Failed => {
// No action needed
}
}
}
SyncPaths { delete, upload }
}
}
/// The set of file-system operations to perform during a workspace sync.
///
/// All paths are absolute and resolved against the workspace root.
pub struct SyncPaths {
/// Absolute paths to delete from the remote workspace.
pub delete: Vec<PathBuf>,
/// Absolute local file paths to upload to the remote workspace.
pub upload: Vec<PathBuf>,
}
/// Joins `base_dir` with `path` if `path` is relative, returning an absolute
/// path string. If `path` is already absolute it is returned unchanged.
fn absolutize(base_dir: &Path, path: &str) -> String {
let p = Path::new(path);
if p.is_absolute() {
path.to_owned()
} else {
base_dir.join(p).to_string_lossy().into_owned()
}
}
/// Tracks progress of sync operations
pub struct SyncProgressCounter {
total_files: usize,
total_operations: usize,
completed_operation: usize,
}
impl SyncProgressCounter {
pub fn new(total_files: usize, total_operations: usize) -> Self {
Self { total_files, total_operations, completed_operation: 0 }
}
pub fn complete(&mut self, count: usize) {
self.completed_operation += count;
}
pub fn sync_progress(&self) -> SyncProgress {
// 2 * total_files >= total_operations >= total_files
if self.completed_operation >= self.total_operations {
SyncProgress::Syncing { current: self.total_files, total: self.total_files }
} else {
let current: f64 = (self.completed_operation as f64 / self.total_operations as f64)
* self.total_files as f64;
SyncProgress::Syncing { current: current.floor() as usize, total: self.total_files }
}
}
}
#[cfg(test)]
mod tests {
use pretty_assertions::assert_eq;
use super::*;
#[test]
fn test_file_statuses() {
let base = "/workspace";
let local = vec![
FileHash { path: "/workspace/a.rs".into(), hash: "hash_a".into() },
FileHash { path: "/workspace/b.rs".into(), hash: "new_hash".into() },
FileHash { path: "/workspace/d.rs".into(), hash: "hash_d".into() },
];
let remote = vec![
FileHash { path: "a.rs".into(), hash: "hash_a".into() },
FileHash { path: "b.rs".into(), hash: "old_hash".into() },
FileHash { path: "c.rs".into(), hash: "hash_c".into() },
];
let plan = WorkspaceStatus::new(base, remote);
let actual = plan.file_statuses(local);
let expected = vec![
forge_domain::FileStatus::new(
"/workspace/a.rs".to_string(),
forge_domain::SyncStatus::InSync,
),
forge_domain::FileStatus::new(
"/workspace/b.rs".to_string(),
forge_domain::SyncStatus::Modified,
),
forge_domain::FileStatus::new(
"/workspace/c.rs".to_string(),
forge_domain::SyncStatus::Deleted,
),
forge_domain::FileStatus::new(
"/workspace/d.rs".to_string(),
forge_domain::SyncStatus::New,
),
];
assert_eq!(actual, expected);
}
impl SyncProgressCounter {
fn next_test(&mut self) -> SyncProgress {
self.complete(1);
self.sync_progress()
}
}
#[test]
fn test_sync_progress_counter() {
// Assuming 4 files, all need to be deleted and added
let mut counter = SyncProgressCounter::new(4, 8);
let actual = counter.sync_progress();
let expected = SyncProgress::Syncing { current: 0, total: 4 };
assert_eq!(actual, expected);
let actual = counter.next_test();
let expected = SyncProgress::Syncing { current: 0, total: 4 };
assert_eq!(actual, expected);
let actual = counter.next_test();
let expected = SyncProgress::Syncing { current: 1, total: 4 };
assert_eq!(actual, expected);
let actual = counter.next_test();
let expected = SyncProgress::Syncing { current: 1, total: 4 };
assert_eq!(actual, expected);
let actual = counter.next_test();
let expected = SyncProgress::Syncing { current: 2, total: 4 };
assert_eq!(actual, expected);
let actual = counter.next_test();
let expected = SyncProgress::Syncing { current: 2, total: 4 };
assert_eq!(actual, expected);
let actual = counter.next_test();
let expected = SyncProgress::Syncing { current: 3, total: 4 };
assert_eq!(actual, expected);
let actual = counter.next_test();
let expected = SyncProgress::Syncing { current: 3, total: 4 };
assert_eq!(actual, expected);
let actual = counter.next_test();
let expected = SyncProgress::Syncing { current: 4, total: 4 };
assert_eq!(actual, expected);
let actual = counter.next_test();
let expected = SyncProgress::Syncing { current: 4, total: 4 };
assert_eq!(actual, expected);
let actual = counter.next_test();
let expected = SyncProgress::Syncing { current: 4, total: 4 };
assert_eq!(actual, expected);
}
}
|