OGG: Fix reading error handling

Author: Serial-ATA

src/ogg/read.rs

@@ -77,7 +77,7 @@ where
 		len -= u64::from(comment_len);
 
 		// KEY=VALUE
-		let mut comment_split = comment_bytes.splitn(2, b'=');
+		let mut comment_split = comment_bytes.splitn(2, |b| *b == b'=');
 
 		let key = match comment_split.next() {
 			Some(k) => k,
@@ -92,32 +92,34 @@ where
 
 		match key {
 			k if k.eq_ignore_ascii_case(b"METADATA_BLOCK_PICTURE") => {
-				let Ok(picture) = Picture::from_flac_bytes(value, true) else {
-					if parse_mode == ParsingMode::Strict {
-						return Err(e);
-					}
-
-					log::warn!("Failed to decode FLAC picture, discarding field");
-					continue;
-				};
-
-				tag.pictures.push(picture)
+				match Picture::from_flac_bytes(value, true) {
+					Ok(picture) => tag.pictures.push(picture),
+					Err(e) => {
+						if parse_mode == ParsingMode::Strict {
+							return Err(e);
+						}
+
+						log::warn!("Failed to decode FLAC picture, discarding field");
+						continue;
+					},
+				}
 			},
 			// The valid range is 0x20..=0x7D not including 0x3D
-			k if k.iter().all(|c| (b' '..=b'}').contains(c) && c != b'=') => {
+			k if k.iter().all(|c| (b' '..=b'}').contains(c) && *c != b'=') => {
 				// SAFETY: We just verified that all of the bytes fall within the subset of ASCII
 				let key = unsafe { String::from_utf8_unchecked(k.to_vec()) };
 
-				let Ok(value) = String::from_utf8(value.to_vec()) else {
-					if parse_mode == ParsingMode::Strict {
-						decode_err!(@BAIL "OGG: Vorbis comments contain a non UTF-8 field value");
-					}
-
-					log::warn!("Non UTF-8 value found, discarding field");
-					continue;
-				};
-
-				tag.items.push((key, value))
+				match String::from_utf8(value.to_vec()) {
+					Ok(value) => tag.items.push((key, value)),
+					Err(e) => {
+						if parse_mode == ParsingMode::Strict {
+							return Err(LoftyError::new(ErrorKind::StringFromUtf8(e)));
+						}
+
+						log::warn!("Non UTF-8 value found, discarding field");
+						continue;
+					},
+				}
 			},
 			_ => {
 				parse_mode_choice!(