chaos/musicutil
1
0
Fork 0
Code Issues Releases Activity

add auto preset detection on transcode command

Browse source
This commit is contained in:
chaos 2023-11-12 15:47:01 +00:00
parent d9154f3373
commit fb55fc45b1
No known key found for this signature in database
2 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ffprobe/src/lib.rs
View file

@ -35,10 +35,12 @@ fn extract(
})); }));
} }
let output = String::from_utf8(output.stdout).unwrap(); let output = String::from_utf8(output.stdout).unwrap();
let ffprobe_out: serde_json::Result<ffprobe_output::FFProbeOutput> = let ffprobe_out: serde_json::Result<ffprobe_output::FFProbeOutput> =
serde_json::from_str(output.as_str()); serde_json::from_str(output.as_str());
Ok(ffprobe_out.unwrap()) Ok(ffprobe_out.unwrap())
} }

44
src/commands/transcode.rs
View file

@ -30,24 +30,49 @@ pub fn transcode_command(
_args: CLIArgs, _args: CLIArgs,
transcode_args: &TranscodeCommandArgs, transcode_args: &TranscodeCommandArgs,
) -> Result<(), Box<dyn std::error::Error>> { ) -> Result<(), Box<dyn std::error::Error>> {
if let Some(preset) = &transcode_args.preset { let input_file = AudioFile::from_path("".to_string(), PathBuf::from(&transcode_args.source));
if preset == "list" { let output_file = AudioFile::from_path("".to_string(), PathBuf::from(&transcode_args.dest));
print_presets();
exit(0); let mut preset = transcode_args.preset.clone().unwrap_or("auto".to_string());
if preset == "list" {
print_presets();
exit(0);
}
if preset == "auto" && transcode_args.transcode_config.is_none() {
let extension = output_file
.extension()
.clone()
.expect("a extension is required for the output file");
preset = match extension.as_str() {
"mp3" => "mp3-v2",
"opus" => "opus-96k",
"flac" => "flac",
"ogg" => "vorbis-v6",
_ => {
println!(
"could not auto determine a suitable transcode preset for extension '{}'",
output_file.extension().unwrap()
);
exit(0);
}
} }
.to_string();
} }
let transcode_config = transcode_preset_or_config( let transcode_config = transcode_preset_or_config(
transcode_args.preset.as_ref(), match transcode_args.transcode_config {
Some(_) => None,
None => Some(&preset),
},
transcode_args.transcode_config.as_ref(), transcode_args.transcode_config.as_ref(),
) )
.expect("transcode config error"); .expect("transcode config error");
println!("Transcoding"); println!("Transcoding");
let input_file = AudioFile::from_path("".to_string(), PathBuf::from(&transcode_args.source));
let output_file = AudioFile::from_path("".to_string(), PathBuf::from(&transcode_args.dest));
if !transcode_args.ignore_extension { if !transcode_args.ignore_extension {
if let Some(ref file_extension) = transcode_config.file_extension { if let Some(ref file_extension) = transcode_config.file_extension {
if Some(file_extension) != output_file.extension().as_ref() { if Some(file_extension) != output_file.extension().as_ref() {
@ -58,7 +83,8 @@ pub fn transcode_command(
"please change it to {} ", "please change it to {} ",
"or run with --ignore-extension" "or run with --ignore-extension"
), ),
output_file.extension().unwrap(), file_extension output_file.extension().unwrap(),
file_extension
); );
} }
} }