diff options
Diffstat (limited to 'src-tauri/src')
| -rw-r--r-- | src-tauri/src/core/downloader.rs | 147 |
1 files changed, 88 insertions, 59 deletions
diff --git a/src-tauri/src/core/downloader.rs b/src-tauri/src/core/downloader.rs index 5a0605b..139b621 100644 --- a/src-tauri/src/core/downloader.rs +++ b/src-tauri/src/core/downloader.rs @@ -25,15 +25,92 @@ pub struct ProgressEvent { pub total_downloaded_bytes: u64, } +/// Snapshot of global progress state +struct ProgressSnapshot { + completed_files: usize, + total_files: usize, + total_downloaded_bytes: u64, +} + +/// Centralized progress tracking with atomic counters +struct GlobalProgress { + completed_files: AtomicUsize, + total_downloaded_bytes: AtomicU64, + total_files: usize, +} + +impl GlobalProgress { + fn new(total_files: usize) -> Self { + Self { + completed_files: AtomicUsize::new(0), + total_downloaded_bytes: AtomicU64::new(0), + total_files, + } + } + + /// Get current progress snapshot without modification + fn snapshot(&self) -> ProgressSnapshot { + ProgressSnapshot { + completed_files: self.completed_files.load(Ordering::Relaxed), + total_files: self.total_files, + total_downloaded_bytes: self.total_downloaded_bytes.load(Ordering::Relaxed), + } + } + + /// Increment completed files counter and return updated snapshot + fn inc_completed(&self) -> ProgressSnapshot { + let completed = self.completed_files.fetch_add(1, Ordering::Relaxed) + 1; + ProgressSnapshot { + completed_files: completed, + total_files: self.total_files, + total_downloaded_bytes: self.total_downloaded_bytes.load(Ordering::Relaxed), + } + } + + /// Add downloaded bytes and return updated snapshot + fn add_bytes(&self, delta: u64) -> ProgressSnapshot { + let total_bytes = self.total_downloaded_bytes.fetch_add(delta, Ordering::Relaxed) + delta; + ProgressSnapshot { + completed_files: self.completed_files.load(Ordering::Relaxed), + total_files: self.total_files, + total_downloaded_bytes: total_bytes, + } + } +} + +/// Emit a progress event to the frontend +fn emit_progress( + window: &Window, + file_name: &str, + status: &str, + downloaded: u64, + total: u64, + snapshot: &ProgressSnapshot, +) { + let _ = window.emit( + "download-progress", + ProgressEvent { + file: file_name.to_string(), + downloaded, + total, + status: status.into(), + completed_files: snapshot.completed_files, + total_files: snapshot.total_files, + total_downloaded_bytes: snapshot.total_downloaded_bytes, + }, + ); +} + pub async fn download_files(window: Window, tasks: Vec<DownloadTask>, max_concurrent: usize) -> Result<(), String> { + // Clamp max_concurrent to a valid range (1-128) to prevent edge cases + let max_concurrent = max_concurrent.clamp(1, 128); + let client = reqwest::Client::builder() .pool_max_idle_per_host(max_concurrent) .build() .map_err(|e| e.to_string())?; let semaphore = Arc::new(Semaphore::new(max_concurrent)); - let completed_files = Arc::new(AtomicUsize::new(0)); - let total_downloaded_bytes = Arc::new(AtomicU64::new(0)); - let total_files = tasks.len(); + let progress = Arc::new(GlobalProgress::new(tasks.len())); // Notify start (total files) let _ = window.emit("download-start", tasks.len()); @@ -42,8 +119,7 @@ pub async fn download_files(window: Window, tasks: Vec<DownloadTask>, max_concur let client = client.clone(); let window = window.clone(); let semaphore = semaphore.clone(); - let completed_files = completed_files.clone(); - let total_downloaded_bytes = total_downloaded_bytes.clone(); + let progress = progress.clone(); async move { let _permit = semaphore.acquire().await.unwrap(); @@ -51,18 +127,7 @@ pub async fn download_files(window: Window, tasks: Vec<DownloadTask>, max_concur // 1. Check if file exists and verify SHA1 if task.path.exists() { - let _ = window.emit( - "download-progress", - ProgressEvent { - file: file_name.clone(), - downloaded: 0, - total: 0, - status: "Verifying".into(), - completed_files: completed_files.load(Ordering::Relaxed), - total_files, - total_downloaded_bytes: total_downloaded_bytes.load(Ordering::Relaxed), - }, - ); + emit_progress(&window, &file_name, "Verifying", 0, 0, &progress.snapshot()); if let Some(expected_sha1) = &task.sha1 { if let Ok(data) = tokio::fs::read(&task.path).await { @@ -71,20 +136,8 @@ pub async fn download_files(window: Window, tasks: Vec<DownloadTask>, max_concur hasher.update(&data); let result = hex::encode(hasher.finalize()); if &result == expected_sha1 { - // Already valid - let completed = completed_files.fetch_add(1, Ordering::Relaxed) + 1; - let _ = window.emit( - "download-progress", - ProgressEvent { - file: file_name.clone(), - downloaded: 0, - total: 0, - status: "Skipped".into(), - completed_files: completed, - total_files, - total_downloaded_bytes: total_downloaded_bytes.load(Ordering::Relaxed), - }, - ); + // Already valid, skip download + emit_progress(&window, &file_name, "Skipped", 0, 0, &progress.inc_completed()); return Ok(()); } } @@ -112,19 +165,8 @@ pub async fn download_files(window: Window, tasks: Vec<DownloadTask>, max_concur return Err(format!("Write error: {}", e)); } downloaded += chunk.len() as u64; - let total_bytes = total_downloaded_bytes.fetch_add(chunk.len() as u64, Ordering::Relaxed) + chunk.len() as u64; - let _ = window.emit( - "download-progress", - ProgressEvent { - file: file_name.clone(), - downloaded, - total: total_size, - status: "Downloading".into(), - completed_files: completed_files.load(Ordering::Relaxed), - total_files, - total_downloaded_bytes: total_bytes, - }, - ); + let snapshot = progress.add_bytes(chunk.len() as u64); + emit_progress(&window, &file_name, "Downloading", downloaded, total_size, &snapshot); } Ok(None) => break, Err(e) => return Err(format!("Download error: {}", e)), @@ -134,27 +176,14 @@ pub async fn download_files(window: Window, tasks: Vec<DownloadTask>, max_concur Err(e) => return Err(format!("Request error: {}", e)), } - let completed = completed_files.fetch_add(1, Ordering::Relaxed) + 1; - let _ = window.emit( - "download-progress", - ProgressEvent { - file: file_name.clone(), - downloaded: 0, - total: 0, - status: "Finished".into(), - completed_files: completed, - total_files, - total_downloaded_bytes: total_downloaded_bytes.load(Ordering::Relaxed), - }, - ); - + emit_progress(&window, &file_name, "Finished", 0, 0, &progress.inc_completed()); Ok(()) } }); // Buffer unordered to run concurrently tasks_stream - .buffer_unordered(10) + .buffer_unordered(max_concurrent) .collect::<Vec<Result<(), String>>>() .await; |