aud_io: Move ParsingMode from lofty

Author: Serial-ATA

aud_io/src/config/mod.rs

@@ -1,3 +1,5 @@
 mod global_options;
-
 pub use global_options::*;
+
+mod parse;
+pub use parse::*;

aud_io/src/config/parse.rs

@@ -0,0 +1,52 @@
+/// The parsing strictness mode
+///
+/// This can be set with [`Probe::options`](crate::probe::Probe).
+///
+/// # Examples
+///
+/// ```rust,no_run
+/// use lofty::config::{ParseOptions, ParsingMode};
+/// use lofty::probe::Probe;
+///
+/// # fn main() -> lofty::error::Result<()> {
+/// // We only want to read spec-compliant inputs
+/// let parsing_options = ParseOptions::new().parsing_mode(ParsingMode::Strict);
+/// let tagged_file = Probe::open("foo.mp3")?.options(parsing_options).read()?;
+/// # Ok(()) }
+/// ```
+#[derive(Copy, Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Default)]
+#[non_exhaustive]
+pub enum ParsingMode {
+	/// Will eagerly error on invalid input
+	///
+	/// This mode will eagerly error on any non-spec-compliant input.
+	///
+	/// ## Examples of behavior
+	///
+	/// * Unable to decode text - The parser will error and the entire input is discarded
+	/// * Unable to determine the sample rate - The parser will error and the entire input is discarded
+	Strict,
+	/// Default mode, less eager to error on recoverably malformed input
+	///
+	/// This mode will attempt to fill in any holes where possible in otherwise valid, spec-compliant input.
+	///
+	/// NOTE: A readable input does *not* necessarily make it writeable.
+	///
+	/// ## Examples of behavior
+	///
+	/// * Unable to decode text - If valid otherwise, the field will be replaced by an empty string and the parser moves on
+	/// * Unable to determine the sample rate - The sample rate will be 0
+	#[default]
+	BestAttempt,
+	/// Least eager to error, may produce invalid/partial output
+	///
+	/// This mode will discard any invalid fields, and ignore the majority of non-fatal errors.
+	///
+	/// If the input is malformed, the resulting tags may be incomplete, and the properties zeroed.
+	///
+	/// ## Examples of behavior
+	///
+	/// * Unable to decode text - The entire item is discarded and the parser moves on
+	/// * Unable to determine the sample rate - The sample rate will be 0
+	Relaxed,
+}

lofty/src/config/mod.rs

@@ -5,7 +5,7 @@ mod parse_options;
 mod write_options;
 
 pub use global_options::{GlobalOptions, apply_global_options};
-pub use parse_options::{ParseOptions, ParsingMode};
+pub use parse_options::*;
 pub use write_options::WriteOptions;
 
 pub(crate) use global_options::global_options;

lofty/src/config/parse_options.rs

@@ -1,3 +1,5 @@
+pub use aud_io::config::ParsingMode;
+
 /// Options to control how Lofty parses a file
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 #[non_exhaustive]
@@ -163,56 +165,3 @@ impl ParseOptions {
 		*self
 	}
 }
-
-/// The parsing strictness mode
-///
-/// This can be set with [`Probe::options`](crate::probe::Probe).
-///
-/// # Examples
-///
-/// ```rust,no_run
-/// use lofty::config::{ParseOptions, ParsingMode};
-/// use lofty::probe::Probe;
-///
-/// # fn main() -> lofty::error::Result<()> {
-/// // We only want to read spec-compliant inputs
-/// let parsing_options = ParseOptions::new().parsing_mode(ParsingMode::Strict);
-/// let tagged_file = Probe::open("foo.mp3")?.options(parsing_options).read()?;
-/// # Ok(()) }
-/// ```
-#[derive(Copy, Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Default)]
-#[non_exhaustive]
-pub enum ParsingMode {
-	/// Will eagerly error on invalid input
-	///
-	/// This mode will eagerly error on any non spec-compliant input.
-	///
-	/// ## Examples of behavior
-	///
-	/// * Unable to decode text - The parser will error and the entire input is discarded
-	/// * Unable to determine the sample rate - The parser will error and the entire input is discarded
-	Strict,
-	/// Default mode, less eager to error on recoverably malformed input
-	///
-	/// This mode will attempt to fill in any holes where possible in otherwise valid, spec-compliant input.
-	///
-	/// NOTE: A readable input does *not* necessarily make it writeable.
-	///
-	/// ## Examples of behavior
-	///
-	/// * Unable to decode text - If valid otherwise, the field will be replaced by an empty string and the parser moves on
-	/// * Unable to determine the sample rate - The sample rate will be 0
-	#[default]
-	BestAttempt,
-	/// Least eager to error, may produce invalid/partial output
-	///
-	/// This mode will discard any invalid fields, and ignore the majority of non-fatal errors.
-	///
-	/// If the input is malformed, the resulting tags may be incomplete, and the properties zeroed.
-	///
-	/// ## Examples of behavior
-	///
-	/// * Unable to decode text - The entire item is discarded and the parser moves on
-	/// * Unable to determine the sample rate - The sample rate will be 0
-	Relaxed,
-}

lofty/src/id3/v2/frame/read.rs

@@ -43,16 +43,15 @@ impl ParsedFrame<'_> {
 			},
 			Ok(Some(some)) => some,
 			Err(err) => {
-				match parse_options.parsing_mode {
-					ParsingMode::Strict => return Err(err),
-					ParsingMode::BestAttempt | ParsingMode::Relaxed => {
-						log::warn!("Failed to read frame header, skipping: {}", err);
-
-						// Skip this frame and continue reading
-						skip_frame(reader, size)?;
-						return Ok(Self::Skip);
-					},
+				if parse_options.parsing_mode == ParsingMode::Strict {
+					return Err(err);
 				}
+
+				log::warn!("Failed to read frame header, skipping: {}", err);
+
+				// Skip this frame and continue reading
+				skip_frame(reader, size)?;
+				return Ok(Self::Skip);
 			},
 		};
 

lofty/src/mp4/atom_info.rs

@@ -146,15 +146,12 @@ impl AtomInfo {
 			// Seek to the end, since we can't recover from this
 			data.seek(SeekFrom::End(0))?;
 
-			match parse_mode {
-				ParsingMode::Strict => {
-					err!(BadAtom("Encountered an atom with invalid characters"));
-				},
-				ParsingMode::BestAttempt | ParsingMode::Relaxed => {
-					log::warn!("Encountered an atom with invalid characters, stopping");
-					return Ok(None);
-				},
+			if parse_mode == ParsingMode::Strict {
+				err!(BadAtom("Encountered an atom with invalid characters"));
 			}
+
+			log::warn!("Encountered an atom with invalid characters, stopping");
+			return Ok(None);
 		}
 
 		let (len, extended) = match len_raw {

lofty/src/mp4/ilst/read.rs

@@ -182,13 +182,12 @@ where
 	R: Read + Seek,
 {
 	let handle_error = |err: LoftyError, parsing_mode: ParsingMode| -> Result<()> {
-		match parsing_mode {
-			ParsingMode::Strict => Err(err),
-			ParsingMode::BestAttempt | ParsingMode::Relaxed => {
-				log::warn!("Skipping atom with invalid content: {}", err);
-				Ok(())
-			},
+		if parsing_mode == ParsingMode::Strict {
+			return Err(err);
 		}
+
+		log::warn!("Skipping atom with invalid content: {err}");
+		Ok(())
 	};
 
 	if let Some(mut atom_data) = parse_data_inner(reader, parsing_mode, &atom_info)? {