Merge pull request #83 from lanyeeee/develop

Develop

README.md

@@ -57,7 +57,7 @@ https://github.com/user-attachments/assets/adf84b93-684f-43f3-9948-6ba527213812
 我能想到的解决办法只有：
 
 1. 根据下面的**如何构建(build)**，自行编译
-2. 希望你相信我的承诺，我承诺你在[Release页面](https://github.com/lanyeeee/bilibili-video-downloader/releases)下载到的所有东西都是安全的
+2. 希望你相信我的承诺，我承诺你在[Release页面](https://github.com/lanyeeee/bilibili-video-downloader/releases)下载到的所有东西都是安全的。切勿轻信他人分享的文件，请**仅**在[Release页面](https://github.com/lanyeeee/bilibili-video-downloader/releases)下载。任何不是从该页面下载的版本均可能**已被篡改**并**真的包含病毒**(而非误报)，包括但不限于`网盘`、`通过邮箱或社交软件分享`、`issue或discussion里的文件`、`其他fork(仓库)`、`其他网站`
 
 ## 🛠️如何构建(build)
 

src-plugin/plugin-api/src/lib.rs

@@ -327,7 +327,6 @@ pub mod v1 {
         pub part_title: Option<String>,
         pub part_order: Option<i64>,
         pub episode_title: String,
-        pub episode_title_in_collection: Option<String>,
         pub episode_order: i64,
         pub up_name: Option<String>,
         pub up_uid: Option<i64>,

src-tauri/Cargo.lock

@@ -315,7 +315,6 @@ dependencies = [
  "tauri-plugin-dialog",
  "tauri-plugin-opener",
  "tauri-plugin-os",
- "tauri-plugin-window-state",
  "tauri-specta",
  "tokio",
  "tracing",
@@ -4464,21 +4463,6 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
-[[package]]
-name = "tauri-plugin-window-state"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d5f6fe3291bfa609c7e0b0ee3bedac294d94c7018934086ce782c1d0f2a468e"
-dependencies = [
- "bitflags 2.9.1",
- "log",
- "serde",
- "serde_json",
- "tauri",
- "tauri-plugin",
- "thiserror 2.0.12",
-]
-
 [[package]]
 name = "tauri-runtime"
 version = "2.7.0"

src-tauri/Cargo.toml

@@ -22,7 +22,6 @@ tauri = { version = "2", features = [] }
 tauri-plugin-opener = "2"
 tauri-plugin-os = "2"
 tauri-plugin-dialog = "2"
-tauri-plugin-window-state = "2"
 dlopen2 = { version = "0.8.2" }
 bilibili-video-downloader-plugin-api = { path = "../src-plugin/plugin-api" }
 

src-tauri/src/bili_client.rs

@@ -351,8 +351,7 @@ impl BiliClient {
             .read()
             .get("https://api.bilibili.com/x/space/wbi/arc/search")
             .query(&params)
-            // 不带DedeUserID会随机触发412错误
+            .header("cookie", self.get_cookie());
-            .header("cookie", format!("DedeUserID=1; {}", self.get_cookie()));
         let http_resp = request.send().await?;
         // 检查http响应状态码
         let status = http_resp.status();

src-tauri/src/downloader/download_manager.rs

@@ -24,7 +24,10 @@ use crate::{
     },
 };
 
-use super::{download_progress::DownloadProgress, download_task::DownloadTask};
+use super::{
+    download_progress::DownloadProgress, download_task::DownloadTask,
+    download_task_state::DownloadTaskState,
+};
 
 pub struct DownloadManager {
     pub app: AppHandle,
@@ -88,7 +91,7 @@ impl DownloadManager {
             let old_task = tasks.insert(new_task.task_id.clone(), new_task);
             if let Some(old_task) = old_task {
                 // 如果同一个ID的下载任务已经存在，则取消旧的任务
-                old_task.cancel();
+                let _ = old_task.cancel_sender.send(());
             }
         }
 
@@ -117,7 +120,8 @@ impl DownloadManager {
                 tracing::error!(err_title, message);
                 continue;
             };
-            task.pause();
+            task.set_state(DownloadTaskState::Paused);
+            tracing::debug!("已将ID对应的下载任务状态设置为`Paused`");
         }
     }
 
@@ -135,7 +139,8 @@ impl DownloadManager {
                 tracing::error!(err_title, message);
                 continue;
             };
-            task.resume();
+            task.set_state(DownloadTaskState::Pending);
+            tracing::debug!("已将ID对应的下载任务状态设置为`Pending`");
         }
     }
 
@@ -153,13 +158,27 @@ impl DownloadManager {
                 tracing::error!(err_title, message);
                 continue;
             };
-            if let Err(err) = task.delete() {
+            // TODO: 应该先发删除新号再删文件
+            // 因为发信号失败会把任务重新塞回去
+            // 目前先删文件会导致发信号失败时出现 任务还在但文件没了的情况
+            if let Err(err) = self.delete_progress_file(task_id) {
                 let err_title = "删除下载任务失败";
                 let message = err.to_message();
                 tracing::error!(err_title, message);
                 tasks.insert(task_id.clone(), task);
                 continue;
             }
+
+            if let Err(err) = task.delete_sender.send(()).map_err(eyre::Report::from) {
+                let err = err.wrap_err("通知ID对应的下载任务删除失败");
+                let err_title = "删除下载任务失败";
+                let message = err.to_message();
+                tracing::error!(err_title, message);
+                tasks.insert(task_id.clone(), task);
+                continue;
+            }
+
+            tracing::debug!("已通知ID对应的下载任务删除");
         }
     }
 
@@ -178,12 +197,15 @@ impl DownloadManager {
                 continue;
             };
 
-            if let Err(err) = task.restart() {
+            if let Err(err) = task.restart_sender.send(()).map_err(eyre::Report::from) {
                 let err_title = "重来下载任务失败";
+                let err = err.wrap_err("通知ID对应的下载任务重来失败");
                 let message = err.to_message();
                 tracing::error!(err_title, message);
                 continue;
             }
+
+            tracing::debug!("已通知ID对应的下载任务重来");
         }
     }
 
@@ -200,11 +222,37 @@ impl DownloadManager {
             return;
         };
 
-        if let Err(err) = task.restart_with_params(params) {
+        // TODO: 把这块代码变成DownloadProgress的mark_restart函数
+        {
+            let mut progress = task.progress.write();
+
+            progress.video_task.selected = params.video_task_selected;
+            progress.audio_task.selected = params.audio_task_selected;
+            progress.video_process_task.merge_selected = params.merge_selected;
+            progress.video_process_task.embed_chapter_selected = params.embed_chapter_selected;
+            progress.video_process_task.embed_skip_selected = params.embed_skip_selected;
+            progress.subtitle_task.selected = params.subtitle_task_selected;
+            progress.danmaku_task.xml_selected = params.xml_danmaku_selected;
+            progress.danmaku_task.ass_selected = params.ass_danmaku_selected;
+            progress.danmaku_task.json_selected = params.json_danmaku_selected;
+            progress.cover_task.selected = params.cover_task_selected;
+            progress.nfo_task.selected = params.nfo_task_selected;
+            progress.json_task.selected = params.json_task_selected;
+
+            progress.video_task.video_quality = params.video_quality;
+            progress.video_task.codec_type = params.codec_type;
+            progress.audio_task.audio_quality = params.audio_quality;
+        }
+
+        if let Err(err) = task.restart_sender.send(()).map_err(eyre::Report::from) {
             let err_title = "重来下载任务失败";
+            let err = err.wrap_err("通知ID对应的下载任务重来失败");
             let message = err.to_message();
             tracing::error!(err_title, message);
+            return;
         }
+
+        tracing::debug!("已通知ID对应的下载任务重来");
     }
 
     async fn emit_download_speed_loop(app: AppHandle, byte_per_sec: Arc<AtomicU64>) {
@@ -226,4 +274,14 @@ impl DownloadManager {
         let task_dir = app_data_dir.join(".下载任务");
         Ok(task_dir)
     }
+
+    #[instrument(level = "error", skip_all, fields(task_id = task_id))]
+    fn delete_progress_file(&self, task_id: &str) -> eyre::Result<()> {
+        let task_dir = self.get_task_dir()?;
+        let task_file = task_dir.join(format!("{task_id}.json"));
+        if task_file.exists() {
+            std::fs::remove_file(task_file)?;
+        }
+        Ok(())
+    }
 }

src-tauri/src/downloader/download_progress.rs

@@ -32,7 +32,6 @@ use crate::{
         bangumi_info::BangumiInfo,
         cheese_info::CheeseInfo,
         codec_type::CodecType,
-        get_normal_info_params::GetNormalInfoParams,
         normal_info::{NormalInfo, UgcSeason},
         video_quality::VideoQuality,
     },
@@ -55,7 +54,6 @@ pub struct DownloadProgress {
     pub part_title: Option<String>,
     pub part_order: Option<i64>,
     pub episode_title: String,
-    pub episode_title_in_collection: Option<String>,
     pub episode_order: i64,
     pub up_name: Option<String>,
     pub up_uid: Option<i64>,
@@ -131,7 +129,6 @@ impl DownloadProgress {
             part_title: None,
             part_order: None,
             episode_title: episode.show_title.clone().unwrap_or(episode.title.clone()),
-            episode_title_in_collection: None,
             episode_order,
             up_name,
             up_uid,
@@ -182,7 +179,6 @@ impl DownloadProgress {
             part_title: None,
             part_order: None,
             episode_title: episode.title.clone(),
-            episode_title_in_collection: None,
             episode_order: episode.index,
             up_name: Some(info.up_info.uname.clone()),
             up_uid: Some(info.up_info.mid),
@@ -342,18 +338,6 @@ impl DownloadProgress {
         let audio_selected = self.audio_task.selected;
         let audio_completed = self.audio_task.completed;
 
-        // 通过合集批量创建的任务时，合集接口只提供视频在合集内的标题
-        // 所以在创建任务阶段，episode_title暂时用它占位
-        // 在真正开始下载前，需要重新获取视频的真实标题
-        if self.episode_type == EpisodeType::Normal && self.episode_title_in_collection.is_some() {
-            let bili_client = app.get_bili_client();
-            let info = bili_client
-                .get_normal_info(GetNormalInfoParams::Aid(self.aid))
-                .await
-                .wrap_err("获取视频信息失败")?;
-            self.episode_title = info.title;
-        }
-
         if (!video_selected && !audio_selected) || (video_completed && audio_completed) {
             // 如果视频和音频都没有选中，或者都已经完成，则更新需要格式化的字段就返回
             self.update_fmt_fields(app)
@@ -368,7 +352,6 @@ impl DownloadProgress {
                 let Some(bvid) = &self.bvid else {
                     return Err(eyre!("progress中的bvid为None，无法获取视频链接"));
                 };
-
                 let media_url = bili_client
                     .get_normal_url(bvid, self.cid)
                     .await
@@ -459,7 +442,6 @@ impl DownloadProgress {
             pub_ts: self.pub_ts,
             collection_title: self.collection_title.clone(),
             episode_title: self.episode_title.clone(),
-            episode_title_in_collection: self.episode_title_in_collection.clone(),
             episode_order: self.episode_order,
             part_title: self.part_title.clone(),
             part_order: self.part_order,
@@ -544,7 +526,6 @@ fn create_normal_progresses_for_single(
             part_title: Some(page.part.clone()),
             part_order: Some(page.page),
             episode_title: info.title.clone(),
-            episode_title_in_collection: None,
             episode_order: 1,
             up_name: Some(info.owner.name.clone()),
             up_uid: Some(info.owner.mid),
@@ -583,7 +564,6 @@ fn create_normal_progresses_for_single(
             part_title: None,
             part_order: None,
             episode_title: info.title.clone(),
-            episode_title_in_collection: None,
             episode_order: 1,
             up_name: Some(info.owner.name.clone()),
             up_uid: Some(info.owner.mid),
@@ -622,7 +602,6 @@ fn create_normal_progresses_for_single(
             part_title: Some(page.part.clone()),
             part_order: Some(page.page),
             episode_title: info.title.clone(),
-            episode_title_in_collection: None,
             episode_order: 1,
             up_name: Some(info.owner.name.clone()),
             up_uid: Some(info.owner.mid),
@@ -674,10 +653,6 @@ fn create_normal_progresses_for_season(
 
     let tasks = Tasks::new(config, &ep.arc.pic);
 
-    // 合集接口返回的只有在合集内的标题，视频标题先用它占位，到prepare时再按aid获取真实标题
-    let episode_title = ep.title.clone();
-    let episode_title_in_collection = Some(ep.title.clone());
-
     let create_ts = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs();
 
     if let Some(cid) = cid {
@@ -697,8 +672,7 @@ fn create_normal_progresses_for_season(
             collection_title: ugc_season.title.clone(),
             part_title: Some(page.part.clone()),
             part_order: Some(page.page),
-            episode_title: episode_title.clone(),
+            episode_title: ep.title.clone(),
-            episode_title_in_collection: episode_title_in_collection.clone(),
             episode_order,
             up_name: Some(info.owner.name.clone()),
             up_uid: Some(info.owner.mid),
@@ -736,8 +710,7 @@ fn create_normal_progresses_for_season(
             collection_title: ugc_season.title.clone(),
             part_title: None,
             part_order: None,
-            episode_title: episode_title.clone(),
+            episode_title: ep.title.clone(),
-            episode_title_in_collection: episode_title_in_collection.clone(),
             episode_order,
             up_name: Some(info.owner.name.clone()),
             up_uid: Some(info.owner.mid),
@@ -776,8 +749,7 @@ fn create_normal_progresses_for_season(
             collection_title: ugc_season.title.clone(),
             part_title: Some(page.part.clone()),
             part_order: Some(page.page),
-            episode_title: episode_title.clone(),
+            episode_title: ep.title.clone(),
-            episode_title_in_collection: episode_title_in_collection.clone(),
             episode_order,
             up_name: Some(info.owner.name.clone()),
             up_uid: Some(info.owner.mid),

src-tauri/src/downloader/download_task.rs

@@ -2,7 +2,7 @@
 
 use eyre::WrapErr;
 use parking_lot::RwLock;
-use tauri::{AppHandle, Manager};
+use tauri::AppHandle;
 use tauri_specta::Event;
 use tokio::{
     sync::{SemaphorePermit, watch},
@@ -14,10 +14,7 @@ use crate::{
     downloader::episode_type::EpisodeType,
     events::DownloadEvent,
     extensions::{AppHandleExt, EyreReportToMessage},
-    types::{
+    types::create_download_task_params::CreateDownloadTaskParams,
-        create_download_task_params::CreateDownloadTaskParams,
-        restart_download_task_params::RestartDownloadTaskParams,
-    },
 };
 
 use super::{download_progress::DownloadProgress, download_task_state::DownloadTaskState};
@@ -130,7 +127,6 @@ impl DownloadTask {
                 ep_id = progress.ep_id,
                 collection_title = progress.collection_title,
                 episode_title = progress.episode_title,
-                episode_title_in_collection = progress.episode_title_in_collection,
                 episode_order = progress.episode_order,
                 part_title = progress.part_title,
                 part_order = progress.part_order,
@@ -203,70 +199,6 @@ impl DownloadTask {
         task
     }
 
-    #[instrument(level = "error", skip_all, fields(task_id = self.task_id))]
-    pub fn pause(&self) {
-        self.set_state(DownloadTaskState::Paused);
-        tracing::debug!("已将下载任务状态设置为`Paused`");
-    }
-
-    #[instrument(level = "error", skip_all, fields(task_id = self.task_id))]
-    pub fn resume(&self) {
-        self.set_state(DownloadTaskState::Pending);
-        tracing::debug!("已将下载任务状态设置为`Pending`");
-    }
-
-    #[instrument(level = "error", skip_all, fields(task_id = self.task_id))]
-    pub fn cancel(&self) {
-        let _ = self.cancel_sender.send(());
-    }
-
-    #[instrument(level = "error", skip_all, fields(task_id = self.task_id))]
-    pub fn delete(&self) -> eyre::Result<()> {
-        self.delete_progress_file()?;
-        self.delete_sender
-            .send(())
-            .map_err(eyre::Report::from)
-            .wrap_err("通知ID对应的下载任务删除失败")?;
-        tracing::debug!("已通知ID对应的下载任务删除");
-        Ok(())
-    }
-
-    #[instrument(level = "error", skip_all, fields(task_id = self.task_id))]
-    pub fn restart(&self) -> eyre::Result<()> {
-        self.restart_sender
-            .send(())
-            .map_err(eyre::Report::from)
-            .wrap_err("通知ID对应的下载任务重来失败")?;
-        tracing::debug!("已通知ID对应的下载任务重来");
-        Ok(())
-    }
-
-    #[instrument(level = "error", skip_all, fields(task_id = self.task_id))]
-    pub fn restart_with_params(&self, params: &RestartDownloadTaskParams) -> eyre::Result<()> {
-        {
-            let mut progress = self.progress.write();
-
-            progress.video_task.selected = params.video_task_selected;
-            progress.audio_task.selected = params.audio_task_selected;
-            progress.video_process_task.merge_selected = params.merge_selected;
-            progress.video_process_task.embed_chapter_selected = params.embed_chapter_selected;
-            progress.video_process_task.embed_skip_selected = params.embed_skip_selected;
-            progress.subtitle_task.selected = params.subtitle_task_selected;
-            progress.danmaku_task.xml_selected = params.xml_danmaku_selected;
-            progress.danmaku_task.ass_selected = params.ass_danmaku_selected;
-            progress.danmaku_task.json_selected = params.json_danmaku_selected;
-            progress.cover_task.selected = params.cover_task_selected;
-            progress.nfo_task.selected = params.nfo_task_selected;
-            progress.json_task.selected = params.json_task_selected;
-
-            progress.video_task.video_quality = params.video_quality;
-            progress.video_task.codec_type = params.codec_type;
-            progress.audio_task.audio_quality = params.audio_quality;
-        }
-
-        self.restart()
-    }
-
     #[instrument(
         level = "error",
         skip_all,
@@ -279,7 +211,6 @@ impl DownloadTask {
             ep_id = self.trace_fields.ep_id,
             collection_title = self.trace_fields.collection_title,
             episode_title = self.trace_fields.episode_title,
-            episode_title_in_collection = self.trace_fields.episode_title_in_collection,
             episode_order = self.trace_fields.episode_order,
             part_title = self.trace_fields.part_title,
             part_order = self.trace_fields.part_order,
@@ -486,7 +417,6 @@ impl DownloadTask {
             ep_id = self.trace_fields.ep_id,
             collection_title = self.trace_fields.collection_title,
             episode_title = self.trace_fields.episode_title,
-            episode_title_in_collection = self.trace_fields.episode_title_in_collection,
             episode_order = self.trace_fields.episode_order,
             part_title = self.trace_fields.part_title,
             part_order = self.trace_fields.part_order,
@@ -494,7 +424,7 @@ impl DownloadTask {
             up_uid = self.trace_fields.up_uid,
         )
     )]
-    fn set_state(&self, state: DownloadTaskState) {
+    pub fn set_state(&self, state: DownloadTaskState) {
         if let Err(err) = self.state_sender.send(state).map_err(eyre::Report::from) {
             let err_title = format!("发送状态`{state:?}`失败");
             let message = err.to_message();
@@ -526,18 +456,6 @@ impl DownloadTask {
             tracing::error!(err_title, message);
         }
     }
-
-    #[instrument(level = "error", skip_all, fields(task_id = self.task_id))]
-    fn delete_progress_file(&self) -> eyre::Result<()> {
-        let app_data_dir = self.app.path().app_data_dir()?;
-        let task_file = app_data_dir
-            .join(".下载任务")
-            .join(format!("{}.json", self.task_id));
-        if task_file.exists() {
-            std::fs::remove_file(task_file)?;
-        }
-        Ok(())
-    }
 }
 
 pub struct DownloadTaskTraceFields {
@@ -549,7 +467,6 @@ pub struct DownloadTaskTraceFields {
     pub ep_id: Option<i64>,
     pub collection_title: String,
     pub episode_title: String,
-    pub episode_title_in_collection: Option<String>,
     pub episode_order: i64,
     pub part_title: Option<String>,
     pub part_order: Option<i64>,
@@ -568,7 +485,6 @@ impl From<&DownloadProgress> for DownloadTaskTraceFields {
             ep_id: progress.ep_id,
             collection_title: progress.collection_title.clone(),
             episode_title: progress.episode_title.clone(),
-            episode_title_in_collection: progress.episode_title_in_collection.clone(),
             episode_order: progress.episode_order,
             part_title: progress.part_title.clone(),
             part_order: progress.part_order,

src-tauri/src/downloader/fmt_params.rs

@@ -25,7 +25,6 @@ pub struct FmtParams {
     pub pub_ts: i64,
     pub collection_title: String,
     pub episode_title: String,
-    pub episode_title_in_collection: Option<String>,
     pub episode_order: i64,
     pub part_title: Option<String>,
     pub part_order: Option<i64>,

src-tauri/src/downloader/tasks/video_process_task.rs

@@ -1,4 +1,4 @@
-use std::{io, path::PathBuf, sync::Arc};
+use std::{path::PathBuf, sync::Arc};
 
 use eyre::{WrapErr, eyre};
 use serde::{Deserialize, Serialize};
@@ -98,11 +98,21 @@ impl VideoProcessTask {
 
         let output_path = episode_dir.join(format!("{filename}-merged.mp4"));
 
+        let (tx, rx) = tokio::sync::oneshot::channel();
+        let video_path_clone = video_path.clone();
+        let audio_path_clone = audio_path.clone();
+        let metadata_path_clone = metadata_path.clone();
+        let output_path_clone = output_path.clone();
+
+        let current_span = tracing::Span::current();
+        tauri::async_runtime::spawn_blocking(move || {
+            let _enter = current_span.enter();
+
             let mut command = std::process::Command::new(ffmpeg_program);
 
-        command.arg("-i").arg(&video_path);
+            command.arg("-i").arg(video_path_clone);
-        command.arg("-i").arg(&audio_path);
+            command.arg("-i").arg(audio_path_clone);
-        if let Some(metadata_path) = &metadata_path {
+            if let Some(metadata_path) = metadata_path_clone {
                 command.arg("-i").arg(metadata_path);
                 command.arg("-map_metadata").arg("2");
             }
@@ -110,7 +120,8 @@ impl VideoProcessTask {
             command.arg("-c").arg("copy");
             command.arg("-map").arg("0:v:0");
             command.arg("-map").arg("1:a:0");
-        command.arg(&output_path).arg("-y");
+
+            command.arg(output_path_clone).arg("-y");
 
             #[cfg(target_os = "windows")]
             {
@@ -119,7 +130,21 @@ impl VideoProcessTask {
                 command.creation_flags(0x0800_0000);
             }
 
-        execute_ffmpeg(command).await.wrap_err("执行FFmpeg失败")?;
+            let output = command.output();
+
+            let _ = tx.send(output);
+        });
+
+        let output = rx.await??;
+
+        if !output.status.success() {
+            let stderr = String::from_utf8_lossy(&output.stderr);
+            let stdout = String::from_utf8_lossy(&output.stdout);
+            let err = eyre!(format!("STDOUT: {stdout}"))
+                .wrap_err(format!("STDERR: {stderr}"))
+                .wrap_err("原因可能是视频或音频文件损坏，建议[重来]试试");
+            return Err(err);
+        }
 
         std::fs::remove_file(&video_path)
             .wrap_err(format!("删除视频文件`{}`失败", video_path.display()))?;
@@ -167,14 +192,25 @@ impl VideoProcessTask {
 
         let ffmpeg_program = utils::get_ffmpeg_program().wrap_err("获取FFmpeg程序路径失败")?;
 
+        let (tx, rx) = tokio::sync::oneshot::channel();
+        let video_path_clone = video_path.clone();
+        let audio_path_clone = audio_path.clone();
+        let output_path_clone = output_path.clone();
+
+        let current_span = tracing::Span::current();
+        tauri::async_runtime::spawn_blocking(move || {
+            let _enter = current_span.enter();
+
             let mut command = std::process::Command::new(ffmpeg_program);
 
-        command.arg("-i").arg(&video_path);
+            command.arg("-i").arg(video_path_clone);
-        command.arg("-i").arg(&audio_path);
+            command.arg("-i").arg(audio_path_clone);
+
             command.arg("-c").arg("copy");
             command.arg("-map").arg("0:v:0");
             command.arg("-map").arg("1:a:0");
-        command.arg(&output_path).arg("-y");
+
+            command.arg(output_path_clone).arg("-y");
 
             #[cfg(target_os = "windows")]
             {
@@ -183,7 +219,21 @@ impl VideoProcessTask {
                 command.creation_flags(0x0800_0000);
             }
 
-        execute_ffmpeg(command).await.wrap_err("执行FFmpeg失败")?;
+            let output = command.output();
+
+            let _ = tx.send(output);
+        });
+
+        let output = rx.await??;
+
+        if !output.status.success() {
+            let stderr = String::from_utf8_lossy(&output.stderr);
+            let stdout = String::from_utf8_lossy(&output.stdout);
+            let err = eyre!(format!("STDOUT: {stdout}"))
+                .wrap_err(format!("STDERR: {stderr}"))
+                .wrap_err("原因可能是视频或音频文件损坏，建议[重来]试试");
+            return Err(err);
+        }
 
         std::fs::remove_file(&video_path)
             .wrap_err(format!("删除视频文件`{}`失败", video_path.display()))?;
@@ -229,13 +279,24 @@ impl VideoProcessTask {
             return Ok(());
         };
 
+        let (tx, rx) = tokio::sync::oneshot::channel();
+        let video_path_clone = video_path.clone();
+        let metadata_path_clone = metadata_path.clone();
+        let output_path_clone = output_path.clone();
+
+        let current_span = tracing::Span::current();
+        tauri::async_runtime::spawn_blocking(move || {
+            let _enter = current_span.enter();
+
             let mut command = std::process::Command::new(ffmpeg_program);
 
-        command.arg("-i").arg(&video_path);
+            command.arg("-i").arg(video_path_clone);
-        command.arg("-i").arg(&metadata_path);
+            command.arg("-i").arg(metadata_path_clone);
+
             command.arg("-map_metadata").arg("1");
             command.arg("-c").arg("copy");
-        command.arg(&output_path).arg("-y");
+
+            command.arg(output_path_clone).arg("-y");
 
             #[cfg(target_os = "windows")]
             {
@@ -244,7 +305,21 @@ impl VideoProcessTask {
                 command.creation_flags(0x0800_0000);
             }
 
-        execute_ffmpeg(command).await.wrap_err("执行FFmpeg失败")?;
+            let output = command.output();
+
+            let _ = tx.send(output);
+        });
+
+        let output = rx.await??;
+
+        if !output.status.success() {
+            let stderr = String::from_utf8_lossy(&output.stderr);
+            let stdout = String::from_utf8_lossy(&output.stdout);
+            let err = eyre!(format!("STDOUT: {stdout}"))
+                .wrap_err(format!("STDERR: {stderr}"))
+                .wrap_err("原因可能是视频或音频文件损坏，建议[重来]试试");
+            return Err(err);
+        }
 
         std::fs::remove_file(&video_path)
             .wrap_err(format!("删除视频文件`{}`失败", video_path.display()))?;
@@ -313,32 +388,3 @@ impl VideoProcessTask {
         Ok(Some(metadata_path))
     }
 }
-
-#[instrument(level = "error", skip_all)]
-async fn execute_ffmpeg(mut command: std::process::Command) -> eyre::Result<()> {
-    let span = tracing::Span::current();
-
-    tauri::async_runtime::spawn_blocking(move || {
-        let _enter = span.enter();
-
-        let program = command.get_program().to_string_lossy().into_owned();
-        let output = command.output().map_err(|err| {
-            if err.kind() == io::ErrorKind::NotFound {
-                eyre!(err).wrap_err(format!("找不到FFmpeg `{program}`"))
-            } else {
-                eyre!(err)
-            }
-        })?;
-
-        if output.status.success() {
-            return Ok(());
-        }
-
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        let stdout = String::from_utf8_lossy(&output.stdout);
-        Err(eyre!(format!("STDOUT: {stdout}")))
-            .wrap_err(format!("STDERR: {stderr}"))
-            .wrap_err("原因可能是视频或音频文件损坏，建议[重来]试试")
-    })
-    .await?
-}

src-tauri/src/lib.rs

@@ -106,7 +106,6 @@ pub fn run() {
     }
 
     tauri::Builder::default()
-        .plugin(tauri_plugin_window_state::Builder::default().build())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_os::init())
         .plugin(tauri_plugin_opener::init())

src-tauri/src/types.rs

@@ -1,5 +1,3 @@
-use serde::{Deserialize, Deserializer};
-
 pub mod audio_quality;
 pub mod available_media_formats;
 pub mod bangumi_follow_info;
@@ -38,12 +36,3 @@ pub mod user_info;
 pub mod user_video_info;
 pub mod video_quality;
 pub mod watch_later_info;
-
-fn deserialize_null_default<'de, D, T>(deserializer: D) -> Result<T, D::Error>
-where
-    T: Default + Deserialize<'de>,
-    D: Deserializer<'de>,
-{
-    let opt = Option::deserialize(deserializer)?;
-    Ok(opt.unwrap_or_default())
-}

src-tauri/src/types/player_info.rs

@@ -1,8 +1,6 @@
 use serde::{Deserialize, Serialize};
 use specta::Type;
 
-use super::deserialize_null_default;
-
 #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default)]
 #[allow(clippy::struct_excessive_bools)]
@@ -32,7 +30,6 @@ pub struct PlayerInfo {
     pub online_count: i64,
     pub need_login_subtitle: bool,
     pub subtitle: SubtitleInPlayerInfo,
-    #[serde(default, deserialize_with = "deserialize_null_default")]
     pub view_points: Vec<ViewPoint>,
     pub preview_toast: String,
     pub options: Options,

src-tauri/tauri.linux.conf.json

@@ -8,7 +8,6 @@
         "height": 600,
         "minWidth": 800,
         "minHeight": 600,
-        "visible": false,
         "decorations": false,
         "theme": "Light"
       }

src-tauri/tauri.macos.conf.json

@@ -8,7 +8,6 @@
         "height": 600,
         "minWidth": 800,
         "minHeight": 600,
-        "visible": false,
         "hiddenTitle": true,
         "titleBarStyle": "Overlay",
         "theme": "Light"

src-tauri/tauri.windows.conf.json

@@ -8,7 +8,6 @@
         "height": 600,
         "minWidth": 800,
         "minHeight": 600,
-        "visible": false,
         "decorations": false,
         "shadow": true,
         "theme": "Light"

src/bindings.ts

@@ -329,7 +329,7 @@ export type Dimension = { width: number; height: number; rotate: number }
 export type DimensionInBangumi = { height: number; rotate: number; width: number }
 export type DimensionInWatchLater = { width: number; height: number; rotate: number }
 export type DownloadEvent = { event: "Speed"; data: { speed: string } } | { event: "TaskCreate"; data: { state: DownloadTaskState; progress: DownloadProgress } } | { event: "TaskStateUpdate"; data: { task_id: string; state: DownloadTaskState } } | { event: "TaskSleeping"; data: { task_id: string; remaining_sec: number } } | { event: "TaskDelete"; data: { task_id: string } } | { event: "ProgressPreparing"; data: { task_id: string } } | { event: "ProgressUpdate"; data: { progress: DownloadProgress } }
-export type DownloadProgress = { task_id: string; episode_type: EpisodeType; aid: number; bvid: string | null; cid: number; ep_id: number | null; duration: number; pub_ts: number; collection_title: string; part_title: string | null; part_order: number | null; episode_title: string; episode_title_in_collection: string | null; episode_order: number; up_name: string | null; up_uid: number | null; up_avatar: string | null; episode_dir: string; filename: string; video_task: VideoTask; audio_task: AudioTask; video_process_task: VideoProcessTask; subtitle_task: SubtitleTask; danmaku_task: DanmakuTask; cover_task: CoverTask; nfo_task: NfoTask; json_task: JsonTask; create_ts: number; completed_ts: number | null; is_drm: boolean; is_preview: boolean }
+export type DownloadProgress = { task_id: string; episode_type: EpisodeType; aid: number; bvid: string | null; cid: number; ep_id: number | null; duration: number; pub_ts: number; collection_title: string; part_title: string | null; part_order: number | null; episode_title: string; episode_order: number; up_name: string | null; up_uid: number | null; up_avatar: string | null; episode_dir: string; filename: string; video_task: VideoTask; audio_task: AudioTask; video_process_task: VideoProcessTask; subtitle_task: SubtitleTask; danmaku_task: DanmakuTask; cover_task: CoverTask; nfo_task: NfoTask; json_task: JsonTask; create_ts: number; completed_ts: number | null; is_drm: boolean; is_preview: boolean }
 export type DownloadTaskState = "Pending" | "Downloading" | "Paused" | "Completed" | "Failed"
 export type Ed = { end: number; start: number }
 export type EpInBangumi = { aid: number; badge: string; badge_info: BadgeInfoInBangumi; badge_type: number | null; bvid: string | null; cid: number; cover: string; dimension: DimensionInBangumi | null; duration: number | null; enable_vt: boolean; ep_id: number; from: string | null; id: number; is_view_hide: boolean; link: string; link_type: string | null; long_title: string | null; pub_time: number; pv: number; release_date: string | null; rights: RightsInBangumiEp | null; section_type: number; share_copy: string | null; share_url: string | null; short_link: string | null; showDrmLoginDialog: boolean; show_title: string | null; skip: Skip | null; status: number; subtitle: string | null; title: string; vid: string | null; icon_font: IconFont | null }

src/dialogs/SettingsDialog/components/FmtSettings.vue

@@ -56,17 +56,13 @@ function AvailableFmtFields() {
       <div>
         <span class="rounded bg-gray-500 px-1 select-all">collection_title</span>
         <span class="ml-2">
-          合集标题，
+          合集名称，
-          <span class="text-blue">对于单独(没有合集)的视频，合集标题就是视频标题</span>
+          <span class="text-blue">对于单独(没有合集)的视频，合集名称就是视频名称</span>
         </span>
       </div>
       <div>
         <span class="rounded bg-gray-500 px-1 select-all">episode_title</span>
-        <span class="ml-2">视频标题</span>
+        <span class="ml-2">视频名称</span>
-      </div>
-      <div>
-        <span class="rounded bg-gray-500 px-1 select-all">episode_title_in_collection</span>
-        <span class="ml-2">视频在合集内的标题</span>
       </div>
       <div>
         <span class="rounded bg-gray-500 px-1 select-all">episode_order</span>
@@ -87,7 +83,7 @@ function AvailableFmtFields() {
       </div>
       <div>
         <span class="rounded bg-gray-500 px-1 select-all">part_title</span>
-        <span class="ml-2">分P标题</span>
+        <span class="ml-2">分P名称</span>
       </div>
       <div>
         <span class="rounded bg-gray-500 px-1 select-all">part_order</span>

src/store.ts

@@ -27,28 +27,36 @@ export const useStore = defineStore('store', () => {
 })
 
 function useProgresses() {
+  // 内部的高频更新状态
+  const _progresses = new Map<string, ProgressData>()
   // 对外暴露的响应式状态
   const progresses = ref<Map<string, ProgressData>>(new Map())
 
-  // 等待在同一渲染帧内执行的更新函数
-  const pendingUpdateFns: Array<(progresses: Map<string, ProgressData>) => void> = []
-
   // 用于确保在同一渲染帧内只安排一次UI更新
   let isUpdateScheduled = false
 
-  // 在同一渲染帧内集中执行等待中的更新函数
+  // 将 `_progresses` 的内容更新到 `progresses` 中，并触发重新渲染
   const updateProgressesOnFrame = () => {
-    isUpdateScheduled = false
+    const newProgressesMap = new Map<string, ProgressData>()
 
-    const updateFns = pendingUpdateFns.splice(0)
+    for (const [key, value] of _progresses.entries()) {
-    for (const updateFn of updateFns) {
+      const progressData = progresses.value.get(key)
-      updateFn(progresses.value)
+
+      if (progressData !== undefined) {
+        Object.assign(progressData, value)
+        newProgressesMap.set(key, progressData)
+      } else {
+        newProgressesMap.set(key, { ...value })
       }
     }
+    progresses.value = newProgressesMap
+
+    isUpdateScheduled = false
+  }
 
   const updateProgresses = (updateFn: (progresses: Map<string, ProgressData>) => void) => {
-    // 将传入的更新函数添加到等待队列
+    // 使用传入的更新函数来修改 `_progresses`
-    pendingUpdateFns.push(updateFn)
+    updateFn(_progresses)
 
     if (!isUpdateScheduled) {
       // 如果没有安排过UI更新，则安排一次