Skip to content

The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.

feat: ripple existing clips right when a drop would overlap them

Domica964e800d2b7d
diff --git a/src/crates/concat-api/src/lib.rs b/src/crates/concat-api/src/lib.rs
index d09f58d3..00f49871 100644
--- a/src/crates/concat-api/src/lib.rs
+++ b/src/crates/concat-api/src/lib.rs
@@ -925,6 +925,7 @@ mod tests {
media_id: "m999".to_owned(),
track_id,
start: 0.0,
+ ripple: false,
}),
}));
assert_eq!(refused.code, ErrorCode::Refused);
diff --git a/src/crates/concat-export/src/flatten.rs b/src/crates/concat-export/src/flatten.rs
index 323d8c45..83af3a0e 100644
--- a/src/crates/concat-export/src/flatten.rs
+++ b/src/crates/concat-export/src/flatten.rs
@@ -271,6 +271,7 @@ mod tests {
media_id: media_id.clone(),
track_id,
start: 1.0,
+ ripple: false,
})
.expect("adds clip")
.created_id
diff --git a/src/crates/concat-host/tests/export.rs b/src/crates/concat-host/tests/export.rs
index 3aefa22f..21e2f541 100644
--- a/src/crates/concat-host/tests/export.rs
+++ b/src/crates/concat-host/tests/export.rs
@@ -1005,11 +1005,13 @@ fn every_edit_still_exports() {
media_id: aac,
track_id: sound_track.clone(),
start: 17.0,
+ ripple: false,
});
studio.apply(Command::AddClip {
media_id: wav,
track_id: sound_track.clone(),
start: 23.0,
+ ripple: false,
});
let end = studio.end();
let exported = studio.export("sound only clips");
diff --git a/src/crates/concat-project/src/commands/clips.rs b/src/crates/concat-project/src/commands/clips.rs
index 4a062546..0688ae6f 100644
--- a/src/crates/concat-project/src/commands/clips.rs
+++ b/src/crates/concat-project/src/commands/clips.rs
@@ -19,6 +19,7 @@ pub(super) fn apply(
media_id,
track_id,
start,
+ ripple,
} => {
let media = project
.media_by_id(&media_id)
@@ -28,6 +29,9 @@ pub(super) fn apply(
if timeline.track(&track_id).is_none() {
return Err(CommandError::TrackGone);
}
+ if ripple {
+ ripple_room_for(timeline, &track_id, start, &media);
+ }
let id = mint.next("c");
timeline
.clips
@@ -488,6 +492,29 @@ fn default_clip(id: String, track_id: String, media: &MediaItem, start: f64) ->
clip
}
+/// Shifts every clip on `track_id` at or after `start` right by the
+/// duration the new clip will take, when the new clip would overlap
+/// something already there. A drop with room to spare changes nothing.
+fn ripple_room_for(timeline: &mut Timeline, track_id: &str, start: f64, media: &MediaItem) {
+ let duration = match media.kind {
+ MediaKind::Image => DEFAULT_IMAGE_DURATION,
+ _ => media.duration.unwrap_or(UNKNOWN_DURATION),
+ };
+ let end = start + duration;
+ let overlaps = timeline.clips.iter().any(|clip| {
+ clip.track_id == track_id && clip.start < end && start < clip.start + clip.duration
+ });
+ if !overlaps {
+ return;
+ }
+ for clip in timeline
+ .clips_mut()
+ .filter(|clip| clip.track_id == track_id && clip.start >= start)
+ {
+ clip.start += duration;
+ }
+}
+
/// The lowest track with nothing occupying `[start, start + duration)`,
/// falling back to the bottom track.
fn first_free_track(timeline: &Timeline, start: f64, duration: f64) -> Option<String> {
diff --git a/src/crates/concat-project/src/commands/mod.rs b/src/crates/concat-project/src/commands/mod.rs
index 478b1073..4281d9cd 100644
--- a/src/crates/concat-project/src/commands/mod.rs
+++ b/src/crates/concat-project/src/commands/mod.rs
@@ -270,6 +270,12 @@ pub enum Command {
track_id: String,
/// Timeline position in seconds, floored at 0.
start: f64,
+ /// When true and the drop would overlap something on this track,
+ /// every clip at or after `start` is shifted right by the new
+ /// clip's duration, so the drop lands without covering anything.
+ /// False for programmatic adds, true for a drop from the bin.
+ #[serde(default)]
+ ripple: bool,
},
/// [`Command::AddClip`] without naming a lane: lands on the lowest
/// track with nothing in the clip's span, falling back to the bottom
diff --git a/src/crates/concat-project/src/lib.rs b/src/crates/concat-project/src/lib.rs
index 5f45331d..6cba68c7 100644
--- a/src/crates/concat-project/src/lib.rs
+++ b/src/crates/concat-project/src/lib.rs
@@ -148,6 +148,7 @@ mod tests {
media_id: media_id.clone(),
track_id,
start: 0.0,
+ ripple: false,
})
.expect("adds")
.created_id
@@ -1190,6 +1191,7 @@ mod tests {
media_id: media_id.clone(),
track_id,
start: 0.0,
+ ripple: false,
})
.expect("adds")
.created_id
@@ -2154,6 +2156,7 @@ mod tests {
media_id: media_id.clone(),
track_id,
start: 0.0,
+ ripple: false,
})
.expect("adds");
@@ -2411,6 +2414,7 @@ mod tests {
media_id: "m1".to_owned(),
track_id: "T1".to_owned(),
start: 1.0,
+ ripple: false,
},
Command::AddClipAtFirstFree {
media_id: "m1".to_owned(),
diff --git a/src/crates/concat/src/studio.rs b/src/crates/concat/src/studio.rs
index 36c57563..b00d33b8 100644
--- a/src/crates/concat/src/studio.rs
+++ b/src/crates/concat/src/studio.rs
@@ -2213,6 +2213,7 @@ impl Studio {
media_id: plan.media.clone(),
track_id,
start: f64::from(plan.start),
+ ripple: true,
})
};
if let Some(id) = created {
@@ -4398,6 +4399,7 @@ impl Studio {
media_id: source.media_id.clone(),
track_id: source.track_id.clone(),
start: (end - source.source_start / source.speed).max(0.0),
+ ripple: false,
}) else {
return;
};