Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(presets): preserve project content in CLI automations

Akshar Pateldf1e9e2ae5db
diff --git a/apps/cli/src/automation.rs b/apps/cli/src/automation.rs
index 37e50753d..bd9989346 100644
--- a/apps/cli/src/automation.rs
+++ b/apps/cli/src/automation.rs
@@ -366,20 +366,11 @@ impl AutomationHost for CliAutomationHost {
.ok_or_else(|| format!("Preset '{name}' not found"))?;
let config_value = preset.get("config").ok_or("Preset has no config")?;
- let mut config: cap_project::ProjectConfiguration =
+ let config: cap_project::ProjectConfiguration =
serde_json::from_value(config_value.clone())
.map_err(|e| format!("Failed to parse preset config: {e}"))?;
- if config.timeline.is_none() {
- config.timeline = cap_project::ProjectConfiguration::load(project_path)
- .ok()
- .and_then(|c| c.timeline);
- }
-
- config
- .write(project_path)
- .map_err(|e| format!("Failed to write project config: {e}"))?;
- Ok(())
+ apply_project_preset(project_path, config)
}
async fn delete_local_files(&self, ctx: &TriggerContext) -> Result<(), String> {
@@ -402,6 +393,21 @@ fn map_compression(
}
}
+fn apply_project_preset(
+ project_path: &Path,
+ preset: cap_project::ProjectConfiguration,
+) -> Result<(), String> {
+ let current = match cap_project::ProjectConfiguration::load(project_path) {
+ Ok(current) => current,
+ Err(error) if error.kind() == std::io::ErrorKind::NotFound => Default::default(),
+ Err(error) => return Err(format!("Failed to load project config: {error}")),
+ };
+ current
+ .with_preset(preset)
+ .write(project_path)
+ .map_err(|error| format!("Failed to write project config: {error}"))
+}
+
fn context_env(ctx: &TriggerContext) -> Vec<(&'static str, String)> {
let mut env = Vec::new();
if let Some(p) = &ctx.project_path {
@@ -576,6 +582,80 @@ mod tests {
use super::*;
use cap_automation::{Action, AutomationRule, MatchMode};
+ #[test]
+ fn cli_presets_keep_caption_source_and_edits_after_reopening() {
+ let current: cap_project::ProjectConfiguration =
+ serde_json::from_value(serde_json::json!({
+ "timeline": {
+ "segments": [{ "start": 0.0, "end": 10.0, "timescale": 1.0 }],
+ "zoomSegments": [],
+ "captionSegments": [{ "id": "spoken", "start": 2.0, "end": 3.0,
+ "text": "Current recording", "colorOverride": "#123456" }]
+ },
+ "captions": {
+ "segments": [{ "id": "spoken", "start": 2.0, "end": 3.0,
+ "text": "Current recording",
+ "words": [{ "text": "Current recording", "start": 2.0, "end": 3.0 }] }],
+ "settings": { "enabled": true, "size": 32 },
+ "sourceTimed": true
+ },
+ "clips": [{ "index": 0, "offsets": { "mic": -0.125 } }]
+ }))
+ .unwrap();
+ let mut legacy = current.clone();
+ let captions = legacy.captions.as_mut().unwrap();
+ captions.segments[0].text = "Other recording".into();
+ captions.segments[0].words[0].text = "Other recording".into();
+ captions.settings.size = 72;
+ legacy.timeline.as_mut().unwrap().segments[0].end = 5.0;
+ legacy.clips.clear();
+ let mut styling = legacy.clone();
+ styling.captions.as_mut().unwrap().segments.clear();
+ styling.timeline = None;
+
+ for preset in [legacy, styling, Default::default()] {
+ let temp = tempfile::tempdir().unwrap();
+ current.write(temp.path()).unwrap();
+ let expected_size = preset.captions.as_ref().map_or_else(
+ || cap_project::CaptionSettings::default().size,
+ |captions| captions.settings.size,
+ );
+ apply_project_preset(temp.path(), preset).unwrap();
+ let mut reopened = cap_project::ProjectConfiguration::load(temp.path()).unwrap();
+ let captions = reopened.captions.as_ref().unwrap();
+ assert_eq!(captions.segments[0].text, "Current recording");
+ assert!(captions.source_timed);
+ assert_eq!(captions.settings.size, expected_size);
+ assert_eq!(reopened.clips.len(), 1);
+ assert_eq!(reopened.clips[0].offsets.mic, -0.125);
+ assert_eq!(reopened.timeline.as_ref().unwrap().segments[0].end, 10.0);
+ cap_project::synchronize_captions(&mut reopened, &[10.0]);
+ let track = &reopened.timeline.as_ref().unwrap().caption_segments[0];
+ assert_eq!(track.text, "Current recording");
+ assert_eq!(track.color_override.as_deref(), Some("#123456"));
+ }
+ }
+
+ #[test]
+ fn cli_presets_apply_to_projects_without_a_saved_config() {
+ let temp = tempfile::tempdir().unwrap();
+ let mut preset = cap_project::ProjectConfiguration::default();
+ preset.background.padding = 24.0;
+ apply_project_preset(temp.path(), preset).unwrap();
+ let reopened = cap_project::ProjectConfiguration::load(temp.path()).unwrap();
+ assert_eq!(reopened.background.padding, 24.0);
+ }
+
+ #[test]
+ fn cli_presets_leave_unreadable_configs_untouched() {
+ let temp = tempfile::tempdir().unwrap();
+ let path = temp.path().join("project-config.json");
+ std::fs::write(&path, b"incomplete configuration").unwrap();
+ let error = apply_project_preset(temp.path(), Default::default()).unwrap_err();
+ assert!(error.starts_with("Failed to load project config:"));
+ assert_eq!(std::fs::read(path).unwrap(), b"incomplete configuration");
+ }
+
#[tokio::test]
async fn cli_upload_cleanup_retains_media_without_a_verified_receipt() {
for trigger in [Trigger::UploadCompleted, Trigger::InstantRecordingFinished] {
diff --git a/apps/desktop-gpui/src/presets.rs b/apps/desktop-gpui/src/presets.rs
index 451397331..a2f746e47 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::{CaptionsData, ProjectConfiguration};
+use cap_project::ProjectConfiguration;
use serde_json::{Map, Value, json};
use crate::store::{set_store_setting, store_section};
@@ -133,7 +133,7 @@ pub fn default_project_config(current: &ProjectConfiguration) -> ProjectConfigur
config.background.rounding = 7.5;
}
config.screen_movement_spring = cap_project::ScreenMovementSpring::default();
- merge_preset(config, current)
+ current.with_preset(config)
}
/// Presets store styling without recording cuts, caption text or layer order.
@@ -159,31 +159,7 @@ pub fn apply_preset(
current: &ProjectConfiguration,
) -> Option<ProjectConfiguration> {
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();
- next
+ Some(current.with_preset(next))
}
#[cfg(test)]
diff --git a/crates/project/src/configuration.rs b/crates/project/src/configuration.rs
index edda76a60..bf75871e9 100644
--- a/crates/project/src/configuration.rs
+++ b/crates/project/src/configuration.rs
@@ -2812,6 +2812,27 @@ impl ProjectStyleCache {
}
impl ProjectConfiguration {
+ pub fn with_preset(&self, mut preset: Self) -> Self {
+ let settings = preset.captions.take().map(|captions| captions.settings);
+ preset.captions = match (self.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,
+ };
+ preset.timeline = self.timeline.clone();
+ preset.text_size_version = self.text_size_version;
+ preset.text_anim_version = self.text_anim_version;
+ preset.overlay_order = self.overlay_order.clone();
+ preset.clips = self.clips.clone();
+ preset
+ }
+
pub fn resolved_overlay_order(&self, available: &[OverlayTrack]) -> Vec<OverlayTrack> {
let mut ordered = Vec::with_capacity(available.len());
for track in available {