[-] remove unused codes and add open crate for opening output mp4 file

Author: heng30

Cargo.lock

@@ -85,6 +85,7 @@ platform-dirs = "0.3"
 yuv = "0.8"
 mp4 = "0.14"
 x264 = "0.5"
+open = "5.3"
 cpal = "0.16"
 hound = "3.5"
 which = "8.0"

Cargo.toml

@@ -12,13 +12,12 @@ use mp4m::{
     AudioConfig, AudioProcessor, AudioProcessorConfigBuilder, Mp4Processor,
     Mp4ProcessorConfigBuilder, OutputDestination, VideoConfig, VideoFrameType,
 };
-use once_cell::sync::OnceCell;
-use screen_capture::{Capture, CaptureStreamConfig, ScreenCapture, ScreenCaptureError};
+use screen_capture::{Capture, CaptureStreamConfig, ScreenCapture};
 use spin_sleep::SpinSleeper;
 use std::{
     path::PathBuf,
     sync::{
-        Arc, Mutex,
+        Arc,
         atomic::{AtomicBool, AtomicU64, Ordering},
     },
     thread::{self, JoinHandle},
@@ -32,8 +31,6 @@ const USER_CHANNEL_SIZE: usize = 64;
 const ENCODER_WORKER_CHANNEL_SIZE: usize = 128;
 const AUDIO_MIXER_CHANNEL_SIZE: usize = 1024;
 
-static CAPTURE_MEAN_TIME: OnceCell<Mutex<Result<Duration, ScreenCaptureError>>> = OnceCell::new();
-
 #[derive(Setters)]
 #[setters(prefix = "with_")]
 #[setters(generate = false)]
@@ -711,41 +708,12 @@ impl RecordingSession {
         self.speaker_level_receiver.clone()
     }
 
-    pub fn init_capture_mean_time(
-        screen_name: &str,
-        screen_capturer: &mut impl ScreenCapture,
-    ) -> Result<(), RecorderError> {
-        let mean_time = CAPTURE_MEAN_TIME.get_or_init(|| {
-            let mean_time = screen_capturer.capture_mean_time(screen_name, 10);
-            Mutex::new(mean_time)
-        });
-
-        let mean_ms = mean_time
-            .lock()
-            .unwrap()
-            .clone()
-            .map_err(|e| RecorderError::CaptureFailed(e))?
-            .as_millis() as f64;
-
-        log::info!("capture mean time: {mean_ms:.2?}ms");
-
-        Ok(())
-    }
-
     fn evaluate_need_threads(
         &self,
         screen_capturer: &mut impl ScreenCapture,
     ) -> Result<u32, RecorderError> {
-        let mean_time = CAPTURE_MEAN_TIME.get_or_init(|| {
-            let mean_time = screen_capturer.capture_mean_time(&self.config.screen_name, 10);
-            Mutex::new(mean_time)
-        });
-
-        let mean_ms = mean_time
-            .lock()
-            .unwrap()
-            .clone()
-            .map_err(|e| RecorderError::CaptureFailed(e))?
+        let mean_ms = screen_capturer
+            .capture_mean_time(&self.config.screen_name, 3)?
             .as_millis() as f64;
 
         log::info!("capture mean time: {mean_ms:.2?}ms");

lib/recorder/src/recorder.rs

@@ -246,6 +246,7 @@ fn cn() -> &'static HashMap<&'static str, &'static str> {
             ("Disabled noise reduction", "禁用降噪功能"),
             ("Don't convert audio to mono", "不要将音频转换为单声道"),
             ("Enabled noise reduction", "启用降噪功能"),
+            ("Open file failed", "打开文件失败"),
         ])
     })
 }

tr-helper/src/tr.rs

@@ -36,6 +36,7 @@ serde = { workspace = true, features = ["serde_derive"] }
 cutil = { workspace = true, features = ["str", "time", "number", "fs"] }
 
 [target.'cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))'.dependencies]
+open.workspace = true
 tempfile.workspace = true
 recorder.workspace = true
 clipboard.workspace = true

wayshot/Cargo.toml

@@ -84,8 +84,6 @@ pub fn init(ui: &AppWindow) {
     logic_cb!(choose_save_dir, ui);
     logic_cb!(update_sources, ui, setting);
 
-    logic_cb!(screen_changed, ui, name);
-
     logic_cb!(audio_changed, ui, name, show_toast);
     logic_cb!(audio_gain_changed, ui, v);
 
@@ -94,6 +92,8 @@ pub fn init(ui: &AppWindow) {
 
     logic_cb!(start_recording, ui);
     logic_cb!(stop_recording, ui);
+
+    logic_cb!(open_file, ui, file);
 }
 
 fn inner_init(ui: &AppWindow) {
@@ -307,8 +307,6 @@ fn init_video(ui: &AppWindow) -> Result<()> {
         name: name.clone(),
     });
 
-    global_logic!(ui).invoke_screen_changed(name);
-
     Ok(())
 }
 
@@ -489,16 +487,6 @@ fn inner_audio_changed(ui: &AppWindow, name: SharedString) -> Result<()> {
     Ok(())
 }
 
-fn screen_changed(_ui: &AppWindow, name: SharedString) {
-    tokio::spawn(async move {
-        if let Err(e) =
-            RecordingSession::init_capture_mean_time(name.as_str(), &mut platform_screen_capture())
-        {
-            log::warn!("init capture mean time failed: {e}")
-        }
-    });
-}
-
 fn start_recording(ui: &AppWindow) {
     let all_config = config::all();
 
@@ -653,6 +641,14 @@ fn stop_recording(ui: &AppWindow) {
     global_store!(ui).set_record_status(UIRecordStatus::Stopped);
 }
 
+fn open_file(ui: &AppWindow, file: SharedString) {
+    if !file.is_empty()
+        && let Err(e) = open::that_detached(file.as_str())
+    {
+        toast_warn!(ui, format!("{}: `{}`. {e}", tr("Open file failed"), file));
+    }
+}
+
 pub fn picker_directory(ui: Weak<AppWindow>, title: &str, filename: &str) -> Option<PathBuf> {
     let result = native_dialog::DialogBuilder::file()
         .set_title(title)

wayshot/src/logic/recorder.rs

@@ -248,6 +248,7 @@ fn cn() -> &'static HashMap<&'static str, &'static str> {
             ("Disabled noise reduction", "禁用降噪功能"),
             ("Don't convert audio to mono", "不要将音频转换为单声道"),
             ("Enabled noise reduction", "启用降噪功能"),
+            ("Open file failed", "打开文件失败"),
         ])
     })
 }

wayshot/src/logic/tr.rs

@@ -1 +1 @@
-pub static VERSION: &str = "v0.1.2";
+pub static VERSION: &str = "v0.2.0";

wayshot/src/version.rs

@@ -91,8 +91,6 @@ export global Logic {
     callback choose-save-dir();
     callback update-sources(setting: SettingControl);
 
-    callback screen-changed(name: string);
-
     callback audio-changed(name: string, show-toast: bool);
     callback audio-gain-changed(value: float);
 
@@ -102,6 +100,8 @@ export global Logic {
     callback start-recording();
     callback stop-recording();
 
+    callback open-file(file: string);
+
     pure public function fps-to-int(fps: Fps) -> int {
         if (fps == Fps.Fps24) {
             return 24;

wayshot/ui/logic.slint

@@ -17,6 +17,7 @@ import {
     ComponentPosition,
 } from "../../base/widgets.slint";
 import { LogIn } from "../../base/log-in.slint";
+import { Divider } from "../../base/divider.slint";
 
 component PreviewPanel inherits Rectangle {
     background: Theme.dark-text-color;
@@ -403,10 +404,29 @@ component Banners inherits VerticalLayout {
         HorizontalLayout {
             spacing: Theme.spacing;
 
-            Label {
-                color: Theme.light-text-color;
-                text: Store.final-video-path;
-                font-weight: Theme.bold-font-weight;
+            VerticalLayout {
+                alignment: start;
+
+                lb := Label {
+                    color: Theme.light-text-color;
+                    text: Store.final-video-path;
+                    font-weight: Theme.bold-font-weight;
+
+                    lb-ta := TouchArea {
+                        mouse-cursor: MouseCursor.pointer;
+
+                        clicked => {
+                            Logic.open-file(Store.final-video-path);
+                        }
+                    }
+                }
+
+                Divider {
+                    visible: lb-ta.has-hover;
+                    background: lb.color;
+                    height: Theme.default-border-width;
+                    width: lb.preferred-width;
+                }
             }
 
             IconBtn {