[*] refactor: video-editor

Author: heng30

lib/video-editor/src/project/project.rs

@@ -414,6 +414,16 @@ pub struct ManagerData {
     pub inner: Option<Manager>,
 }
 
+impl ManagerData {
+    pub fn new(manager: Manager) -> Self {
+        Self {
+            version: CURRENT_PROJECT_VERSION,
+            created_at: chrono::Utc::now(),
+            inner: Some(manager),
+        }
+    }
+}
+
 impl TryFrom<&ProjectFile> for ManagerData {
     type Error = crate::Error;
 

lib/video-editor/src/project/recent.rs

@@ -1,9 +1,7 @@
 use crate::Result;
 use serde::{Deserialize, Serialize};
 use std::{
-    collections::VecDeque,
     fs,
-    io::{BufReader, BufWriter},
     path::PathBuf,
     time::{Duration, SystemTime},
 };
@@ -56,64 +54,42 @@ impl RecentFile {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct RecentFilesManager {
-    recent_files: VecDeque<RecentFile>,
+    recent_files: Vec<RecentFile>,
     max_files: usize,
-    config_path: PathBuf,
 }
 
 impl RecentFilesManager {
-    pub fn new(config_path: PathBuf, max_files: usize) -> Self {
+    pub fn new(max_files: usize) -> Self {
         Self {
-            recent_files: VecDeque::new(),
+            recent_files: Vec::new(),
             max_files,
-            config_path,
         }
     }
 
-    pub fn load(&mut self) -> Result<()> {
-        if !self.config_path.exists() {
-            return Ok(());
-        }
-
-        let file = fs::File::open(&self.config_path)?;
-        let reader = BufReader::new(file);
-        let files: Vec<RecentFile> = serde_json::from_reader(reader)?;
-
-        self.recent_files = files.into_iter().collect();
-        Ok(())
+    pub fn to_json(&self) -> Result<String> {
+        Ok(serde_json::to_string_pretty(self)?)
     }
 
-    pub fn save(&self) -> Result<()> {
-        if let Some(parent) = self.config_path.parent() {
-            fs::create_dir_all(parent)?;
-        }
-
-        let file = fs::File::create(&self.config_path)?;
-        let writer = BufWriter::new(file);
-        let files: Vec<&RecentFile> = self.recent_files.iter().collect();
-        serde_json::to_writer_pretty(writer, &files)?;
-        Ok(())
+    pub fn from_json(json: &str) -> Result<Self> {
+        Ok(serde_json::from_str(json)?)
     }
 
     pub fn add_file(&mut self, path: PathBuf) -> Result<()> {
         self.recent_files.retain(|f| f.path != path);
         let recent_file = RecentFile::new(path.clone())?;
-        self.recent_files.push_front(recent_file);
+        self.recent_files.insert(0, recent_file);
 
         while self.recent_files.len() > self.max_files {
-            self.recent_files.pop_back();
+            self.recent_files.pop();
         }
 
-        self.save()?;
         Ok(())
     }
 
-    pub fn remove_file(&mut self, path: &PathBuf) -> Result<()> {
+    pub fn remove_file(&mut self, path: &PathBuf) {
         self.recent_files.retain(|f| f.path != *path);
-        self.save()?;
-        Ok(())
     }
 
     pub fn get_recent_files(&self) -> Vec<&RecentFile> {
@@ -124,16 +100,12 @@ impl RecentFilesManager {
         self.recent_files.iter().filter(|f| f.exists()).collect()
     }
 
-    pub fn clear_all(&mut self) -> Result<()> {
+    pub fn clear_all(&mut self) {
         self.recent_files.clear();
-        self.save()?;
-        Ok(())
     }
 
-    pub fn clear_missing(&mut self) -> Result<()> {
+    pub fn clear_missing(&mut self) {
         self.recent_files.retain(|f| f.exists());
-        self.save()?;
-        Ok(())
     }
 
     pub fn file_count(&self) -> usize {
@@ -147,7 +119,7 @@ impl RecentFilesManager {
     pub fn set_max_files(&mut self, max: usize) {
         self.max_files = max;
         while self.recent_files.len() > self.max_files {
-            self.recent_files.pop_back();
+            self.recent_files.pop();
         }
     }
 }

wayshot/src/logic/video_editor/common_type.rs

@@ -1,49 +1,13 @@
-//! # Common Types for Video Editor UI
-//!
-//! This module provides type conversions between Slint UI types and Rust-native types.
-//!
-//! ## Design Philosophy
-//!
-//! **These types are NOT duplicates** of `video_editor` library types. They serve as an
-//! **adaptation layer** with specific purposes:
-//!
-//! 1. **UI Bridge**: Convert between Slint UI types (which require special serialization)
-//!    and Rust-native types for backend logic
-//!
-//! 2. **Serialization Support**: Provide `Serialize`/`Deserialize` for project persistence
-//!    through serde, while UI types are Slint-specific and cannot be serialized directly
-//!
-//! 3. **UI-Specific Fields**: Include UI-only data like thumbnails (`Image`), audio samples,
-//!    and screenshots that don't belong in the core `video_editor` library
-//!
-//! ## Type Mapping
-//!
-//! - `VideoEditorTracksManager` ↔ `video_editor::tracks::manager::Manager`
-//! - `VideoEditorTrack` ↔ `video_editor::tracks::track::Track`
-//! - `VideoEditorTrackSegment` ↔ `video_editor::tracks::segment::Segment`
-//!
-//! See `conversion.rs` for the actual conversion logic.
-//!
-//! ## Priority: video_editor Library First
-//!
-//! Core video editing logic uses `video_editor` library types directly.
-//! These common types are ONLY used for:
-//! - UI state serialization/deserialization
-//! - Temporary data transfer between UI and backend
-//! - UI-specific features (thumbnails, screenshots, audio visualization)
-
 use super::project::UI_STATE_ID;
 use crate::slint_generatedAppWindow::{
     AudioChannels as UIAudioChannels, AudioFormat as UIAudioFormat,
     AudioSampleRate as UIAudioSampleRate, Fps as UIFps, MediaType as UIMediaType,
-    RecentEntry as UIRecentEntry, Resolution as UIResolution, SegmentFilter as UISegmentFilter,
-    SubtitleType as UISubtitleType, VideoEditorExportAudioConfig as UIVideoEditorExportAudioConfig,
+    Resolution as UIResolution, SegmentFilter as UISegmentFilter, SubtitleType as UISubtitleType,
+    VideoEditorExportAudioConfig as UIVideoEditorExportAudioConfig,
     VideoEditorExportQueueItem as UIVideoEditorExportQueueItem,
     VideoEditorExportVideoConfig as UIVideoEditorExportVideoConfig,
-    VideoEditorFilter as UIVideoEditorFilter,
-    VideoEditorNewProjectConfig as UIVideoEditorNewProjectConfig,
-    VideoEditorPlaylistItem as UIVideoEditorPlaylistItem,
-    VideoEditorPreviewConfig as UIVideoEditorPreviewConfig,
+    VideoEditorFilter as UIVideoEditorFilter, VideoEditorPlaylistItem as UIVideoEditorPlaylistItem,
+    VideoEditorRecentEntry as UIVideoEditorRecentEntry,
     VideoEditorSubtitle as UIVideoEditorSubtitle, VideoEditorTrack as UIVideoEditorTrack,
     VideoEditorTrackSegment as UIVideoEditorTrackSegment,
     VideoEditorTrackType as UIVideoEditorTrackType,
@@ -54,11 +18,13 @@ use derivative::Derivative;
 use pmacro::SlintFromConvert;
 use serde::{Deserialize, Serialize};
 use slint::{Image, Model};
+use std::time::SystemTime;
+use video_editor::project::recent::RecentFile;
 
-crate::impl_slint_enum_serde!(UIVideoEditorTrackType, Audio, Video, Subtitle, Overlay);
 crate::impl_slint_enum_serde!(UISubtitleType, Srt, Vtt, Ass);
-crate::impl_slint_enum_serde!(UIMediaType, Video, Audio, Image, Subtitle, Text);
 crate::impl_slint_enum_serde!(UIAudioFormat, Aac, Mp3, Ogg, Wav, Flac);
+crate::impl_slint_enum_serde!(UIMediaType, Video, Audio, Image, Subtitle, Text);
+crate::impl_slint_enum_serde!(UIVideoEditorTrackType, Audio, Video, Subtitle, Overlay);
 crate::impl_slint_enum_serde!(UIAudioChannels, Mono, Stereo);
 crate::impl_slint_enum_serde!(
     UIAudioSampleRate,
@@ -190,31 +156,6 @@ pub struct VideoEditorTracksManager {
     pub tracks: Vec<VideoEditorTrack>,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, Derivative, SlintFromConvert)]
-#[derivative(Default)]
-#[from("UIVideoEditorPreviewConfig")]
-#[serde(default)]
-pub struct VideoEditorPreviewConfig {
-    #[from("fps")]
-    pub fps: UIFps,
-    #[from("resolution")]
-    pub resolution: UIResolution,
-    #[from("channels")]
-    pub channels: UIAudioChannels,
-    #[from("sample_rate")]
-    pub sample_rate: UIAudioSampleRate,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Derivative, SlintFromConvert)]
-#[derivative(Default)]
-#[from("UIVideoEditorNewProjectConfig")]
-#[serde(default)]
-pub struct VideoEditorNewProjectConfig {
-    pub name: String,
-    #[from("preview_config")]
-    pub preview_config: VideoEditorPreviewConfig,
-}
-
 #[derive(Serialize, Deserialize, Debug, Clone, Derivative, SlintFromConvert)]
 #[derivative(Default)]
 #[from("UIVideoEditorPlaylistItem")]
@@ -292,12 +233,21 @@ pub struct VideoEditorSubtitle {
     pub subtitle: String,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, Derivative, SlintFromConvert)]
-#[derivative(Default)]
-#[from("UIRecentEntry")]
-#[serde(default)]
-pub struct RecentEntry {
-    pub name: String,
-    pub path: String,
-    pub modify_at: String,
+impl From<RecentFile> for UIVideoEditorRecentEntry {
+    fn from(rf: RecentFile) -> Self {
+        let modified_at = if let Ok(modified) =
+            rf.last_modified.duration_since(SystemTime::UNIX_EPOCH)
+            && let Some(datetime) = chrono::DateTime::from_timestamp(modified.as_secs() as i64, 0)
+        {
+            datetime.format("%Y-%m-%d").to_string().into()
+        } else {
+            "--:--:--".to_string().into()
+        };
+
+        UIVideoEditorRecentEntry {
+            name: rf.name.into(),
+            path: rf.path.to_string_lossy().to_string().into(),
+            modified_at,
+        }
+    }
 }