change av1an-cli structure, bump to 0.1.1
This commit is contained in:
Zen
parent
d0b27f9b73
commit
72cdd15b51
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "av1an-cli"
|
||||
version = "0.1.0"
|
||||
version = "0.1.1"
|
||||
authors = ["Zen <master_of_zen@protonmail.com>"]
|
||||
description = """
|
||||
Cross-platform command-line AV1 / VP9 / HEVC / H264 encoding framework with per scene quality encoding [Command line library]
|
||||
|
|
|
|||
|
|
@ -1,9 +1,14 @@
|
|||
use anyhow::Context;
|
||||
use path_abs::{PathAbs, PathInfo};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::path::PathBuf;
|
||||
use std::io::{self, Write};
|
||||
use std::path::{Path, PathBuf};
|
||||
use structopt::clap::AppSettings::ColoredHelp;
|
||||
use structopt::StructOpt;
|
||||
|
||||
use av1an_core::encoder::Encoder;
|
||||
use av1an_core::vapoursynth;
|
||||
use av1an_core::{hash_path, is_vapoursynth, Project, Verbosity};
|
||||
use av1an_core::{ChunkMethod, ConcatMethod, SplitMethod};
|
||||
|
||||
/// Cross-platform command-line AV1 / VP9 / HEVC / H264 encoding framework with per scene quality encoding
|
||||
|
|
@ -145,3 +150,162 @@ pub struct Args {
|
|||
#[structopt(long)]
|
||||
pub vmaf_filter: Option<String>,
|
||||
}
|
||||
|
||||
fn confirm(prompt: &str) -> io::Result<bool> {
|
||||
let mut buf = String::with_capacity(4);
|
||||
let mut stdout = io::stdout();
|
||||
let stdin = io::stdin();
|
||||
loop {
|
||||
stdout.write_all(prompt.as_bytes())?;
|
||||
stdout.flush()?;
|
||||
stdin.read_line(&mut buf)?;
|
||||
|
||||
match buf.as_str() {
|
||||
"y\n" | "Y\n" => break Ok(true),
|
||||
"n\n" | "N\n" => break Ok(false),
|
||||
other => {
|
||||
println!(
|
||||
"Sorry, response {:?} is not understood.",
|
||||
&other.get(..other.len().saturating_sub(1)).unwrap_or("")
|
||||
);
|
||||
buf.clear();
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn cli() -> anyhow::Result<()> {
|
||||
let args = Args::from_args();
|
||||
|
||||
let temp = if let Some(path) = args.temp {
|
||||
path.to_str().unwrap().to_owned()
|
||||
} else {
|
||||
format!(".{}", hash_path(&args.input.to_str().unwrap().to_owned()))
|
||||
};
|
||||
|
||||
// TODO parse with normal (non proc-macro) clap methods to simplify this
|
||||
// Unify Project/Args
|
||||
let mut project = Project {
|
||||
frames: 0,
|
||||
is_vs: is_vapoursynth(args.input.to_str().unwrap()),
|
||||
logging: if let Some(log_file) = args.logging {
|
||||
Path::new(&format!("{}.log", log_file)).to_owned()
|
||||
} else {
|
||||
Path::new(&temp).join("log.log")
|
||||
},
|
||||
ffmpeg: if let Some(s) = args.ffmpeg {
|
||||
shlex::split(&s).unwrap_or_else(Vec::new)
|
||||
} else {
|
||||
Vec::new()
|
||||
},
|
||||
temp,
|
||||
force: args.force,
|
||||
passes: if let Some(passes) = args.passes {
|
||||
passes
|
||||
} else {
|
||||
args.encoder.get_default_pass()
|
||||
},
|
||||
video_params: if let Some(params) = args.video_params {
|
||||
shlex::split(¶ms).unwrap_or_else(Vec::new)
|
||||
} else {
|
||||
Vec::new()
|
||||
},
|
||||
output_file: if let Some(output) = args.output_file {
|
||||
if output.exists() {
|
||||
if !confirm(&format!(
|
||||
"Output file {:?} exists. Do you want to overwrite it? [Y/n]: ",
|
||||
output
|
||||
))? {
|
||||
println!("Not overwriting, aborting.");
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
let output = PathAbs::new(output).context(
|
||||
"Failed to canonicalize output path: the output file must have a valid parent directory",
|
||||
)?;
|
||||
|
||||
if !output
|
||||
.parent()
|
||||
.expect("Failed to get parent directory of canonicalized path")
|
||||
.exists()
|
||||
{
|
||||
eprintln!("Path to file is invalid: {:?}", &output);
|
||||
std::process::exit(1);
|
||||
}
|
||||
|
||||
output.to_str().unwrap().to_owned()
|
||||
} else {
|
||||
let default_path = format!(
|
||||
"{}_{}.mkv",
|
||||
args.input.file_stem().unwrap().to_str().unwrap(),
|
||||
args.encoder
|
||||
);
|
||||
|
||||
if PathBuf::from(&default_path).exists() {
|
||||
if !confirm(&format!(
|
||||
"Default output file {:?} exists. Do you want to overwrite it? [Y/n]: ",
|
||||
&default_path
|
||||
))? {
|
||||
println!("Not overwriting, aborting.");
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
default_path
|
||||
},
|
||||
audio_params: if let Some(params) = args.audio_params {
|
||||
shlex::split(¶ms).unwrap_or_else(|| vec!["-c:a".into(), "copy".into()])
|
||||
} else {
|
||||
vec!["-c:a".into(), "copy".into()]
|
||||
},
|
||||
ffmpeg_pipe: Vec::new(),
|
||||
chunk_method: args
|
||||
.chunk_method
|
||||
.unwrap_or_else(|| vapoursynth::select_chunk_method().unwrap()),
|
||||
concat: args.concat,
|
||||
encoder: args.encoder,
|
||||
extra_splits_len: Some(args.extra_split),
|
||||
input: args.input.to_str().unwrap().to_owned(),
|
||||
keep: args.keep,
|
||||
min_q: args.min_q,
|
||||
max_q: args.max_q,
|
||||
min_scene_len: args.min_scene_len,
|
||||
n_threads: args.vmaf_threads,
|
||||
pix_format: args.pix_format,
|
||||
probe_slow: args.probe_slow,
|
||||
probes: args.probes,
|
||||
probing_rate: args.probing_rate,
|
||||
resume: args.resume,
|
||||
scenes: args
|
||||
.scenes
|
||||
.map(|scenes| scenes.to_str().unwrap().to_owned()),
|
||||
split_method: args.split_method,
|
||||
target_quality: args.target_quality,
|
||||
target_quality_method: Some(args.target_quality_method),
|
||||
verbosity: if args.quiet {
|
||||
Verbosity::Quiet
|
||||
} else if args.verbose {
|
||||
Verbosity::Verbose
|
||||
} else {
|
||||
Verbosity::Normal
|
||||
},
|
||||
vmaf: args.vmaf,
|
||||
vmaf_filter: args.vmaf_filter,
|
||||
vmaf_path: args.vmaf_path,
|
||||
vmaf_res: Some(args.vmaf_res),
|
||||
workers: args.workers,
|
||||
};
|
||||
|
||||
ctrlc::set_handler(|| {
|
||||
println!("Stopped");
|
||||
std::process::exit(0);
|
||||
})
|
||||
.unwrap();
|
||||
|
||||
project.startup_check()?;
|
||||
project.encode_file();
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,169 +0,0 @@
|
|||
use std::io::{self, Write};
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use anyhow::Context;
|
||||
use av1an_cli::Args;
|
||||
use av1an_core::vapoursynth;
|
||||
use av1an_core::{hash_path, is_vapoursynth, Project, Verbosity};
|
||||
use path_abs::{PathAbs, PathInfo};
|
||||
|
||||
use structopt::StructOpt;
|
||||
|
||||
fn confirm(prompt: &str) -> io::Result<bool> {
|
||||
let mut buf = String::with_capacity(4);
|
||||
let mut stdout = io::stdout();
|
||||
let stdin = io::stdin();
|
||||
loop {
|
||||
stdout.write_all(prompt.as_bytes())?;
|
||||
stdout.flush()?;
|
||||
stdin.read_line(&mut buf)?;
|
||||
|
||||
match buf.as_str() {
|
||||
"y\n" | "Y\n" => break Ok(true),
|
||||
"n\n" | "N\n" => break Ok(false),
|
||||
other => {
|
||||
println!(
|
||||
"Sorry, response {:?} is not understood.",
|
||||
&other.get(..other.len().saturating_sub(1)).unwrap_or("")
|
||||
);
|
||||
buf.clear();
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn main() -> anyhow::Result<()> {
|
||||
let args = Args::from_args();
|
||||
|
||||
let temp = if let Some(path) = args.temp {
|
||||
path.to_str().unwrap().to_owned()
|
||||
} else {
|
||||
format!(".{}", hash_path(&args.input.to_str().unwrap().to_owned()))
|
||||
};
|
||||
|
||||
// TODO parse with normal (non proc-macro) clap methods to simplify this
|
||||
// Unify Project/Args
|
||||
let mut project = Project {
|
||||
frames: 0,
|
||||
is_vs: is_vapoursynth(args.input.to_str().unwrap()),
|
||||
logging: if let Some(log_file) = args.logging {
|
||||
Path::new(&format!("{}.log", log_file)).to_owned()
|
||||
} else {
|
||||
Path::new(&temp).join("log.log")
|
||||
},
|
||||
ffmpeg: if let Some(s) = args.ffmpeg {
|
||||
shlex::split(&s).unwrap_or_else(Vec::new)
|
||||
} else {
|
||||
Vec::new()
|
||||
},
|
||||
temp,
|
||||
force: args.force,
|
||||
passes: if let Some(passes) = args.passes {
|
||||
passes
|
||||
} else {
|
||||
args.encoder.get_default_pass()
|
||||
},
|
||||
video_params: if let Some(params) = args.video_params {
|
||||
shlex::split(¶ms).unwrap_or_else(Vec::new)
|
||||
} else {
|
||||
Vec::new()
|
||||
},
|
||||
output_file: if let Some(output) = args.output_file {
|
||||
if output.exists() {
|
||||
if !confirm(&format!(
|
||||
"Output file {:?} exists. Do you want to overwrite it? [Y/n]: ",
|
||||
output
|
||||
))? {
|
||||
println!("Not overwriting, aborting.");
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
let output = PathAbs::new(output).context(
|
||||
"Failed to canonicalize output path: the output file must have a valid parent directory",
|
||||
)?;
|
||||
|
||||
if !output
|
||||
.parent()
|
||||
.expect("Failed to get parent directory of canonicalized path")
|
||||
.exists()
|
||||
{
|
||||
eprintln!("Path to file is invalid: {:?}", &output);
|
||||
std::process::exit(1);
|
||||
}
|
||||
|
||||
output.to_str().unwrap().to_owned()
|
||||
} else {
|
||||
let default_path = format!(
|
||||
"{}_{}.mkv",
|
||||
args.input.file_stem().unwrap().to_str().unwrap(),
|
||||
args.encoder
|
||||
);
|
||||
|
||||
if PathBuf::from(&default_path).exists() {
|
||||
if !confirm(&format!(
|
||||
"Default output file {:?} exists. Do you want to overwrite it? [Y/n]: ",
|
||||
&default_path
|
||||
))? {
|
||||
println!("Not overwriting, aborting.");
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
default_path
|
||||
},
|
||||
audio_params: if let Some(params) = args.audio_params {
|
||||
shlex::split(¶ms).unwrap_or_else(|| vec!["-c:a".into(), "copy".into()])
|
||||
} else {
|
||||
vec!["-c:a".into(), "copy".into()]
|
||||
},
|
||||
ffmpeg_pipe: Vec::new(),
|
||||
chunk_method: args
|
||||
.chunk_method
|
||||
.unwrap_or_else(|| vapoursynth::select_chunk_method().unwrap()),
|
||||
concat: args.concat,
|
||||
encoder: args.encoder,
|
||||
extra_splits_len: Some(args.extra_split),
|
||||
input: args.input.to_str().unwrap().to_owned(),
|
||||
keep: args.keep,
|
||||
min_q: args.min_q,
|
||||
max_q: args.max_q,
|
||||
min_scene_len: args.min_scene_len,
|
||||
n_threads: args.vmaf_threads,
|
||||
pix_format: args.pix_format,
|
||||
probe_slow: args.probe_slow,
|
||||
probes: args.probes,
|
||||
probing_rate: args.probing_rate,
|
||||
resume: args.resume,
|
||||
scenes: args
|
||||
.scenes
|
||||
.map(|scenes| scenes.to_str().unwrap().to_owned()),
|
||||
split_method: args.split_method,
|
||||
target_quality: args.target_quality,
|
||||
target_quality_method: Some(args.target_quality_method),
|
||||
verbosity: if args.quiet {
|
||||
Verbosity::Quiet
|
||||
} else if args.verbose {
|
||||
Verbosity::Verbose
|
||||
} else {
|
||||
Verbosity::Normal
|
||||
},
|
||||
vmaf: args.vmaf,
|
||||
vmaf_filter: args.vmaf_filter,
|
||||
vmaf_path: args.vmaf_path,
|
||||
vmaf_res: Some(args.vmaf_res),
|
||||
workers: args.workers,
|
||||
};
|
||||
|
||||
ctrlc::set_handler(|| {
|
||||
println!("Stopped");
|
||||
std::process::exit(0);
|
||||
})
|
||||
.unwrap();
|
||||
|
||||
project.startup_check()?;
|
||||
project.encode_file();
|
||||
|
||||
Ok(())
|
||||
}
|
||||
Loading…
Reference in a new issue