mirror of
https://github.com/crunchy-labs/crunchy-cli.git
synced 2026-01-21 04:02:00 -06:00
Fix output to special file (pipes etc.)
This commit is contained in:
parent
c37e2495e1
commit
14f42833cb
3 changed files with 38 additions and 11 deletions
|
|
@ -3,7 +3,7 @@ use crate::cli::utils::{download_segments, find_resolution, FFmpegPreset};
|
|||
use crate::utils::context::Context;
|
||||
use crate::utils::format::{format_string, Format};
|
||||
use crate::utils::log::progress;
|
||||
use crate::utils::os::{free_file, has_ffmpeg, tempfile};
|
||||
use crate::utils::os::{free_file, has_ffmpeg, is_special_file, tempfile};
|
||||
use crate::utils::parse::{parse_url, UrlFilter};
|
||||
use crate::utils::sort::{sort_formats_after_seasons, sort_seasons_after_number};
|
||||
use crate::Execute;
|
||||
|
|
@ -133,6 +133,7 @@ impl Execute for Archive {
|
|||
.unwrap_or_default()
|
||||
.to_string_lossy()
|
||||
!= "mkv"
|
||||
&& !is_special_file(PathBuf::from(&self.output))
|
||||
{
|
||||
bail!("File extension is not '.mkv'. Currently only matroska / '.mkv' files are supported")
|
||||
}
|
||||
|
|
@ -251,7 +252,11 @@ impl Execute for Archive {
|
|||
info!(
|
||||
"Downloading {} to '{}'",
|
||||
primary.title,
|
||||
if is_special_file(&path) {
|
||||
path.to_str().unwrap()
|
||||
} else {
|
||||
path.file_name().unwrap().to_str().unwrap()
|
||||
}
|
||||
);
|
||||
tab_info!(
|
||||
"Episode: S{:02}E{:02}",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ use crate::cli::utils::{download_segments, find_resolution, FFmpegPreset};
|
|||
use crate::utils::context::Context;
|
||||
use crate::utils::format::{format_string, Format};
|
||||
use crate::utils::log::progress;
|
||||
use crate::utils::os::{free_file, has_ffmpeg};
|
||||
use crate::utils::os::{free_file, has_ffmpeg, is_special_file};
|
||||
use crate::utils::parse::{parse_url, UrlFilter};
|
||||
use crate::utils::sort::{sort_formats_after_seasons, sort_seasons_after_number};
|
||||
use crate::Execute;
|
||||
|
|
@ -219,7 +219,11 @@ impl Execute for Download {
|
|||
info!(
|
||||
"Downloading {} to '{}'",
|
||||
format.title,
|
||||
if is_special_file(&path) {
|
||||
path.to_str().unwrap()
|
||||
} else {
|
||||
path.file_name().unwrap().to_str().unwrap()
|
||||
}
|
||||
);
|
||||
tab_info!("Episode: S{:02}E{:02}", format.season_number, format.number);
|
||||
tab_info!("Audio: {}", format.audio);
|
||||
|
|
@ -232,9 +236,9 @@ impl Execute for Download {
|
|||
tab_info!("Resolution: {}", format.stream.resolution);
|
||||
tab_info!("FPS: {:.2}", format.stream.fps);
|
||||
|
||||
if path.extension().unwrap_or_default().to_string_lossy() != "ts"
|
||||
|| !self.ffmpeg_preset.is_empty()
|
||||
{
|
||||
let extension = path.extension().unwrap_or_default().to_string_lossy();
|
||||
|
||||
if (!extension.is_empty() && extension != "ts") || !self.ffmpeg_preset.is_empty() {
|
||||
download_ffmpeg(&ctx, &self, format.stream, path.as_path()).await?;
|
||||
} else if path.to_str().unwrap() == "-" {
|
||||
let mut stdout = std::io::stdout().lock();
|
||||
|
|
@ -279,6 +283,19 @@ async fn download_ffmpeg(
|
|||
.arg("-y")
|
||||
.args(input_presets)
|
||||
.args(["-f", "mpegts", "-i", "pipe:"])
|
||||
.args(
|
||||
if target
|
||||
.extension()
|
||||
.unwrap_or_default()
|
||||
.to_string_lossy()
|
||||
.is_empty()
|
||||
{
|
||||
vec!["-f", "mpegts"]
|
||||
} else {
|
||||
vec![]
|
||||
}
|
||||
.as_slice(),
|
||||
)
|
||||
.args(output_presets)
|
||||
.arg(target.to_str().unwrap())
|
||||
.spawn()?;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use log::debug;
|
||||
use std::io::ErrorKind;
|
||||
use std::path::PathBuf;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::process::{Command, Stdio};
|
||||
use std::{env, io};
|
||||
use tempfile::{Builder, NamedTempFile};
|
||||
|
|
@ -37,9 +37,8 @@ pub fn tempfile<S: AsRef<str>>(suffix: S) -> io::Result<NamedTempFile> {
|
|||
|
||||
/// Check if the given path exists and rename it until the new (renamed) file does not exist.
|
||||
pub fn free_file(mut path: PathBuf) -> PathBuf {
|
||||
// if path is not a file and not a dir it's probably a pipe on linux which reguarly is intended
|
||||
// and thus does not need to be renamed. what it is on windows ¯\_(ツ)_/¯
|
||||
if !path.is_file() && !path.is_dir() {
|
||||
// if it's a special file does not rename it
|
||||
if is_special_file(&path) {
|
||||
return path;
|
||||
}
|
||||
|
||||
|
|
@ -58,3 +57,9 @@ pub fn free_file(mut path: PathBuf) -> PathBuf {
|
|||
}
|
||||
path
|
||||
}
|
||||
|
||||
/// Check if the given path is a special file. On Linux this is probably a pipe and on Windows
|
||||
/// ¯\_(ツ)_/¯
|
||||
pub fn is_special_file<P: AsRef<Path>>(path: P) -> bool {
|
||||
path.as_ref().exists() && !path.as_ref().is_file() && !path.as_ref().is_dir()
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue