diff --git a/Cargo.lock b/Cargo.lock index d6f0029..7a5f020 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1054,8 +1054,8 @@ dependencies = [ [[package]] name = "xmodits-lib" -version = "0.9.0" -source = "git+https://github.com/B0ney/xmodits-lib.git?rev=c2ef080#c2ef0800870549650913b8c3499b592fc74a914a" +version = "0.9.2" +source = "git+https://github.com/B0ney/xmodits-lib.git?rev=6f4da08#6f4da08592127078064d86eac9ae4d6e73425091" dependencies = [ "ascii", "bytemuck", diff --git a/Cargo.toml b/Cargo.toml index f67264c..2fb11ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/B0ney/xmodits-cli" [dependencies.xmodits-lib] git = "https://github.com/B0ney/xmodits-lib.git" -rev = "c2ef080" +rev = "6f4da08" [dependencies] clap = { version = "4", features = ["derive", "cargo", "wrap_help"] } diff --git a/src/api.rs b/src/api.rs index 44148d0..bd00551 100644 --- a/src/api.rs +++ b/src/api.rs @@ -3,7 +3,7 @@ use std::path::{Path, PathBuf}; use xmodits_lib::info::Info; use xmodits_lib::{ - export::{Format, Ripper, SampleNamer, SampleNamerTrait}, + export::{AudioFormat, Ripper, SampleNamer, SampleNamerTrait}, extract, }; @@ -51,7 +51,7 @@ pub fn info(cli: Cli) { } pub fn rip(cli: Cli, destination: PathBuf) { - let ripper = Ripper::new(build_namer(&cli), get_format(&cli.format).into()); + let ripper = Ripper::new(build_namer(&cli), get_format(&cli.format)); let filter = strict_loading(cli.strict); let files: Vec = cli @@ -103,7 +103,7 @@ pub fn rip(cli: Cli, destination: PathBuf) { println!("Done!"); } -fn get_format(format: &str) -> Format { +fn get_format(format: &str) -> AudioFormat { format.parse().unwrap_or_default() }