GithubBackup/bilibili-video-downloader
1
0
Fork 0
mirror of https://github.com/lanyeeee/bilibili-video-downloader.git synced 2026-09-08 17:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: ffmpeg执行出错时会提供更友好的错误信息

Browse Source
This commit is contained in:
lanyeeee
2026-08-11 07:31:56 +08:00
parent 0a650c24f0
commit 4c42d59ec1
1 changed files with 77 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/downloader/tasks/video_process_task.rs
+43 -89
View File
@@ -1,4 +1,4 @@
use std::{path::PathBuf, sync::Arc}; use std::{io, path::PathBuf, sync::Arc};
use eyre::{WrapErr, eyre}; use eyre::{WrapErr, eyre};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@@ -98,21 +98,11 @@ impl VideoProcessTask {
let output_path = episode_dir.join(format!("{filename}-merged.mp4")); 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); let mut command = std::process::Command::new(ffmpeg_program);
command.arg("-i").arg(video_path_clone); command.arg("-i").arg(&video_path);
command.arg("-i").arg(audio_path_clone); command.arg("-i").arg(&audio_path);
if let Some(metadata_path) = metadata_path_clone { if let Some(metadata_path) = &metadata_path {
command.arg("-i").arg(metadata_path); command.arg("-i").arg(metadata_path);
command.arg("-map_metadata").arg("2"); command.arg("-map_metadata").arg("2");
} }
@@ -120,8 +110,7 @@ impl VideoProcessTask {
command.arg("-c").arg("copy"); command.arg("-c").arg("copy");
command.arg("-map").arg("0:v:0"); command.arg("-map").arg("0:v:0");
command.arg("-map").arg("1:a: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")] #[cfg(target_os = "windows")]
{ {
@@ -130,21 +119,7 @@ impl VideoProcessTask {
command.creation_flags(0x0800_0000); command.creation_flags(0x0800_0000);
} }
let output = command.output(); execute_ffmpeg(command).await.wrap_err("执行FFmpeg失败")?;
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) std::fs::remove_file(&video_path)
.wrap_err(format!("删除视频文件`{}`失败", video_path.display()))?; .wrap_err(format!("删除视频文件`{}`失败", video_path.display()))?;
@@ -192,25 +167,14 @@ impl VideoProcessTask {
let ffmpeg_program = utils::get_ffmpeg_program().wrap_err("获取FFmpeg程序路径失败")?; 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); let mut command = std::process::Command::new(ffmpeg_program);
command.arg("-i").arg(video_path_clone); command.arg("-i").arg(&video_path);
command.arg("-i").arg(audio_path_clone); command.arg("-i").arg(&audio_path);
command.arg("-c").arg("copy"); command.arg("-c").arg("copy");
command.arg("-map").arg("0:v:0"); command.arg("-map").arg("0:v:0");
command.arg("-map").arg("1:a: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")] #[cfg(target_os = "windows")]
{ {
@@ -219,21 +183,7 @@ impl VideoProcessTask {
command.creation_flags(0x0800_0000); command.creation_flags(0x0800_0000);
} }
let output = command.output(); execute_ffmpeg(command).await.wrap_err("执行FFmpeg失败")?;
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) std::fs::remove_file(&video_path)
.wrap_err(format!("删除视频文件`{}`失败", video_path.display()))?; .wrap_err(format!("删除视频文件`{}`失败", video_path.display()))?;
@@ -279,24 +229,13 @@ impl VideoProcessTask {
return Ok(()); 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); let mut command = std::process::Command::new(ffmpeg_program);
command.arg("-i").arg(video_path_clone); command.arg("-i").arg(&video_path);
command.arg("-i").arg(metadata_path_clone); command.arg("-i").arg(&metadata_path);
command.arg("-map_metadata").arg("1"); command.arg("-map_metadata").arg("1");
command.arg("-c").arg("copy"); command.arg("-c").arg("copy");
command.arg(&output_path).arg("-y");
command.arg(output_path_clone).arg("-y");
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
{ {
@@ -305,21 +244,7 @@ impl VideoProcessTask {
command.creation_flags(0x0800_0000); command.creation_flags(0x0800_0000);
} }
let output = command.output(); execute_ffmpeg(command).await.wrap_err("执行FFmpeg失败")?;
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) std::fs::remove_file(&video_path)
.wrap_err(format!("删除视频文件`{}`失败", video_path.display()))?; .wrap_err(format!("删除视频文件`{}`失败", video_path.display()))?;
@@ -388,3 +313,32 @@ impl VideoProcessTask {
Ok(Some(metadata_path)) 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?
}