[*] refactor

Author: heng30

lib/video-editor/src/font.rs

@@ -17,8 +17,8 @@ pub fn get_fonts_info() -> Result<Vec<(String, PathBuf)>> {
         }
     }
 
-    fonts.sort_by(|a, b| a.0.cmp(&b.0));
-    fonts.dedup_by(|a, b| a.0 == b.0);
+    fonts.sort_by(|a, b| a.1.cmp(&b.1));
+    fonts.dedup_by(|a, b| a.1 == b.1);
 
     Ok(fonts)
 }

todo.md

@@ -1,16 +1,12 @@
 ## 问题
 - subtitle需要重新设计
 
-- font 列表toggle实现逻辑过于复杂
-- font 搜索功能实现有问题，列表条目丢失
-- 刷新后导入条目丢失
-- fly in滤镜应该重构成和transform一样的模式
-- chorme-key 路径参数面板无法显示
-
-- moving filter参数面板暂停时会恢复默认值
-- color picker弹出时需要设置现有的颜色
+- fly in preview显示时机有问题
+- fly in filter参数面板暂停时会恢复默认值
 
 ## 待验证
+- color picker弹出时需要设置现有的颜色
+- font 列表显示有问题，条目变少了。刷新时有275条，但是显示时却只有254条
 
 - 视频轨道分离字幕
 

wayshot/src/db.rs

@@ -1,6 +1,7 @@
 use crate::slint_generatedAppWindow::{
-    FileType as UIFileType, FontEntry as UIFontEntry, HistoryEntry as UIHistoryEntry,
-    SettingPlayer as UISettingPlayer, Subtitle as UISubtitle, Transcribe as UITranscribe,
+    FileType as UIFileType, FontEntry as UIFontEntry, FontSource as UIFontSource,
+    HistoryEntry as UIHistoryEntry, SettingPlayer as UISettingPlayer, Subtitle as UISubtitle,
+    Transcribe as UITranscribe,
 };
 use pmacro::SlintFromConvert;
 use serde::{Deserialize, Serialize};
@@ -222,4 +223,14 @@ pub struct FontEntry {
     pub family: String,
     pub path: String,
     pub marked: bool,
+    pub source: FontSource,
 }
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default)]
+pub enum FontSource {
+    #[default]
+    System,
+    Imported,
+}
+
+crate::impl_c_like_enum_convert!(UIFontSource, FontSource, System, Imported);

wayshot/src/logic/video_editor/conversion.rs

@@ -2,8 +2,8 @@ use super::command::with_history_manager;
 use crate::slint_generatedAppWindow::{
     AudioChannels as UIAudioChannels, AudioFormat as UIAudioFormat,
     AudioSampleRate as UIAudioSampleRate, CropDetail as UICropDetail, FilterType as UIFilterType,
-    Fps as UIFps, MediaType as UIMediaType, Resolution as UIResolution,
-    SegmentFilter as UISegmentFilter, SubtitleType as UISubtitleType,
+    FlyInDetail as UIFlyInDetail, Fps as UIFps, MediaType as UIMediaType,
+    Resolution as UIResolution, SegmentFilter as UISegmentFilter, SubtitleType as UISubtitleType,
     TransformDetail as UITransformDetail, VideoEditorLayerImage as UIVideoEditorLayerImage,
     VideoEditorPlaylistItem as UIVideoEditorPlaylistItem,
     VideoEditorPreviewConfig as UIVideoEditorPreviewConfig,
@@ -39,9 +39,9 @@ use video_editor::{
             OutlineWidthFilter, PaddingFilter, PrimaryColorFilter,
         },
         video::{
-            BorderFilter, ChromaKeyFilter, CropFilter,
-            FadeInFilter as VideoFadeInFilter, FadeOutFilter as VideoFadeOutFilter, FlipFilter,
-            OpacityFilter, SlideFilter, TransformFilter, WipeFilter, ZoomFilter,
+            BorderFilter, ChromaKeyFilter, CropFilter, FadeInFilter as VideoFadeInFilter,
+            FadeOutFilter as VideoFadeOutFilter, FlipFilter, FlyInFilter, OpacityFilter,
+            SlideFilter, TransformFilter, WipeFilter, ZoomFilter,
         },
     },
     media::{MediaItem, media_type::MediaType, playlist::PlaylistItem},
@@ -745,6 +745,28 @@ pub fn layer_frame_to_ui(layer: &LayerFrame) -> Option<UIVideoEditorLayerImage>
         })
         .unwrap_or_else(|| ZoomFilter::default().into());
 
+    let fly_in: UIFlyInDetail = layer
+        .from_segment
+        .as_ref()
+        .and_then(|(_, segment)| {
+            if is_image_track {
+                segment
+                    .image_filters
+                    .iter()
+                    .find(|f| f.inner.name() == FlyInFilter::NAME)
+                    .and_then(|f| f.inner.as_any().downcast_ref::<FlyInFilter>())
+                    .map(|t| t.clone().into())
+            } else {
+                segment
+                    .video_filters
+                    .iter()
+                    .find(|f| f.inner.name() == FlyInFilter::NAME)
+                    .and_then(|f| f.inner.as_any().downcast_ref::<FlyInFilter>())
+                    .map(|t| t.clone().into())
+            }
+        })
+        .unwrap_or_else(|| FlyInFilter::default().into());
+
     Some(UIVideoEditorLayerImage {
         track_index: layer.track_index as i32,
         segment_index: layer
@@ -757,6 +779,7 @@ pub fn layer_frame_to_ui(layer: &LayerFrame) -> Option<UIVideoEditorLayerImage>
         transform,
         crop,
         zoom,
+        fly_in,
     })
 }
 

wayshot/src/logic/video_editor/font.rs

@@ -1,14 +1,13 @@
 use crate::{
-    db::{FONT_TABLE as DB_TABLE, FontEntry},
+    db::{FONT_TABLE as DB_TABLE, FontEntry, FontSource},
     db_select_all, db_update,
     logic::{toast, tr::tr, video_editor::playlist::picker_files},
     logic_cb,
     slint_generatedAppWindow::{AppWindow, FontEntry as UIFontEntry},
 };
 use once_cell::sync::Lazy;
 use slint::{ComponentHandle, Model, SharedString, VecModel, Weak};
-use std::{collections::HashSet, path::PathBuf};
-use tokio::sync::RwLock;
+use std::{collections::HashSet, path::PathBuf, sync::RwLock};
 use video_editor::font::{get_font_family_from_file, get_fonts_info};
 
 db_update!(DB_TABLE, FontEntry);
@@ -39,11 +38,19 @@ pub fn init(ui: &AppWindow) {
 fn init_font_dialog(ui: &AppWindow) {
     let ui_weak = ui.as_weak();
     tokio::spawn(async move {
-        let db_fonts = db_select_all!(DB_TABLE, FontEntry);
-        if db_fonts.is_empty() {
-            refresh_font_entries_impl(ui_weak.clone()).await;
+        let cached_fonts = {
+            let cache = FONT_CACHE.read().unwrap();
+            if cache.is_empty() {
+                None
+            } else {
+                Some(cache.clone())
+            }
+        };
+
+        if let Some(fonts) = cached_fonts {
+            sync_fonts_to_ui(ui_weak, fonts).await;
         } else {
-            sync_fonts_to_ui(ui_weak, db_fonts).await;
+            refresh_font_entries_impl(ui_weak).await;
         }
     });
 }
@@ -56,18 +63,19 @@ fn refresh_font_entries(ui: &AppWindow) {
 }
 
 async fn refresh_font_entries_impl(ui_weak: Weak<AppWindow>) {
-    let marked_fonts: HashSet<String> = {
-        let db_fonts = db_select_all!(DB_TABLE, FontEntry);
-        db_fonts
-            .into_iter()
-            .filter(|f| f.marked)
-            .map(|f| f.path)
-            .collect()
-    };
+    let existing_fonts = db_select_all!(DB_TABLE, FontEntry);
 
-    if let Err(e) = sqldb::entry::delete_all(DB_TABLE).await {
-        log::warn!("Failed to clear font table: {}", e);
-    }
+    let imported_fonts: Vec<FontEntry> = existing_fonts
+        .iter()
+        .filter(|f| f.source == FontSource::Imported)
+        .cloned()
+        .collect();
+
+    let marked_paths: HashSet<String> = existing_fonts
+        .iter()
+        .filter(|f| f.marked)
+        .map(|f| f.path.clone())
+        .collect();
 
     let system_fonts = match get_fonts_info() {
         Ok(fonts) => fonts,
@@ -77,16 +85,22 @@ async fn refresh_font_entries_impl(ui_weak: Weak<AppWindow>) {
         }
     };
 
+    if let Err(e) = sqldb::entry::delete_all(DB_TABLE).await {
+        log::warn!("Failed to clear font table: {}", e);
+    }
+
     let mut font_entries: Vec<FontEntry> = Vec::new();
+
     for (family, path) in system_fonts {
         let path_str = path.to_string_lossy().to_string();
-        let marked = marked_fonts.contains(&path_str);
+        let marked = marked_paths.contains(&path_str);
 
         let entry = FontEntry {
             id: path_str.clone(),
             family,
             path: path_str,
             marked,
+            source: FontSource::System,
         };
 
         let data = serde_json::to_string(&entry).expect("Serialize font entry");
@@ -97,13 +111,22 @@ async fn refresh_font_entries_impl(ui_weak: Weak<AppWindow>) {
         font_entries.push(entry);
     }
 
+    for entry in imported_fonts {
+        let data = serde_json::to_string(&entry).expect("Serialize font entry");
+        if let Err(e) = sqldb::entry::insert(DB_TABLE, entry.id.as_str(), &data).await {
+            log::warn!("Failed to insert imported font {}: {}", entry.family, e);
+        }
+        font_entries.push(entry);
+    }
+
+    {
+        let mut cache = FONT_CACHE.write().unwrap();
+        *cache = font_entries.clone();
+    }
     sync_fonts_to_ui(ui_weak, font_entries).await;
 }
 
 async fn sync_fonts_to_ui(ui_weak: Weak<AppWindow>, mut fonts: Vec<FontEntry>) {
-    let fonts_for_cache = fonts.clone();
-    *FONT_CACHE.write().await = fonts_for_cache;
-
     fonts.sort_by(|a, b| b.marked.cmp(&a.marked));
     let ui_fonts: Vec<UIFontEntry> = fonts.into_iter().map(|f| f.into()).collect();
 
@@ -133,9 +156,11 @@ fn import_font_files(ui: &AppWindow) {
         }
 
         if !imported_fonts.is_empty() {
-            let mut cache = FONT_CACHE.write().await;
-            for font in &imported_fonts {
-                cache.push(font.clone().into());
+            {
+                let mut cache = FONT_CACHE.write().unwrap();
+                for font in &imported_fonts {
+                    cache.push(font.clone().into());
+                }
             }
 
             _ = ui_weak.upgrade_in_event_loop(move |ui| {
@@ -166,6 +191,7 @@ async fn import_font_to_db(ui_weak: Weak<AppWindow>, file_path: PathBuf) -> Opti
         family,
         path: path_str,
         marked: true,
+        source: FontSource::Imported,
     };
 
     let data = serde_json::to_string(&entry).expect("Serialize font entry");
@@ -190,6 +216,13 @@ fn toggle_font_marked(ui: &AppWindow, index: i32) {
         font_info.marked = !font_info.marked;
         db_update(ui.as_weak(), font_info.clone().into());
 
+        {
+            let mut cache = FONT_CACHE.write().unwrap();
+            if let Some(entry) = cache.iter_mut().find(|e| e.id == font_info.id.as_str()) {
+                entry.marked = font_info.marked;
+            }
+        }
+
         let mut fonts: Vec<UIFontEntry> = store_font_entries!(ui).iter().collect();
         fonts[idx] = font_info;
         fonts.sort_by(|a, b| b.marked.cmp(&a.marked));
@@ -202,7 +235,7 @@ fn search_font_entries(ui: &AppWindow, text: SharedString) {
     let text = text.to_string();
 
     tokio::spawn(async move {
-        let cache = FONT_CACHE.read().await.clone();
+        let cache = FONT_CACHE.read().unwrap().clone();
 
         let filtered = if text.is_empty() {
             cache

wayshot/ui/panel/desktop/font-dialog.slint

@@ -44,8 +44,8 @@ component HeadBar inherits HorizontalLayout {
 
                 key-pressed(event) => {
                     if (event.text == Key.Escape) {
-                        Logic.search-font-entries("");
                         show-search-bar = false;
+                        Logic.refresh-font-entries();
                     }
                 }
 
@@ -71,6 +71,9 @@ component HeadBar inherits HorizontalLayout {
 
                     clicked => {
                         show-search-bar = !show-search-bar;
+                        if (!show-search-bar) {
+                            Logic.refresh-font-entries();
+                        }
                     }
                 }
 
@@ -114,7 +117,6 @@ component FontItem inherits Rectangle {
 
         clicked => {
             Store.selected-font-entry = entry;
-            VEFilter.selected-font-path = entry.path;
             Store.is-show-font-dialog = false;
         }
     }

wayshot/ui/panel/desktop/video-editor/filter.slint

@@ -273,12 +273,7 @@ export global VEFilter {
     // 用于创建预设滤镜时，临时存储选中的滤镜
     in-out property <[PresetFilter]> cache-preset-filters: [];
 
-    in-out property <float> preview-locate-layer-move-to-x: 0.6;
-    in-out property <float> preview-locate-layer-move-to-y: 0.6;
-
     in-out property <int> right-panel-selected-index;
-    in-out property <string> selected-font-path;
-
     in-out property <FontStyle> font-style;
 
     callback up-filter(index: int);