markury/shark
1
0
Fork 0
mirror of https://github.com/markuryy/shark.git synced 2025-12-12 11:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dl): add progress events for tracks from new downloader

Browse Source
This commit is contained in:
Markury
2025-10-04 20:58:34 -04:00
parent 96a01bdced
commit 7b84bc32df
2 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src-tauri/src/lib.rs
View File

@@ -56,10 +56,12 @@ async fn download_and_decrypt_track(
track_id: String,
output_path: String,
is_encrypted: bool,
window: tauri::Window,
) -> Result<(), String> {
use tokio::io::AsyncWriteExt;
use tokio::fs::File;
use deezer_crypto::StreamingDecryptor;
use tauri::Emitter;
// Build HTTP client
let client = reqwest::Client::builder()
@@ -79,11 +81,16 @@ async fn download_and_decrypt_track(
return Err(format!("HTTP error: {}", response.status()));
}
let total_size = response.content_length().unwrap_or(0) as f64;
// Open output file
let mut file = File::create(&output_path)
.await
.map_err(|e| format!("Failed to create output file: {}", e))?;
let mut downloaded_bytes = 0u64;
let mut last_reported_percentage = 0u8;
// Stream download with optional decryption
if is_encrypted {
let mut decryptor = StreamingDecryptor::new(&track_id);
@@ -93,6 +100,7 @@ async fn download_and_decrypt_track(
while let Some(chunk_result) = stream.next().await {
let chunk = chunk_result.map_err(|e| format!("Download stream error: {}", e))?;
downloaded_bytes += chunk.len() as u64;
// Decrypt chunk and write to file
let decrypted = decryptor.process(&chunk);
@@ -101,6 +109,21 @@ async fn download_and_decrypt_track(
.await
.map_err(|e| format!("Failed to write to file: {}", e))?;
}
// Emit progress every 5%
if total_size > 0.0 {
let percentage = ((downloaded_bytes as f64 / total_size) * 100.0) as u8;
let rounded_percentage = (percentage / 5) * 5;
if rounded_percentage > last_reported_percentage || percentage == 100 {
last_reported_percentage = rounded_percentage;
let _ = window.emit("download-progress", serde_json::json!({
"downloaded": downloaded_bytes,
"total": total_size as u64,
"percentage": percentage
}));
}
}
}
// Write any remaining buffered data
@@ -118,9 +141,26 @@ async fn download_and_decrypt_track(
while let Some(chunk_result) = stream.next().await {
let chunk = chunk_result.map_err(|e| format!("Download stream error: {}", e))?;
downloaded_bytes += chunk.len() as u64;
file.write_all(&chunk)
.await
.map_err(|e| format!("Failed to write to file: {}", e))?;
// Emit progress every 5%
if total_size > 0.0 {
let percentage = ((downloaded_bytes as f64 / total_size) * 100.0) as u8;
let rounded_percentage = (percentage / 5) * 5;
if rounded_percentage > last_reported_percentage || percentage == 100 {
last_reported_percentage = rounded_percentage;
let _ = window.emit("download-progress", serde_json::json!({
"downloaded": downloaded_bytes,
"total": total_size as u64,
"percentage": percentage
}));
}
}
}
}