Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(recording): let the preparing preview accept segment start times

Paddy217d1174d0f5
diff --git a/crates/recording/src/recovery/preparing_projection.rs b/crates/recording/src/recovery/preparing_projection.rs
index 37ce3e5a1..70b055571 100644
--- a/crates/recording/src/recovery/preparing_projection.rs
+++ b/crates/recording/src/recovery/preparing_projection.rs
@@ -11,7 +11,10 @@ use cap_project::{
StudioRecordingStatus, VideoMeta,
};
-use super::{IncompleteRecording, RecoveryManager, is_apple_double, reject_recovery_link};
+use super::{
+ IncompleteRecording, RecoveryManager, SEGMENT_START_TIMES_FILE, is_apple_double,
+ reject_recovery_link,
+};
use crate::studio_recording::CleanStoppedStudioClaim;
const MAX_JSON_BYTES: u64 = 8 * 1024 * 1024;
@@ -229,6 +232,9 @@ pub(super) fn project(
return Err("Stopped cursor sidecar does not match discovery".into());
}
let keyboard_path = keyboard(&mut inventory, metadata, &segment_dir)?;
+ inventory
+ .files
+ .remove(&segment_dir.join(SEGMENT_START_TIMES_FILE));
if let Some(notch) = metadata.display_notch
&& (!notch.x.is_finite() || !notch.width.is_finite() || !notch.height.is_finite())
{
@@ -1139,6 +1145,28 @@ mod tests {
assert!(fixture.project().is_ok());
}
+ #[test]
+ fn preparing_projection_accepts_segment_start_times_but_not_other_extra_files() {
+ let fixture = Fixture::new(2);
+ let segments = fixture.directory.path().join("content/segments");
+ for index in 0..2 {
+ std::fs::write(
+ segments
+ .join(format!("segment-{index}"))
+ .join(SEGMENT_START_TIMES_FILE),
+ br#"{"display":0.0}"#,
+ )
+ .unwrap();
+ }
+ assert!(fixture.project().is_ok());
+
+ std::fs::write(segments.join("segment-1/stray.json"), b"{}").unwrap();
+ assert_eq!(
+ fixture.project().err().as_deref(),
+ Some("Unrepresented source files or respawn layouts require ordinary finalization")
+ );
+ }
+
#[test]
fn preparing_projection_compares_writer_float_representation_and_rejects_unknown_fields() {
let fixture = Fixture::new(1);