[*] refactor video editor

heng30 · heng30 · commit c6906537e5b3 · 2026-03-28T01:46:17.000+08:00
diff --git a/todo.md b/todo.md
@@ -1,8 +1,6 @@
 ## 问题
-- 添加item 到轨道，如果是新建轨道，新建轨道是插到相同优先级轨道的末尾。而不是开头，所以获取track_index有问题。
 
 ## 待验证
-- 添加item到轨道，如果选中了轨道，会添加到最后。现在需要添加到当前playhead处，如果有segment则先分割segment，再添加item
 
 - 视频轨道分离字幕
 
diff --git a/wayshot/src/logic/video_editor/playlist.rs b/wayshot/src/logic/video_editor/playlist.rs
@@ -1,7 +1,7 @@
 use super::{
     command::{refresh_preview, sync_manager_to_ui, with_history_manager},
     project::PROJECT_STATE,
-    segment::{async_load_segment_audio, async_load_segment_thumbnail},
+    segment::refresh_affected_segments,
 };
 use crate::{
     global_store,
@@ -19,8 +19,10 @@ use std::{path::PathBuf, sync::Arc, time::Duration};
 use uuid::Uuid;
 use video_editor::{
     commands::{
-        BatchCommand, ExecuteResult,
-        segment::{InsertSegmentAtTimeCommand, SplitSegmentCommand},
+        AffectedSegment, BatchCommand, ExecuteResult,
+        segment::{
+            InsertSegmentAtTimeCommand, ShiftSubsequentSegmentsCommand, SplitSegmentCommand,
+        },
         track::AddTrackCommand,
     },
     metadata::{Metadata, MetadataType, get_metadata},
@@ -153,168 +155,132 @@ pub fn async_add_item_to_track(ui_weak: Weak<AppWindow>, name: String, file_path
             let timeline_offset_ms = global_store!(ui).get_video_editor_timeline_offset();
             let timeline_offset = Duration::from_millis(timeline_offset_ms as u64);
 
-            let result: Result<(ExecuteResult, usize, usize, String)> =
-                with_history_manager(|state| {
-                    // Check if current track matches metadata type
-                    if current_track_index >= 0
-                        && let Some(current_track) =
-                            state.tracks_manager.get(current_track_index as usize)
-                        && track_matches_metadata_type(current_track, &metadata)
-                    {
-                        // Add segment to existing track at playhead position
-                        let track_index = current_track_index as usize;
-                        let track = state.tracks_manager.get(track_index).expect("track exists");
-
-                        let segment_duration = if metadata.is_image() && metadata.duration.is_zero()
-                        {
-                            Duration::from_secs(5)
-                        } else {
-                            metadata.duration
-                        };
-
-                        // Determine insertion point and whether we need to split
-                        let mut need_split = false;
-                        let mut split_segment_index = 0;
-                        let mut insert_index = track.segments_count();
-                        let mut split_time = Duration::ZERO;
-
-                        for (i, segment) in track.segments().iter().enumerate() {
-                            let segment_start = segment.timeline_offset;
-                            let segment_end = segment.timeline_offset + segment.duration;
-
-                            if timeline_offset >= segment_start && timeline_offset < segment_end {
-                                // Playhead is within this segment, need to split
-                                insert_index = i + 1;
-                                need_split = true;
-                                split_segment_index = i;
-                                split_time = timeline_offset - segment_start;
-                                break;
-                            } else if timeline_offset < segment_start {
-                                // Playhead is before this segment
-                                insert_index = i;
-                                break;
-                            }
-                        }
+            let result: Result<ExecuteResult> = with_history_manager(|state| {
+                // Check if current track matches metadata type
+                if current_track_index >= 0
+                    && let Some(current_track) =
+                        state.tracks_manager.get(current_track_index as usize)
+                    && track_matches_metadata_type(current_track, &metadata)
+                {
+                    // Add segment to existing track at playhead position
+                    let track_index = current_track_index as usize;
+                    let track = state.tracks_manager.get(track_index).expect("track exists");
+
+                    let segment_duration = if metadata.is_image() && metadata.duration.is_zero() {
+                        Duration::from_secs(5)
+                    } else {
+                        metadata.duration
+                    };
 
-                        // Create the new segment at playhead position
-                        let mut segment =
-                            Segment::new(timeline_offset, segment_duration, metadata.clone());
-                        segment.uuid = Uuid::new_v4().to_string();
-                        let segment = Arc::new(segment);
+                    // Determine insertion point and whether we need to split
+                    let mut need_split = false;
+                    let mut split_segment_index = 0;
+                    let mut insert_index = track.segments_count();
+                    let mut split_time = Duration::ZERO;
+
+                    for (i, segment) in track.segments().iter().enumerate() {
+                        let segment_start = segment.timeline_offset;
+                        let segment_end = segment.timeline_offset + segment.duration;
+
+                        if timeline_offset >= segment_start && timeline_offset < segment_end {
+                            // Playhead is within this segment, need to split
+                            insert_index = i + 1;
+                            need_split = true;
+                            split_segment_index = i;
+                            split_time = timeline_offset - segment_start;
+                            break;
+                        } else if timeline_offset < segment_start {
+                            // Playhead is before this segment
+                            insert_index = i;
+                            break;
+                        }
+                    }
 
-                        let mut batch_command = BatchCommand::new(format!("Add {} to track", name));
+                    // Create the new segment at playhead position
+                    let mut segment =
+                        Segment::new(timeline_offset, segment_duration, metadata.clone());
+                    segment.uuid = Uuid::new_v4().to_string();
+                    let segment = Arc::new(segment);
 
-                        if need_split {
-                            batch_command.add_command(Box::new(SplitSegmentCommand::new(
-                                track_index,
-                                split_segment_index,
-                                split_time,
-                            )));
-                        }
+                    let mut batch_command = BatchCommand::new(format!("Add {} to track", name));
 
-                        batch_command.add_command(Box::new(InsertSegmentAtTimeCommand::new(
+                    if need_split {
+                        batch_command.add_command(Box::new(SplitSegmentCommand::new(
                             track_index,
-                            insert_index,
-                            segment,
-                            need_split, // shift timeline if we split
+                            split_segment_index,
+                            split_time,
                         )));
 
-                        let execute_result = state
-                            .history_manager
-                            .execute(&mut state.tracks_manager, Box::new(batch_command))?;
-
-                        // Determine segment index after insertion
-                        // If we split, the right split part will be at insert_index + 1 after our insert
-                        // So our inserted segment is at insert_index
-                        let segment_index = insert_index;
-                        let segment_uuid = state
-                            .tracks_manager
-                            .get(track_index)
-                            .and_then(|t| t.segments().get(segment_index).map(|s| s.uuid.clone()))
-                            .unwrap_or_default();
-
-                        return Ok((execute_result, track_index, segment_index, segment_uuid));
-                    }
+                        batch_command.add_extra_affected_segment(
+                            AffectedSegment::with_both_thumbnails(
+                                track_index,
+                                split_segment_index, // 被分割的左边
+                            ),
+                        );
 
-                    let tracks = Track::new(&metadata.path)
-                        .map_err(|e| video_editor::Error::InvalidConfig(e.to_string()))?;
+                        batch_command.add_extra_affected_segment(
+                            AffectedSegment::with_both_thumbnails(
+                                track_index,
+                                split_segment_index + 2, // 被分割的右边
+                            ),
+                        );
+                    }
 
-                    let mut batch_command = BatchCommand::new(format!("Add {} to track", name));
+                    batch_command.add_command(Box::new(InsertSegmentAtTimeCommand::new(
+                        track_index,
+                        insert_index,
+                        segment.clone(),
+                        need_split, // shift inside this command only when splitting
+                    )));
 
-                    for track in tracks {
-                        let command = AddTrackCommand::new(track);
-                        batch_command.add_command(Box::new(command));
+                    // When inserting at a gap, shift all subsequent segments
+                    if !need_split && insert_index < track.segments_count() {
+                        batch_command.add_command(Box::new(ShiftSubsequentSegmentsCommand::new(
+                            track_index,
+                            insert_index + 1, // Shift segments after the newly inserted one
+                            segment_duration,
+                        )));
                     }
 
                     let execute_result = state
                         .history_manager
                         .execute(&mut state.tracks_manager, Box::new(batch_command))?;
 
-                    // Find the inserted track index by looking for the main track type
-                    // based on metadata. Track::new creates tracks with matching types.
-                    let (track_index, segment_index, segment_uuid) = {
-                        let track_index = state
-                            .tracks_manager
-                            .iter()
-                            .enumerate()
-                            .find(|(_, t)| track_matches_metadata_type(t, &metadata))
-                            .map(|(i, _)| i)
-                            .unwrap_or_else(|| state.tracks_manager.len().saturating_sub(1));
-
-                        let track = state.tracks_manager.get(track_index).unwrap();
-                        let segment_index = track.segments_count() - 1;
-                        let segment_uuid = track
-                            .segments()
-                            .last()
-                            .map(|s| s.uuid.clone())
-                            .unwrap_or_default();
-
-                        (track_index, segment_index, segment_uuid)
-                    };
+                    return Ok(execute_result);
+                }
 
-                    Ok((execute_result, track_index, segment_index, segment_uuid))
-                });
+                let tracks = Track::new(&metadata.path)
+                    .map_err(|e| video_editor::Error::InvalidConfig(e.to_string()))?;
 
-            match result {
-                Ok((execute_result, inserted_track_index, segment_index, segment_uuid)) => {
-                    let tracks_manager = with_history_manager(|state| state.tracks_manager.clone());
+                let mut batch_command = BatchCommand::new(format!("Add {} to track", name));
+
+                for track in tracks {
+                    let command = AddTrackCommand::new(track);
+                    batch_command.add_command(Box::new(command));
+                }
+
+                let execute_result = state
+                    .history_manager
+                    .execute(&mut state.tracks_manager, Box::new(batch_command))?;
 
+                Ok(execute_result)
+            });
+
+            match result {
+                Ok(execute_result) => {
                     sync_manager_to_ui(&ui);
 
-                    if execute_result.affected_segments.tracks_changed
+                    let needs_preview_refresh = execute_result.affected_segments.tracks_changed
                         && (matches!(metadata.get_type(), MetadataType::Video)
-                            || metadata.is_image())
-                    {
-                        refresh_preview(&ui);
-                    }
+                            || metadata.is_image());
 
-                    crate::toast_success!(ui, format!("Added {} to track", name));
+                    refresh_affected_segments(&ui, execute_result.affected_segments);
 
-                    // Load thumbnails and audio in background
-                    if matches!(metadata.get_type(), MetadataType::Video) || metadata.is_image() {
-                        for index in 0..2 {
-                            async_load_segment_thumbnail(
-                                ui.as_weak(),
-                                tracks_manager.clone(),
-                                inserted_track_index,
-                                segment_index,
-                                segment_uuid.clone(),
-                                index % 2 == 0,
-                            );
-                        }
+                    if needs_preview_refresh {
+                        refresh_preview(&ui);
                     }
 
-                    if matches!(metadata.get_type(), MetadataType::Video)
-                        || matches!(metadata.get_type(), MetadataType::Audio)
-                    {
-                        async_load_segment_audio(
-                            ui.as_weak(),
-                            tracks_manager.clone(),
-                            inserted_track_index,
-                            segment_index,
-                            segment_uuid,
-                        );
-                    }
+                    crate::toast_success!(ui, format!("Added {} to track", name));
                 }
                 Err(e) => crate::toast_warn!(ui, e.to_string()),
             }
diff --git a/wayshot/ui/base/icon.slint b/wayshot/ui/base/icon.slint
@@ -349,6 +349,7 @@ export global Icons {
     out property <image> move-to-end-light: @image-url("../images/icons/move-to-end-light.svg");
     out property <image> image-light: @image-url("../images/icons/image-light.svg");
     out property <image> grid-light: @image-url("../images/icons/grid-light.svg");
+    out property <image> grid-fill: @image-url("../images/icons/grid-fill.svg");
     out property <image> left-alignment-light: @image-url("../images/icons/left-alignment-light.svg");
 
     out property <image> landing-account: @image-url("../images/landing/landing-account.svg");
@@ -363,4 +364,5 @@ export global Icons {
     out property <image> metamask-pay: @image-url("../images/png/metamask-pay.png");
     out property <image> wechat-pay: @image-url("../images/png/wechat-pay.png");
     out property <image> brand: @image-url("../images/png/brand.png");
-}
+}
+
diff --git a/wayshot/ui/images/icons/grid-fill.svg b/wayshot/ui/images/icons/grid-fill.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1774631669828" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2478" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M643.072 380.928v262.144H380.928V380.928h262.144z m65.536 0h196.608v262.144H708.608V380.928z m-65.536 524.288H380.928V708.608h262.144v196.608z m65.536 0V708.608h196.608v196.608H708.608z m-65.536-786.432v196.608H380.928V118.784h262.144z m65.536 0h196.608v196.608H708.608V118.784zM315.392 380.928v262.144H118.784V380.928h196.608z m0 524.288H118.784V708.608h196.608v196.608z m0-786.432v196.608H118.784V118.784h196.608z" p-id="2479"></path></svg>
diff --git a/wayshot/ui/panel/desktop/video-editor/preview/preview.slint b/wayshot/ui/panel/desktop/video-editor/preview/preview.slint
@@ -112,8 +112,8 @@ component Btns inherits Rectangle {
         }
 
         grid-btn := IconBtn {
-            icon: Icons.grid-light;
-            icon-size: Theme.icon-size * 0.9;
+            icon: Icons.grid-fill;
+            // icon-size: Theme.icon-size * 0.9;
 
             clicked => {
                 // todo

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,8 @@ component Btns inherits Rectangle {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`grid-btn := IconBtn {`
`115`		`- icon: Icons.grid-light;`
`116`		`- icon-size: Theme.icon-size * 0.9;`
	`115`	`+ icon: Icons.grid-fill;`
	`116`	`+ // icon-size: Theme.icon-size * 0.9;`
`117`	`117`
`118`	`118`	`clicked => {`
`119`	`119`	`// todo`