error: Move ErrorKind::BadAtom to aud_io

Author: Serial-ATA

lofty/src/error.rs

@@ -50,9 +50,7 @@ pub enum ErrorKind {
 	BadTimestamp(&'static str),
 	/// Errors that arise while reading/writing ID3v2 tags
 	Id3v2(Id3v2Error),
-
-	/// Arises when an atom contains invalid data
-	BadAtom(&'static str),
+	
 	/// Arises when attempting to use [`Atom::merge`](crate::mp4::Atom::merge) with mismatching identifiers
 	AtomMismatch,
 
@@ -521,7 +519,6 @@ impl Display for LoftyError {
 				write!(f, "Encountered an invalid timestamp: {message}")
 			},
 			ErrorKind::Id3v2(ref id3v2_err) => write!(f, "{id3v2_err}"),
-			ErrorKind::BadAtom(message) => write!(f, "MP4 Atom: {message}"),
 			ErrorKind::AtomMismatch => write!(
 				f,
 				"MP4 Atom: Attempted to use `Atom::merge()` with mismatching identifiers"

lofty/src/mp4/ilst/read.rs

@@ -4,7 +4,7 @@ use super::{Atom, AtomData, AtomIdent, Ilst};
 use crate::config::{ParseOptions, ParsingMode};
 use crate::error::{LoftyError, Result};
 use crate::id3::v1::constants::GENRES;
-use crate::macros::{err, try_vec};
+use crate::macros::try_vec;
 use crate::mp4::ilst::atom::AtomDataStorage;
 use crate::mp4::read::skip_atom;
 use crate::picture::{MimeType, Picture, PictureType};
@@ -13,6 +13,7 @@ use crate::tag::TagExt;
 use std::borrow::Cow;
 use std::io::{Cursor, Read, Seek, SeekFrom};
 
+use aud_io::err as io_err;
 use aud_io::text::{utf8_decode, utf16_decode_bytes};
 use aud_io::mp4::{ATOM_HEADER_LEN, AtomInfo, AtomReader};
 
@@ -259,15 +260,15 @@ where
 				next_atom.len
 			);
 			if parsing_mode == ParsingMode::Strict {
-				err!(BadAtom("Data atom is too small"))
+				io_err!(BadAtom("Data atom is too small"))
 			}
 
 			break;
 		}
 
 		if next_atom.ident != DATA_ATOM_IDENT {
 			if parsing_mode == ParsingMode::Strict {
-				err!(BadAtom("Expected atom \"data\" to follow name"))
+				io_err!(BadAtom("Expected atom \"data\" to follow name"))
 			}
 
 			log::warn!(
@@ -323,7 +324,7 @@ where
 	let type_set = reader.read_u8()?;
 	if type_set != WELL_KNOWN_TYPE_SET {
 		if parsing_mode == ParsingMode::Strict {
-			err!(BadAtom("Unknown type set in data atom"))
+			io_err!(BadAtom("Unknown type set in data atom"))
 		}
 
 		return Ok(None);
@@ -338,7 +339,7 @@ fn parse_uint(bytes: &[u8]) -> Result<u32> {
 		2 => u32::from(u16::from_be_bytes([bytes[0], bytes[1]])),
 		3 => u32::from_be_bytes([0, bytes[0], bytes[1], bytes[2]]),
 		4 => u32::from_be_bytes([bytes[0], bytes[1], bytes[2], bytes[3]]),
-		_ => err!(BadAtom(
+		_ => io_err!(BadAtom(
 			"Unexpected atom size for type \"BE unsigned integer\""
 		)),
 	})
@@ -350,7 +351,7 @@ fn parse_int(bytes: &[u8]) -> Result<i32> {
 		2 => i32::from(i16::from_be_bytes([bytes[0], bytes[1]])),
 		3 => i32::from_be_bytes([0, bytes[0], bytes[1], bytes[2]]),
 		4 => i32::from_be_bytes([bytes[0], bytes[1], bytes[2], bytes[3]]),
-		_ => err!(BadAtom(
+		_ => io_err!(BadAtom(
 			"Unexpected atom size for type \"BE signed integer\""
 		)),
 	})
@@ -380,7 +381,7 @@ where
 				DataType::Bmp => Some(MimeType::Bmp),
 				_ => {
 					if parsing_mode == ParsingMode::Strict {
-						err!(BadAtom("\"covr\" atom has an unknown type"))
+						io_err!(BadAtom("\"covr\" atom has an unknown type"))
 					}
 
 					log::warn!(

lofty/src/mp4/properties.rs

@@ -1,12 +1,13 @@
 use super::read::{find_child_atom, skip_atom};
 use crate::config::ParsingMode;
 use crate::error::{LoftyError, Result};
-use crate::macros::{decode_err, err, try_vec};
+use crate::macros::{decode_err, try_vec};
 use crate::properties::FileProperties;
 
 use std::io::{Cursor, Read, Seek, SeekFrom};
 use std::time::Duration;
 
+use aud_io::err as io_err;
 use aud_io::mp4::{AtomReader, AtomIdent, AtomInfo};
 use aud_io::alloc::VecFallibleCapacity;
 use aud_io::math::RoundedDivision;
@@ -285,7 +286,7 @@ where
 	}
 
 	let Some(mdhd) = mdhd else {
-		err!(BadAtom("Expected atom \"trak.mdia.mdhd\""));
+		io_err!(BadAtom("Expected atom \"trak.mdia.mdhd\""));
 	};
 
 	Ok(AudioTrak { mdhd, minf })
@@ -433,11 +434,11 @@ where
 
 	for _ in 0..num_sample_entries {
 		let Some(atom) = reader.next()? else {
-			err!(BadAtom("Expected sample entry atom in `stsd` atom"))
+			io_err!(BadAtom("Expected sample entry atom in `stsd` atom"))
 		};
 
 		let AtomIdent::Fourcc(ref fourcc) = atom.ident else {
-			err!(BadAtom("Expected fourcc atom in `stsd` atom"))
+			io_err!(BadAtom("Expected fourcc atom in `stsd` atom"))
 		};
 
 		match fourcc {

lofty/src/mp4/read.rs

@@ -2,7 +2,7 @@ use super::Mp4File;
 use super::moov::Moov;
 use super::properties::Mp4Properties;
 use crate::config::{ParseOptions, ParsingMode};
-use crate::error::{ErrorKind, LoftyError, Result};
+use crate::error::Result;
 use crate::macros::{decode_err, err};
 
 use std::io::{Read, Seek, SeekFrom};
@@ -36,11 +36,9 @@ where
 
 	reader.seek(SeekFrom::Current((atom.len - 12) as i64))?;
 
-	let major_brand = utf8_decode_str(&major_brand)
-		.map(ToOwned::to_owned)
-		.map_err(|_| {
-			LoftyError::new(ErrorKind::BadAtom("Unable to parse \"ftyp\"'s major brand"))
-		})?;
+	let Ok(major_brand) = utf8_decode_str(&major_brand).map(ToOwned::to_owned) else {
+		io_err!(BadAtom("Unable to parse \"ftyp\"'s major brand"));
+	};
 
 	log::debug!("Verified to be an MP4 file. Major brand: {}", major_brand);
 	Ok(major_brand)

lofty/src/mp4/write.rs

@@ -1,13 +1,13 @@
 use crate::config::ParsingMode;
 use crate::error::{LoftyError, Result};
 use crate::io::{FileLike, Length, Truncate};
-use crate::macros::err;
 use crate::mp4::read::{meta_is_full, skip_atom};
 
 use std::cell::{RefCell, RefMut};
 use std::io::{Cursor, Read, Seek, SeekFrom, Write};
 use std::ops::RangeBounds;
 
+use aud_io::err as io_err;
 use aud_io::mp4::{AtomIdent, AtomInfo, IDENTIFIER_LEN};
 use byteorder::{BigEndian, WriteBytesExt};
 
@@ -75,7 +75,7 @@ impl ContextualAtom {
 
 		if len != 0 {
 			// TODO: Print the container ident
-			err!(BadAtom("Unable to read entire container"));
+			io_err!(BadAtom("Unable to read entire container"));
 		}
 
 		*reader_len = reader_len.saturating_sub(info.len);