[*] refactor: video-editor

Author: heng30

Cargo.lock

@@ -120,11 +120,11 @@ impl AudioRecorder {
 
         let mut result = Vec::new();
         for device in devices {
-            if let Ok(desc) = device.description()
+            if let Ok(id) = device.id()
                 && let Ok(config) = device.default_input_config()
             {
                 result.push(AudioDeviceInfo {
-                    name: desc.name().to_string(),
+                    name: id.to_string(),
                     channels: config.channels(),
                     sample_rate: config.sample_rate(),
                 });

lib/record-audio/src/lib.rs

@@ -39,6 +39,7 @@ mp4-player.workspace = true
 downloader.workspace = true
 audio-utils.workspace = true
 video-utils.workspace = true
+record-audio.workspace = true
 image-effect.workspace = true
 video-editor.workspace = true
 native-dialog.workspace = true

wayshot/Cargo.toml

@@ -9,6 +9,7 @@ use crate::slint_generatedAppWindow::{
     VideoEditorPreferenceConfig as UIVideoEditorPreferenceConfig,
     VideoEditorPreferenceTrackConfig as UIVideoEditorPreferenceTrackConfig,
     VideoEditorPreviewConfig as UIVideoEditorPreviewConfig,
+    VideoEditorRecordAudioConfig as UIVideoEditorRecordAudioConfig,
     VideoEditorTrackType as UIVideoEditorTrackType, VideoEditorUIState as UIVideoEditorUIState,
 };
 use derivative::Derivative;
@@ -127,3 +128,12 @@ pub struct VideoEditorExportAudioConfig {
     pub channels: UIAudioChannels,
     pub sample_rate: UIAudioSampleRate,
 }
+
+#[derive(Serialize, Deserialize, Debug, Clone, Derivative, SlintFromConvert)]
+#[derivative(Default)]
+#[from("UIVideoEditorRecordAudioConfig")]
+#[serde(default)]
+pub struct VideoEditorRecordAudioConfig {
+    pub save_dir: String,
+    pub device: String,
+}

wayshot/src/logic/video_editor/common_type.rs

@@ -39,55 +39,59 @@ fn video_editor_playlist_item_import(ui: &AppWindow) {
             return;
         };
 
-        let playlist_item = {
-            let mut state = PROJECT_STATE.lock().unwrap();
-            if let Some(ref mut s) = *state {
-                match s.playlist.add_file(file_path.clone()) {
-                    Ok(index) => s.playlist.get_item(index).cloned(),
-                    Err(e) => {
-                        toast::async_toast_warn(
-                            ui_weak.clone(),
-                            format!("Failed to add to playlist: {}", e),
-                        );
-                        return;
-                    }
-                }
-            } else {
-                None
-            }
-        };
-
-        let Some(playlist_item) = playlist_item else {
-            toast::async_toast_warn(ui_weak.clone(), "Failed to get playlist item".to_string());
-            return;
-        };
+        import_file_to_playlist(ui_weak, file_path).await;
+    });
+}
 
-        // Preload audio cache for video/audio files
-        let metadata = get_metadata(&file_path).ok();
-        if let Some(ref metadata) = metadata
-            && let Some(audio_meta) = metadata.audios.first()
-        {
-            let file_path = file_path.clone();
-            let audio_meta = audio_meta.clone();
-            tokio::task::spawn_blocking(move || {
-                let cache = get_global_audio_display_cache();
-                if let Err(e) = cache.load_and_cache(&file_path, audio_meta.index, &audio_meta) {
-                    log::warn!(
-                        "Failed to preload audio cache for {}: {:?}",
-                        file_path.display(),
-                        e
+pub async fn import_file_to_playlist(ui_weak: Weak<AppWindow>, file_path: PathBuf) {
+    let playlist_item = {
+        let mut state = PROJECT_STATE.lock().unwrap();
+        if let Some(ref mut s) = *state {
+            match s.playlist.add_file(file_path.clone()) {
+                Ok(index) => s.playlist.get_item(index).cloned(),
+                Err(e) => {
+                    toast::async_toast_warn(
+                        ui_weak.clone(),
+                        format!("Failed to add to playlist: {}", e),
                     );
-                } else {
-                    log::debug!("Preloaded audio cache for {}", file_path.display());
+                    return;
                 }
-            });
+            }
+        } else {
+            None
         }
+    };
 
-        _ = ui_weak.upgrade_in_event_loop(move |ui| {
-            let item: UIVideoEditorPlaylistItem = playlist_item.into();
-            crate::toast_success!(ui, format!("Imported: {}", item.name));
-            store_video_editor_playlist!(ui).push(item);
+    let Some(playlist_item) = playlist_item else {
+        toast::async_toast_warn(ui_weak.clone(), "Failed to get playlist item".to_string());
+        return;
+    };
+
+    // Preload audio cache for video/audio files
+    let metadata = get_metadata(&file_path).ok();
+    if let Some(ref metadata) = metadata
+        && let Some(audio_meta) = metadata.audios.first()
+    {
+        let file_path = file_path.clone();
+        let audio_meta = audio_meta.clone();
+        tokio::task::spawn_blocking(move || {
+            let cache = get_global_audio_display_cache();
+            if let Err(e) = cache.load_and_cache(&file_path, audio_meta.index, &audio_meta) {
+                log::warn!(
+                    "Failed to preload audio cache for {}: {:?}",
+                    file_path.display(),
+                    e
+                );
+            } else {
+                log::debug!("Preloaded audio cache for {}", file_path.display());
+            }
         });
+    }
+
+    _ = ui_weak.upgrade_in_event_loop(move |ui| {
+        let item: UIVideoEditorPlaylistItem = playlist_item.into();
+        crate::toast_success!(ui, format!("Imported: {}", item.name));
+        store_video_editor_playlist!(ui).push(item);
     });
 }