Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix(desktop-gpui): keep caption text when applying presets
Akshar Patelc0fdd5b8ee81
diff --git a/apps/desktop-gpui/src/editor_window.rs b/apps/desktop-gpui/src/editor_window.rsindex e89dee550..cc1dfdef8 100644--- a/apps/desktop-gpui/src/editor_window.rs+++ b/apps/desktop-gpui/src/editor_window.rs@@ -7264,10 +7264,7 @@ impl EditorWindow {/// The built-in Default row: Cap's own look, with this project's timeline/// and clips kept.fn apply_default_preset(&mut self, window: &mut Window, cx: &mut Context<Self>) {- let mut next = crate::presets::default_project_config();- next.timeline = self.project.timeline.clone();- next.overlay_order = self.project.overlay_order.clone();- next.clips = self.project.clips.clone();+ let next = crate::presets::default_project_config(&self.project);self.apply_project_preset(next, window, cx);}diff --git a/apps/desktop-gpui/src/presets.rs b/apps/desktop-gpui/src/presets.rsindex 27c8f3b67..451397331 100644--- a/apps/desktop-gpui/src/presets.rs+++ b/apps/desktop-gpui/src/presets.rs@@ -9,7 +9,7 @@//! *applied*, so a preset written by a newer Tauri build with fields this//! build has never heard of survives every rename/reorder untouched.-use cap_project::ProjectConfiguration;+use cap_project::{CaptionsData, ProjectConfiguration};use serde_json::{Map, Value, json};use crate::store::{set_store_setting, store_section};@@ -124,7 +124,7 @@ impl PresetsStore {/// presentation defaults the recorder applies (`recording.rs`/// `apply_screen_recording_presentation_defaults`): 10% padding, 7.5%/// rounding and the default screen-movement spring.-pub fn default_project_config() -> ProjectConfiguration {+pub fn default_project_config(current: &ProjectConfiguration) -> ProjectConfiguration {let mut config = ProjectConfiguration::default();if config.background.padding <= f64::EPSILON {config.background.padding = 10.0;@@ -133,36 +133,57 @@ pub fn default_project_config() -> ProjectConfiguration {config.background.rounding = 7.5;}config.screen_movement_spring = cap_project::ScreenMovementSpring::default();- config+ merge_preset(config, current)}-/// What a preset stores: the whole project config with `timeline: null` and-/// `clips: []` -- presets style a project, they never carry its cuts-/// (`createPresets.ts:31-35`).+/// Presets store styling without recording cuts, caption text or layer order.pub fn preset_config(project: &ProjectConfiguration) -> Value {let mut value = serde_json::to_value(project).unwrap_or(Value::Null);if let Some(map) = value.as_object_mut() {map.insert("timeline".into(), Value::Null);map.insert("clips".into(), Value::Array(Vec::new()));map.remove("overlayOrder");+ if let Some(captions) = map.get_mut("captions").and_then(Value::as_object_mut) {+ captions.insert("segments".into(), Value::Array(Vec::new()));+ captions.remove("sourceTimed");+ }}value}/// `applyPreset`'s merge (`PresetsDropdown.tsx`): the preset's config with the-/// *current* timeline and clips kept in place. `None` when the stored JSON no-/// longer deserializes.+/// *current* timeline, clips and caption source kept in place. `None` when the+/// stored JSON no longer deserializes.pub fn apply_preset(config: &Value,current: &ProjectConfiguration,) -> Option<ProjectConfiguration> {- let mut next: ProjectConfiguration = serde_json::from_value(config.clone()).ok()?;+ let next = serde_json::from_value(config.clone()).ok()?;+ Some(merge_preset(next, current))+}++fn merge_preset(+ mut next: ProjectConfiguration,+ current: &ProjectConfiguration,+) -> ProjectConfiguration {+ let settings = next.captions.take().map(|captions| captions.settings);+ next.captions = match (current.captions.clone(), settings) {+ (Some(mut captions), settings) => {+ captions.settings = settings.unwrap_or_default();+ Some(captions)+ }+ (None, Some(settings)) => Some(CaptionsData {+ settings,+ ..Default::default()+ }),+ (None, None) => None,+ };next.timeline = current.timeline.clone();next.text_size_version = current.text_size_version;next.text_anim_version = current.text_anim_version;next.overlay_order = current.overlay_order.clone();next.clips = current.clips.clone();- Some(next)+ next}#[cfg(test)]@@ -328,6 +349,112 @@ mod tests {);}+ fn captioned_project(text: &str, source_timed: bool) -> ProjectConfiguration {+ serde_json::from_value(json!({+ "timeline": {+ "segments": [{ "start": 0.0, "end": 10.0, "timescale": 1.0 }],+ "zoomSegments": [],+ "captionSegments": [{+ "id": "spoken", "start": 2.0, "end": 3.0, "text": text,+ "words": [{ "text": text, "start": 2.0, "end": 3.0 }],+ "colorOverride": "#123456", "positionOverride": "top-center"+ }]+ },+ "captions": {+ "segments": [{+ "id": "spoken", "start": 2.0, "end": 3.0, "text": text,+ "words": [{ "text": text, "start": 2.0, "end": 3.0 }]+ }],+ "settings": { "enabled": true, "size": 32 },+ "sourceTimed": source_timed+ }+ }))+ .unwrap()+ }++ #[test]+ fn saving_a_preset_keeps_caption_settings_without_the_transcript() {+ let source = captioned_project("Other recording", true);+ let preset = preset_config(&source);+ let captions = &preset["captions"];+ assert_eq!(captions["segments"], json!([]));+ assert_eq!(captions["settings"]["size"], 32);+ assert!(captions.get("sourceTimed").is_none());+ assert!(+ !serde_json::to_string(&preset)+ .unwrap()+ .contains("Other recording")+ );+ }++ #[test]+ fn applying_a_preset_keeps_source_captions_and_timeline_overrides() {+ let preset = serde_json::to_value(captioned_project("Other recording", false)).unwrap();+ for source_timed in [false, true] {+ let current = captioned_project("Current recording", source_timed);+ let mut preset = preset.clone();+ preset["captions"]["settings"]["size"] = json!(72);+ let mut applied = apply_preset(&preset, ¤t).unwrap();+ let captions = applied.captions.as_ref().unwrap();+ assert_eq!(captions.segments[0].text, "Current recording");+ assert_eq!(captions.source_timed, source_timed);+ assert_eq!(captions.settings.size, 72);+ assert!(captions.settings.enabled);+ cap_project::synchronize_captions(&mut applied, &[10.0]);+ let track = &applied.timeline.as_ref().unwrap().caption_segments[0];+ assert_eq!(track.text, "Current recording");+ assert_eq!((track.start, track.end), (2.0, 3.0));+ assert_eq!(track.color_override.as_deref(), Some("#123456"));+ assert_eq!(track.position_override.as_deref(), Some("top-center"));+ let directory = tempfile::tempdir().unwrap();+ applied.write(directory.path()).unwrap();+ let mut reopened = ProjectConfiguration::load(directory.path()).unwrap();+ cap_project::synchronize_captions(&mut reopened, &[10.0]);+ assert_eq!(+ reopened.captions.as_ref().unwrap().segments[0].text,+ "Current recording"+ );+ assert_eq!(+ reopened.timeline.as_ref().unwrap().caption_segments[0].text,+ "Current recording"+ );+ }+ }++ #[test]+ fn applying_default_caption_settings_keeps_the_current_transcript() {+ let current = captioned_project("Current recording", true);+ let preset = preset_config(&ProjectConfiguration::default());+ for applied in [+ apply_preset(&preset, ¤t).unwrap(),+ default_project_config(¤t),+ ] {+ let captions = applied.captions.as_ref().unwrap();+ assert_eq!(captions.segments[0].text, "Current recording");+ assert!(captions.source_timed);+ assert_eq!(+ captions.settings.size,+ cap_project::CaptionSettings::default().size+ );+ assert!(!captions.settings.enabled);+ }+ }++ #[test]+ fn applying_a_preset_to_an_uncaptioned_project_keeps_only_its_settings() {+ let source = captioned_project("Other recording", true);+ let preset = serde_json::to_value(&source).unwrap();+ let current = ProjectConfiguration::default();+ let applied = apply_preset(&preset, ¤t).unwrap();+ let captions = applied.captions.as_ref().unwrap();+ assert!(captions.segments.is_empty());+ assert_eq!(captions.settings.size, 32);+ assert!(captions.settings.enabled);+ let preset = preset_config(¤t);+ assert!(apply_preset(&preset, ¤t).unwrap().captions.is_none());+ assert!(default_project_config(¤t).captions.is_none());+ }+#[test]fn malformed_entries_are_skipped_on_load() {let mut section = Map::new();