Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(desktop-gpui): count only uploaded parts in share progress

Aditya Garuda804458330f9
diff --git a/apps/desktop-gpui/src/upload.rs b/apps/desktop-gpui/src/upload.rs
index d8f110859..d2e9a3976 100644
--- a/apps/desktop-gpui/src/upload.rs
+++ b/apps/desktop-gpui/src/upload.rs
@@ -2024,6 +2024,7 @@ async fn upload_file_parts(
let mut parts = Vec::new();
let mut failed = Vec::new();
let mut offset = 0u64;
+ let mut uploaded_bytes = 0u64;
let mut part_number = 1u32;
while offset < file_size {
@@ -2041,7 +2042,11 @@ async fn upload_file_parts(
bytes: chunk.into(),
};
match upload_part_chunk(transport, &chunk, file_size, cancel).await {
- Ok(part) => parts.push(part),
+ Ok(part) => {
+ uploaded_bytes += size as u64;
+ progress((uploaded_bytes as f64 / file_size as f64).min(0.99));
+ parts.push(part);
+ }
Err(error) => {
check_export_cancelled(cancel)?;
tracing::warn!(part_number, error = %error, "chunk upload failed; will retry");
@@ -2050,7 +2055,6 @@ async fn upload_file_parts(
}
offset += size as u64;
part_number += 1;
- progress((offset as f64 / file_size as f64).min(0.99));
}
for (chunk, first_error) in failed {
@@ -2058,7 +2062,11 @@ async fn upload_file_parts(
return Err(AuthApiError::Other("Export cancelled".into()));
}
match upload_part_chunk(transport, &chunk, file_size, cancel).await {
- Ok(part) => parts.push(part),
+ Ok(part) => {
+ uploaded_bytes += chunk.bytes.len() as u64;
+ progress((uploaded_bytes as f64 / file_size as f64).min(0.99));
+ parts.push(part);
+ }
Err(_) => {
check_export_cancelled(cancel)?;
return Err(first_error);
diff --git a/apps/desktop-gpui/src/upload/multipart_tests.rs b/apps/desktop-gpui/src/upload/multipart_tests.rs
index 954320f77..b4462f46b 100644
--- a/apps/desktop-gpui/src/upload/multipart_tests.rs
+++ b/apps/desktop-gpui/src/upload/multipart_tests.rs
@@ -182,12 +182,35 @@ async fn failed_part_is_retried_after_the_rest_and_upload_completes() {
fail_once: Mutex::new(HashSet::from([3, 6])),
..FakeParts::default()
};
- let (result, progress) = run(&transport, &export, 4, &AtomicBool::new(false), None).await;
+ let progress = Mutex::new(Vec::new());
+ let result = upload_file_parts(
+ &transport,
+ &export.0,
+ 40,
+ 4,
+ &|value| {
+ progress
+ .lock()
+ .unwrap()
+ .push((transport.started_parts().len(), value));
+ },
+ &AtomicBool::new(false),
+ None,
+ )
+ .await;
assert_parts(&result.unwrap(), &[4; 10]);
let started = transport.started_parts();
assert_eq!(started.len(), 12);
assert_eq!(&started[10..], [3, 6]);
- assert_eq!(progress.last().copied(), Some(0.99));
+ assert_eq!(
+ progress
+ .into_inner()
+ .unwrap()
+ .into_iter()
+ .map(|(started, _)| started)
+ .collect::<Vec<_>>(),
+ [1, 2, 4, 5, 7, 8, 9, 10, 11, 12]
+ );
let retried = transport.started.lock().unwrap();
assert_eq!(retried[10].2, retried[2].2);
}
@@ -199,12 +222,13 @@ async fn part_failing_its_retry_returns_the_first_error() {
fail_always: HashSet::from([2]),
..FakeParts::default()
};
- let (result, _) = run(&transport, &export, 4, &AtomicBool::new(false), None).await;
+ let (result, progress) = run(&transport, &export, 4, &AtomicBool::new(false), None).await;
assert_eq!(
result.unwrap_err().to_string(),
"uploader/part/2/status/500"
);
assert_eq!(transport.started_parts(), [1, 2, 3, 4, 5, 2]);
+ assert_eq!(progress, [0.2, 0.4, 0.6, 0.8]);
}
#[tokio::test]