Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix(desktop-gpui): refuse a delete that cannot take the thumbnail lock, delete off the async worker, drop stale macOS tray scans
Richie McIlroy660a630662bf
diff --git a/apps/desktop-gpui/src/library.rs b/apps/desktop-gpui/src/library.rsindex fe2a79286..40fa25194 100644--- a/apps/desktop-gpui/src/library.rs+++ b/apps/desktop-gpui/src/library.rs@@ -570,7 +570,9 @@ pub fn delete_recording_directory_in(dirs: &[PathBuf], path: &Path) -> Result<()};if let Some(canonical_path) = canonical_path {- let _thumbnails = crate::recording::hold_studio_thumbnail_writes();+ let _thumbnails = crate::recording::hold_studio_thumbnail_writes().ok_or_else(|| {+ "Timed out waiting for the recording's thumbnail to finish writing".to_string()+ })?;std::fs::remove_dir_all(canonical_path).map_err(|error| format!("Failed to delete recording: {error}"))?;}diff --git a/apps/desktop-gpui/src/recording.rs b/apps/desktop-gpui/src/recording.rsindex e3f38cdf8..83b7225ca 100644--- a/apps/desktop-gpui/src/recording.rs+++ b/apps/desktop-gpui/src/recording.rs@@ -4076,10 +4076,18 @@ mod studio_finalization_tests {let written = studio_thumbnail_events();while written.try_recv().is_ok() {}- let project = finalize_studio(completed, ScreenCaptureTarget::CameraOnly, None, None)- .await- .unwrap();+ let writing = hold_studio_thumbnail_writes().unwrap();+ let project = tokio::time::timeout(+ std::time::Duration::from_secs(30),+ finalize_studio(completed, ScreenCaptureTarget::CameraOnly, None, None),+ )+ .await+ .unwrap()+ .unwrap();assert_eq!(project, root);+ assert!(studio_thumbnails_pending());+ assert!(!crate::library::bundle_thumbnail_path(&root).exists());+ drop(writing);next_thumbnail_event(&written).await;assert!(!studio_thumbnails_pending());diff --git a/apps/desktop-gpui/src/tray.rs b/apps/desktop-gpui/src/tray.rsindex 001a6d2a8..cc24e9fc8 100644--- a/apps/desktop-gpui/src/tray.rs+++ b/apps/desktop-gpui/src/tray.rs@@ -693,6 +693,7 @@ mod mac {actions: Vec<TrayItem>,mode: Mode,previous: Vec<PreviousItem>,+ previous_generation: u64,recording: bool,}@@ -770,6 +771,7 @@ mod mac {actions: Vec::new(),mode,previous: Vec::new(),+ previous_generation: 0,recording: false,};set_button_image(&tray, mode_icon(mode));@@ -1042,13 +1044,17 @@ mod mac {if !cx.has_global::<Tray>() {return;}+ let tray = cx.global_mut::<Tray>();+ tray.previous_generation = tray.previous_generation.wrapping_add(1);+ let generation = tray.previous_generation;cx.spawn(async move |cx| {let previous = cx.background_executor().spawn(async { scan_previous(true) }).await;cx.update(|cx| {- if !cx.has_global::<Tray>() {+ if !cx.has_global::<Tray>() || cx.global::<Tray>().previous_generation != generation+ {return;}cx.global_mut::<Tray>().previous = previous;diff --git a/apps/desktop-gpui/src/upload/queue.rs b/apps/desktop-gpui/src/upload/queue.rsindex 6cf371979..efb7c5367 100644--- a/apps/desktop-gpui/src/upload/queue.rs+++ b/apps/desktop-gpui/src/upload/queue.rs@@ -1107,7 +1107,9 @@ pub(crate) async fn delete_recording(project: PathBuf) -> Result<(), String> {state.phase = UploadPhase::Cancelled;write_state(&canonical, &state)?;}- crate::library::delete_recording_directory(&project)+ tokio::task::spawn_blocking(move || crate::library::delete_recording_directory(&project))+ .await+ .map_err(|error| error.to_string())?}#[cfg(test)]