[*] refactor video editor

Author: heng30

lib/video-editor/src/commands/segment.rs

@@ -1,6 +1,9 @@
 use super::command::{AffectedSegments, Command};
 use crate::{
     Error, Result,
+    filters::traits::{
+        AudioFilterWrapper, ImageFilterWrapper, SubtitleFilterWrapper, VideoFilterWrapper,
+    },
     tracks::track::Track,
     tracks::{manager::Manager, segment::Segment},
 };
@@ -1720,6 +1723,11 @@ pub struct MergeSegmentsCommand {
     // For undo
     original_first_duration: Option<Duration>,
     removed_second_segment: Option<Arc<Segment>>,
+    // Save entire filter lists for undo (not just counts)
+    original_video_filters: Option<Vec<Arc<VideoFilterWrapper>>>,
+    original_audio_filters: Option<Vec<Arc<AudioFilterWrapper>>>,
+    original_subtitle_filters: Option<Vec<Arc<SubtitleFilterWrapper>>>,
+    original_image_filters: Option<Vec<Arc<ImageFilterWrapper>>>,
 
     // Shift info for undo
     shift_amount: Option<Duration>,
@@ -1738,6 +1746,10 @@ impl MergeSegmentsCommand {
             second_segment_index,
             original_first_duration: None,
             removed_second_segment: None,
+            original_video_filters: None,
+            original_audio_filters: None,
+            original_subtitle_filters: None,
+            original_image_filters: None,
             shift_amount: None,
             shifted_from_index: 0,
         }
@@ -1779,6 +1791,10 @@ impl Command for MergeSegmentsCommand {
         // Save original state for undo
         self.original_first_duration = Some(first_segment.duration);
         self.removed_second_segment = Some(second_segment.clone());
+        self.original_video_filters = Some(first_segment.video_filters.clone());
+        self.original_audio_filters = Some(first_segment.audio_filters.clone());
+        self.original_subtitle_filters = Some(first_segment.subtitle_filters.clone());
+        self.original_image_filters = Some(first_segment.image_filters.clone());
 
         // Calculate new duration based on source positions
         // Merged segment covers from first_segment.source_offset to end of second_segment in source
@@ -1795,8 +1811,18 @@ impl Command for MergeSegmentsCommand {
             self.shift_amount = Some(new_duration - original_total);
         }
 
+        // Clone second segment's filters for merging (before removing the segment)
+        let second_video_filters = second_segment.video_filters.clone();
+        let second_audio_filters = second_segment.audio_filters.clone();
+        let second_subtitle_filters = second_segment.subtitle_filters.clone();
+        let second_image_filters = second_segment.image_filters.clone();
+
         track.modify_segment(self.first_segment_index, |segment| {
             segment.duration = new_duration;
+            merge_filters_dedup_video(&mut segment.video_filters, &second_video_filters);
+            merge_filters_dedup_audio(&mut segment.audio_filters, &second_audio_filters);
+            merge_filters_dedup_subtitle(&mut segment.subtitle_filters, &second_subtitle_filters);
+            merge_filters_dedup_image(&mut segment.image_filters, &second_image_filters);
         })?;
 
         track.remove_segment_leave_gap(self.second_segment_index)?;
@@ -1815,10 +1841,21 @@ impl Command for MergeSegmentsCommand {
     fn undo(&mut self, manager: &mut Manager) -> Result<()> {
         let track = get_track_from_manager(manager, self.track_index)?;
 
-        // Restore first segment's original duration
         if let Some(original_duration) = self.original_first_duration {
             track.modify_segment(self.first_segment_index, |segment| {
                 segment.duration = original_duration;
+                if let Some(filters) = self.original_video_filters.take() {
+                    segment.video_filters = filters;
+                }
+                if let Some(filters) = self.original_audio_filters.take() {
+                    segment.audio_filters = filters;
+                }
+                if let Some(filters) = self.original_subtitle_filters.take() {
+                    segment.subtitle_filters = filters;
+                }
+                if let Some(filters) = self.original_image_filters.take() {
+                    segment.image_filters = filters;
+                }
             })?;
         }
 
@@ -1861,3 +1898,23 @@ impl Command for MergeSegmentsCommand {
         affected
     }
 }
+
+macro_rules! impl_merge_filters_dedup {
+    ($fn_name:ident, $wrapper_type:ty) => {
+        fn $fn_name(target: &mut Vec<Arc<$wrapper_type>>, source: &[Arc<$wrapper_type>]) {
+            for source_filter in source {
+                let is_duplicate = target
+                    .iter()
+                    .any(|target_filter| target_filter.inner.name() == source_filter.inner.name());
+                if !is_duplicate {
+                    target.push(source_filter.clone());
+                }
+            }
+        }
+    };
+}
+
+impl_merge_filters_dedup!(merge_filters_dedup_video, VideoFilterWrapper);
+impl_merge_filters_dedup!(merge_filters_dedup_audio, AudioFilterWrapper);
+impl_merge_filters_dedup!(merge_filters_dedup_subtitle, SubtitleFilterWrapper);
+impl_merge_filters_dedup!(merge_filters_dedup_image, ImageFilterWrapper);