bump xmodits-lib

Author: B0ney

Cargo.toml

@@ -2,7 +2,7 @@
 name = "xmodits_py"
 authors = ["B0ney - https://github.com/B0ney"]
 description = "Extract samples from tracker modules. Supports IT, XM, S3M, MOD, UMX, MPTM"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2021"
 license = "LGPLv3"
 readme = "README.md"
@@ -15,7 +15,7 @@ crate-type = ["cdylib"]
 
 [dependencies.xmodits-lib]
 git = "https://github.com/B0ney/xmodits-lib"
-rev = "ce5d922"
+rev = "1773dfb"
 
 [dependencies.pyo3]
 version = "0.19.1"

src/api.rs

@@ -2,11 +2,8 @@ use crate::error::{APIError, Error};
 
 // use std::cmp::Ordering;
 use std::path::Path;
-use xmodits_lib::common::{extract, SUPPORTED_EXTENSIONS};
-use xmodits_lib::exporter::AudioFormat;
-use xmodits_lib::interface::ripper::Ripper;
-// use xmodits_lib::interface::Error as XmoditsError;
-use xmodits_lib::SampleNamer;
+use xmodits_lib::export::{extract, Format, Ripper, SampleNamer};
+use xmodits_lib::SUPPORTED_EXTENSIONS;
 
 pub fn rip(
     path: &String,
@@ -61,19 +58,19 @@ pub fn verify_extension(path: &String, strict: bool) -> Result<(), APIError> {
     Ok(())
 }
 
-fn get_format(format: Option<String>) -> Result<AudioFormat, APIError> {
+fn get_format(format: Option<String>) -> Result<Format, APIError> {
     let Some(format) = format else {
-        return Ok(AudioFormat::WAV);
+        return Ok(Format::WAV);
     };
 
     let extension = format.to_lowercase();
     let format = match extension.as_str() {
-        "wav" => AudioFormat::WAV,
-        "aiff" => AudioFormat::AIFF,
-        "8svx" => AudioFormat::IFF,
-        "its" => AudioFormat::ITS,
-        "s3i" => AudioFormat::S3I,
-        "raw" => AudioFormat::RAW,
+        "wav" => Format::WAV,
+        "aiff" => Format::AIFF,
+        "8svx" => Format::IFF,
+        "its" => Format::ITS,
+        "s3i" => Format::S3I,
+        "raw" => Format::RAW,
         _ => return Err(APIError::UnrecognizedFileExtension(extension)),
     };
     Ok(format)

src/error.rs

@@ -1,7 +1,7 @@
 use pyo3::exceptions::PyIOError;
 use pyo3::PyErr;
-use xmodits_lib::interface::errors::{ExtractionError, FailedExtraction};
-use xmodits_lib::interface::Error as XmoditsError;
+
+use xmodits_lib::error::{Error as XmoditsError, ExtractionError, FailedExtraction};
 
 macro_rules! batch_create_exceptions {
     ($($EXCEPTION:ident) *) => {