fmt

Author: richiemcilroy

apps/desktop/src-tauri/src/recording.rs

@@ -31,6 +31,7 @@ use regex::Regex;
 use serde::{Deserialize, Serialize};
 use specta::Type;
 use std::borrow::Cow;
+use std::error::Error as StdError;
 use std::{
     any::Any,
     collections::{HashMap, VecDeque},
@@ -54,7 +55,9 @@ use crate::{
     audio::AppSounds,
     auth::AuthStore,
     create_screenshot,
-    general_settings::{GeneralSettingsStore, PostDeletionBehaviour, PostStudioRecordingBehaviour},
+    general_settings::{
+        self, GeneralSettingsStore, PostDeletionBehaviour, PostStudioRecordingBehaviour,
+    },
     open_external_link,
     presets::PresetsStore,
     thumbnails::*,

apps/desktop/src-tauri/src/target_select_overlay.rs

@@ -142,7 +142,7 @@ fn should_skip_window(window: &Window, exclusions: &[WindowExclusion]) -> bool {
 
     exclusions.iter().any(|entry| {
         entry.matches(
-            bundle_identifier,
+            bundle_identifier.as_deref(),
             owner_name.as_deref(),
             window_title.as_deref(),
         )

apps/desktop/src-tauri/src/window_exclusion.rs

@@ -1,5 +1,4 @@
-use scap_targets::Window;
-use scap_targets::WindowId;
+use scap_targets::{Window, WindowId};
 use serde::{Deserialize, Serialize};
 use specta::Type;
 
@@ -61,3 +60,34 @@ impl WindowExclusion {
         false
     }
 }
+
+pub fn resolve_window_ids(exclusions: &[WindowExclusion]) -> Vec<WindowId> {
+    if exclusions.is_empty() {
+        return Vec::new();
+    }
+
+    Window::list()
+        .into_iter()
+        .filter_map(|window| {
+            let owner_name = window.owner_name();
+            let window_title = window.name();
+
+            #[cfg(target_os = "macos")]
+            let bundle_identifier = window.raw_handle().bundle_identifier();
+
+            #[cfg(not(target_os = "macos"))]
+            let bundle_identifier = None::<&str>;
+
+            exclusions
+                .iter()
+                .find(|entry| {
+                    entry.matches(
+                        bundle_identifier.as_deref(),
+                        owner_name.as_deref(),
+                        window_title.as_deref(),
+                    )
+                })
+                .map(|_| window.id())
+        })
+        .collect()
+}

crates/recording/src/cursor.rs

@@ -48,14 +48,14 @@ fn flush_cursor_data(output_path: &Path, moves: &[CursorMoveEvent], clicks: &[Cu
         clicks: clicks.to_vec(),
         moves: moves.to_vec(),
     };
-    if let Ok(json) = serde_json::to_string_pretty(&events) {
-        if let Err(e) = std::fs::write(output_path, json) {
-            tracing::error!(
-                "Failed to write cursor data to {}: {}",
-                output_path.display(),
-                e
-            );
-        }
+    if let Ok(json) = serde_json::to_string_pretty(&events)
+        && let Err(e) = std::fs::write(output_path, json)
+    {
+        tracing::error!(
+            "Failed to write cursor data to {}: {}",
+            output_path.display(),
+            e
+        );
     }
 }
 

crates/recording/src/sources/screen_capture/mod.rs

@@ -305,8 +305,8 @@ impl<TCaptureFormat: ScreenCaptureFormat> ScreenCaptureConfig<TCaptureFormat> {
         let target_refresh = validated_refresh_rate(display.refresh_rate());
         let fps = std::cmp::max(1, std::cmp::min(max_fps, target_refresh));
 
-        let output_size = crop_bounds
-            .and_then(|b| {
+        let output_size: PhysicalSize = crop_bounds
+            .and_then(|b| -> Option<PhysicalSize> {
                 #[cfg(target_os = "macos")]
                 {
                     let logical_size = b.size();