Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(desktop-gpui): delete recordings with damaged upload state

Aditya Garud5e02caf9e027
diff --git a/apps/desktop-gpui/src/upload/queue.rs b/apps/desktop-gpui/src/upload/queue.rs
index 408a1b6a4..d59122d41 100644
--- a/apps/desktop-gpui/src/upload/queue.rs
+++ b/apps/desktop-gpui/src/upload/queue.rs
@@ -1229,10 +1229,16 @@ pub(crate) async fn delete_recording(project: PathBuf) -> Result<(), String> {
let canonical = project.canonicalize().map_err(|error| error.to_string())?;
manager().cancel(&canonical).await;
let _ownership = UploadLock::acquire(&canonical).map_err(|error| error.to_string())?;
- if let Some(mut state) = read_state(&canonical)? {
- manager().forget_pending_rechecks(&state.video_id);
- state.phase = UploadPhase::Cancelled;
- write_state(&canonical, &state)?;
+ match read_state(&canonical) {
+ Ok(Some(mut state)) => {
+ manager().forget_pending_rechecks(&state.video_id);
+ state.phase = UploadPhase::Cancelled;
+ write_state(&canonical, &state)?;
+ }
+ Ok(None) => {}
+ Err(error) => {
+ tracing::warn!(path = %canonical.display(), %error, "Deleting local recording with unreadable upload state");
+ }
}
tokio::task::spawn_blocking(move || crate::library::delete_recording_directory(&project))
.await
@@ -1983,6 +1989,70 @@ mod tests {
fixture.assert_retained();
}
+ #[test]
+ fn damaged_upload_state_does_not_prevent_local_deletion() {
+ for damage in ["truncated", "unsupported", "oversized"] {
+ let fixture = Fixture::new();
+ let path = fixture.project().join(STATE_FILE);
+ match damage {
+ "truncated" => std::fs::write(&path, b"{\"version\":").unwrap(),
+ "unsupported" => {
+ let mut state = fixture.state();
+ state.version = 2;
+ write_state(&fixture.project(), &state).unwrap();
+ }
+ "oversized" => {
+ std::fs::write(&path, vec![b' '; MAX_STATE_BYTES as usize + 1]).unwrap();
+ }
+ _ => unreachable!(),
+ }
+ assert!(read_state(&fixture.project()).is_err());
+ let store = fixture.0.join("store");
+ std::fs::write(
+ &store,
+ serde_json::to_vec(&json!({
+ "general_settings": { "recordingsPath": fixture.0.join("library") }
+ }))
+ .unwrap(),
+ )
+ .unwrap();
+ let worker_store = store.clone();
+ let runtime = tokio::runtime::Builder::new_current_thread()
+ .enable_all()
+ .on_thread_start(move || {
+ crate::store::set_test_tauri_store_path(Some(worker_store.clone()));
+ })
+ .build()
+ .unwrap();
+ let ownership = UploadLock::acquire(&fixture.project()).unwrap();
+ assert_eq!(
+ runtime
+ .block_on(delete_recording(fixture.project()))
+ .unwrap_err(),
+ UploadLockError::Busy.to_string()
+ );
+ assert!(fixture.project().join("content/output.mp4").is_file());
+ drop(ownership);
+ assert_eq!(
+ runtime.block_on(delete_recording(fixture.project())),
+ Err("Path is not inside a recordings directory".to_string())
+ );
+ fixture.assert_retained();
+ std::fs::write(
+ &store,
+ serde_json::to_vec(&json!({
+ "general_settings": { "recordingsPath": fixture.0 }
+ }))
+ .unwrap(),
+ )
+ .unwrap();
+ runtime
+ .block_on(delete_recording(fixture.project()))
+ .unwrap();
+ assert!(!fixture.project().exists(), "{damage}");
+ }
+ }
+
#[test]
fn legacy_unknown_audio_is_held_and_retry_budget_is_bounded() {
let fixture = Fixture::new();