YoursFunny/TelegramTwitterMediaBot
1
0
Fork 0
mirror of https://github.com/TheFunny/TelegramTwitterMediaBot.git synced 2026-09-26 23:52:05 +00:00
Code Releases Activity

fix: bound ffmpeg encoding processes

Browse Source
This commit is contained in:
YoursFunny
2026-09-24 18:46:09 +08:00
parent 1f9da14772
commit 704b14f05a
2 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/x-media/src/site/bsky/interface.rs
+22 -7
View File
@@ -263,7 +263,7 @@ async fn resolve_bsky_video(
let list_str = list_path.to_string_lossy().into_owned();
let output_str = output.to_string_lossy().into_owned();
let status = tokio::task::spawn_blocking(move || {
std::process::Command::new("ffmpeg")
let mut child = std::process::Command::new("ffmpeg")
.args([
"-y",
"-f",
@@ -280,15 +280,30 @@ async fn resolve_bsky_video(
])
.stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::null())
.status()
.spawn()
.map_err(|e| format!("ffmpeg spawn failed: {e}"))?;
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(300);
loop {
match child
.try_wait()
.map_err(|e| format!("ffmpeg wait failed: {e}"))?
{
Some(status) => break Ok(status),
None if std::time::Instant::now() >= deadline => {
let _ = child.kill();
let _ = child.wait();
break Err("ffmpeg exceeded 300s".to_string());
}
None => std::thread::sleep(std::time::Duration::from_millis(50)),
}
}
})
.await
.map_err(|e| format!("bsky remux worker panicked: {e}"))?;
match status {
Ok(s) if s.success() => Ok(Some((output, out_dir))),
Ok(s) => Err(format!("ffmpeg exited with {s}")),
Err(e) => Err(format!("ffmpeg spawn failed: {e}")),
.map_err(|e| format!("bsky remux worker panicked: {e}"))??;
if !status.success() {
return Err(format!("ffmpeg exited with {status}"));
}
Ok(Some((output, out_dir)))
}
/// Fetches a post thread by handle or DID (`at://` URIs work for both).
crates/x-media/src/site/pixiv/api.rs
+21 -4
View File
@@ -333,7 +333,7 @@ impl PixivAPI {
let framerate = 1000.0 / median as f64;
let output = out_dir.path().join("ugoira.mp4");
let status = std::process::Command::new("ffmpeg")
let mut child = std::process::Command::new("ffmpeg")
.args([
"-y",
"-framerate",
@@ -357,10 +357,27 @@ impl PixivAPI {
])
.stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::null())
.status()
.spawn()
.map_err(|e| format!("ffmpeg spawn failed: {e}"))?;
if !status.success() {
return Err(format!("ffmpeg exited with {status}"));
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(300);
loop {
match child
.try_wait()
.map_err(|e| format!("ffmpeg wait failed: {e}"))?
{
Some(status) => {
if !status.success() {
return Err(format!("ffmpeg exited with {status}"));
}
break;
}
None if std::time::Instant::now() >= deadline => {
let _ = child.kill();
let _ = child.wait();
return Err("ffmpeg exceeded 300s".to_string());
}
None => std::thread::sleep(std::time::Duration::from_millis(50)),
}
}
Ok((output.to_string_lossy().into_owned(), out_dir))
})