Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(desktop-gpui): clear a verified upload's start cleanup entry and keep the local copy if that fails

Richie McIlroy2f14141e374e
diff --git a/apps/desktop-gpui/src/upload/queue.rs b/apps/desktop-gpui/src/upload/queue.rs
index 41d726c2e..9d8495c1e 100644
--- a/apps/desktop-gpui/src/upload/queue.rs
+++ b/apps/desktop-gpui/src/upload/queue.rs
@@ -376,6 +376,7 @@ trait UploadBackend: Send + Sync + 'static {
verification: &UploadVerification,
) -> Result<(), String>;
fn delete_after_upload(&self) -> bool;
+ fn forget_start_cleanup(&self, video_id: &str) -> bool;
fn notify_failure(&self);
}
@@ -523,6 +524,10 @@ impl UploadBackend for LiveBackend {
crate::store::GeneralSettings::load().delete_instant_recordings_after_upload
}
+ fn forget_start_cleanup(&self, video_id: &str) -> bool {
+ super::instant_cleanup::forget_verified(video_id)
+ }
+
fn notify_failure(&self) {
crate::app_sounds::play_notification();
}
@@ -826,9 +831,12 @@ impl<B: UploadBackend> Manager<B> {
Some(&upload.cancel),
)
.map_err(|error| error.to_string())?;
+ let cleanup_cleared = self.backend.forget_start_cleanup(&state.video_id);
if !state.preserve_local && self.backend.delete_after_upload() {
check_segment_cancelled(&upload.cancel)?;
- if let Err(error) = std::fs::remove_dir_all(project) {
+ if !cleanup_cleared {
+ tracing::warn!(path = %project.display(), "Verified upload kept locally because its cleanup entry could not be cleared");
+ } else if let Err(error) = std::fs::remove_dir_all(project) {
tracing::warn!(path = %project.display(), %error, "Verified upload kept locally because cleanup failed");
}
}
@@ -1348,6 +1356,7 @@ mod tests {
stall_confirmation: AtomicBool,
reupload_required: AtomicBool,
delete: AtomicBool,
+ keep_cleanup_entry: AtomicBool,
transfers: AtomicUsize,
confirmations: AtomicUsize,
failure_notifications: AtomicUsize,
@@ -1439,6 +1448,10 @@ mod tests {
self.delete.load(Ordering::Acquire)
}
+ fn forget_start_cleanup(&self, _video_id: &str) -> bool {
+ !self.keep_cleanup_entry.load(Ordering::Acquire)
+ }
+
fn notify_failure(&self) {
self.failure_notifications.fetch_add(1, Ordering::AcqRel);
}
@@ -1867,6 +1880,23 @@ mod tests {
}
}
+ #[tokio::test]
+ async fn verified_upload_stays_local_when_its_cleanup_entry_cannot_be_cleared() {
+ let fixture = Fixture::new();
+ let backend = FakeBackend::default();
+ backend.verified.store(true, Ordering::Release);
+ backend.delete.store(true, Ordering::Release);
+ backend.keep_cleanup_entry.store(true, Ordering::Release);
+ let manager = Arc::new(Manager::new(backend, Duration::from_secs(1)));
+ manager
+ .admit(fixture.project(), fixture.upload(), false)
+ .await
+ .unwrap();
+ joined(&manager).await;
+ assert_eq!(fixture.state().phase, UploadPhase::Verified);
+ assert!(fixture.project().join("content/output.mp4").is_file());
+ }
+
#[tokio::test]
async fn cancelled_worker_cannot_complete_even_after_network_gate_opens() {
let fixture = Fixture::new();