tsk-45: Identify type of Song (#48)
All checks were successful
Release Tagging / release (push) Successful in 40s
Rust Build / Check (push) Successful in 44s
Rust Build / Test Suite (push) Successful in 42s
Rust Build / build (push) Successful in 54s
Rust Build / Clippy (push) Successful in 38s
Rust Build / Rustfmt (push) Successful in 43s
All checks were successful
Release Tagging / release (push) Successful in 40s
Rust Build / Check (push) Successful in 44s
Rust Build / Test Suite (push) Successful in 42s
Rust Build / build (push) Successful in 54s
Rust Build / Clippy (push) Successful in 38s
Rust Build / Rustfmt (push) Successful in 43s
Closes #45 Reviewed-on: #48 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
@@ -1,8 +1,16 @@
|
||||
/// Gets the file type of a CoverArt given it's path
|
||||
pub fn file_type_from_filepath(filepath: &str) -> Result<String, std::io::Error> {
|
||||
pub fn file_type_from_filepath(
|
||||
filepath: &str,
|
||||
) -> Result<crate::detection::FileType, std::io::Error> {
|
||||
match imghdr::from_file(filepath) {
|
||||
Ok(Some(imghdr::Type::Jpeg)) => Ok(String::from("jpeg")),
|
||||
Ok(Some(imghdr::Type::Png)) => Ok(String::from("png")),
|
||||
Ok(Some(imghdr::Type::Jpeg)) => Ok(crate::detection::FileType {
|
||||
mime: String::from(constants::mime::JPEG),
|
||||
file_type: String::from(constants::JPEG_TYPE),
|
||||
}),
|
||||
Ok(Some(imghdr::Type::Png)) => Ok(crate::detection::FileType {
|
||||
mime: String::from(constants::mime::PNG),
|
||||
file_type: String::from(constants::PNG_TYPE),
|
||||
}),
|
||||
Ok(None) => Err(std::io::Error::other("Image file not supported")),
|
||||
Err(err) => Err(err),
|
||||
_ => Err(std::io::Error::other("Image file not supported")),
|
||||
@@ -10,15 +18,32 @@ pub fn file_type_from_filepath(filepath: &str) -> Result<String, std::io::Error>
|
||||
}
|
||||
|
||||
/// Gets the file type of a CoverArt given it's data
|
||||
pub fn file_type_from_data(data: &Vec<u8>) -> Result<String, std::io::Error> {
|
||||
pub fn file_type_from_data(data: &Vec<u8>) -> Result<crate::detection::FileType, std::io::Error> {
|
||||
match imghdr::from_bytes(data) {
|
||||
Some(imghdr::Type::Jpeg) => Ok(String::from("jpeg")),
|
||||
Some(imghdr::Type::Png) => Ok(String::from("png")),
|
||||
Some(imghdr::Type::Jpeg) => Ok(crate::detection::FileType {
|
||||
mime: String::from(constants::mime::JPEG),
|
||||
file_type: String::from(constants::JPEG_TYPE),
|
||||
}),
|
||||
Some(imghdr::Type::Png) => Ok(crate::detection::FileType {
|
||||
mime: String::from(constants::mime::PNG),
|
||||
file_type: String::from(constants::PNG_TYPE),
|
||||
}),
|
||||
None => Err(std::io::Error::other("Image file not supported")),
|
||||
_ => Err(std::io::Error::other("Image file not supported")),
|
||||
}
|
||||
}
|
||||
|
||||
pub mod constants {
|
||||
pub const PNG_TYPE: &str = "png";
|
||||
pub const JPEG_TYPE: &str = "jpeg";
|
||||
pub const JPG_TYPE: &str = "jpg";
|
||||
|
||||
pub mod mime {
|
||||
pub const JPEG: &str = "image/jpeg";
|
||||
pub const PNG: &str = "image/png";
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
#[test]
|
||||
@@ -30,7 +55,8 @@ mod tests {
|
||||
match super::file_type_from_filepath(&filepath) {
|
||||
Ok(filetype) => {
|
||||
assert_eq!(
|
||||
filetype, "png",
|
||||
filetype.file_type,
|
||||
super::constants::PNG_TYPE,
|
||||
"The file type of the CoverArt should have been png"
|
||||
);
|
||||
}
|
||||
@@ -50,7 +76,8 @@ mod tests {
|
||||
match super::file_type_from_data(&data) {
|
||||
Ok(filetype) => {
|
||||
assert_eq!(
|
||||
filetype, "png",
|
||||
filetype.file_type,
|
||||
super::constants::PNG_TYPE,
|
||||
"The file type of the CoverArt should have been png"
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1 +1,8 @@
|
||||
pub mod coverart;
|
||||
pub mod song;
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
pub struct FileType {
|
||||
pub mime: String,
|
||||
pub file_type: String,
|
||||
}
|
||||
|
||||
90
src/detection/song.rs
Normal file
90
src/detection/song.rs
Normal file
@@ -0,0 +1,90 @@
|
||||
/// Gets the file type of a Song from it's path
|
||||
pub fn file_type_from_filepath(
|
||||
filepath: &str,
|
||||
) -> Result<crate::detection::FileType, std::io::Error> {
|
||||
match infer::get_from_path(filepath) {
|
||||
Ok(Some(kind)) => {
|
||||
let mime = kind.mime_type();
|
||||
if mime == constants::mime::FLAC {
|
||||
Ok(crate::detection::FileType {
|
||||
mime: String::from(mime),
|
||||
file_type: String::from(constants::FLAC_TYPE),
|
||||
})
|
||||
} else {
|
||||
Err(std::io::Error::other("Unsupported file type"))
|
||||
}
|
||||
}
|
||||
Ok(None) => Err(std::io::Error::other("File type not determined")),
|
||||
Err(err) => Err(err),
|
||||
}
|
||||
}
|
||||
|
||||
/// Gets the file type of a Song given it's data
|
||||
pub fn file_type_from_data(data: &[u8]) -> Result<crate::detection::FileType, std::io::Error> {
|
||||
match infer::get(data) {
|
||||
Some(kind) => {
|
||||
let mime = kind.mime_type();
|
||||
if mime == constants::mime::FLAC {
|
||||
Ok(crate::detection::FileType {
|
||||
mime: String::from(mime),
|
||||
file_type: String::from(constants::FLAC_TYPE),
|
||||
})
|
||||
} else {
|
||||
Err(std::io::Error::other("Unsupported file type"))
|
||||
}
|
||||
}
|
||||
None => Err(std::io::Error::other("File type not determined")),
|
||||
}
|
||||
}
|
||||
|
||||
pub mod constants {
|
||||
pub const FLAC_TYPE: &str = "flac";
|
||||
|
||||
pub mod mime {
|
||||
pub const FLAC: &str = "audio/x-flac";
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
#[test]
|
||||
fn test_song_file_type() {
|
||||
let directory = String::from(crate::test_util::util::TESTFILEDIRECTORY);
|
||||
let filename = String::from("track01.flac");
|
||||
let filepath = format!("{directory}/{filename}");
|
||||
|
||||
match super::file_type_from_filepath(&filepath) {
|
||||
Ok(filetype) => {
|
||||
assert_eq!(
|
||||
filetype.file_type,
|
||||
crate::detection::song::constants::FLAC_TYPE,
|
||||
"Types do not match"
|
||||
)
|
||||
}
|
||||
Err(err) => {
|
||||
assert!(false, "Error: {err:?}")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_song_file_type_from_data() {
|
||||
let directory = String::from(crate::test_util::util::TESTFILEDIRECTORY);
|
||||
let filename = String::from("track01.flac");
|
||||
let filepath = format!("{directory}/{filename}");
|
||||
let data = crate::test_util::util::get_data_from_file(&filepath).unwrap();
|
||||
|
||||
match super::file_type_from_data(&data) {
|
||||
Ok(filetype) => {
|
||||
assert_eq!(
|
||||
filetype.file_type,
|
||||
crate::detection::song::constants::FLAC_TYPE,
|
||||
"Types do not match"
|
||||
)
|
||||
}
|
||||
Err(err) => {
|
||||
assert!(false, "Error: {err:?}")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user