Compare commits
1 Commits
v0.4.4-52-
...
v0.4.3-51-
| Author | SHA1 | Date | |
|---|---|---|---|
|
b9d9c7feeb
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -104,7 +104,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "icarus_meta"
|
||||
version = "0.4.4"
|
||||
version = "0.4.3"
|
||||
dependencies = [
|
||||
"imghdr",
|
||||
"infer",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "icarus_meta"
|
||||
version = "0.4.4"
|
||||
version = "0.4.3"
|
||||
edition = "2024"
|
||||
rust-version = "1.90"
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ pub struct FileType {
|
||||
pub file_type: String,
|
||||
}
|
||||
|
||||
|
||||
/// Initializes a FileType given a filetype passed.
|
||||
pub fn init_filetype(filetype: &str) -> Result<FileType, std::io::Error> {
|
||||
if filetype == song::constants::FLAC_TYPE {
|
||||
@@ -19,16 +20,12 @@ pub fn init_filetype(filetype: &str) -> Result<FileType, std::io::Error> {
|
||||
mime: String::from(coverart::constants::mime::PNG),
|
||||
file_type: String::from(coverart::constants::PNG_TYPE),
|
||||
})
|
||||
} else if filetype == coverart::constants::JPEG_TYPE
|
||||
|| filetype == coverart::constants::JPG_TYPE
|
||||
{
|
||||
} else if filetype == coverart::constants::JPEG_TYPE || filetype == coverart::constants::JPG_TYPE {
|
||||
Ok(FileType {
|
||||
mime: String::from(coverart::constants::mime::JPEG),
|
||||
file_type: String::from(coverart::constants::JPEG_TYPE),
|
||||
})
|
||||
} else {
|
||||
Err(std::io::Error::other(format!(
|
||||
"Unsupported FileType: {filetype:?}"
|
||||
)))
|
||||
Err(std::io::Error::other(format!("Unsupported FileType: {filetype:?}")))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,20 @@
|
||||
pub mod properties;
|
||||
use lofty::file::AudioFile;
|
||||
|
||||
pub fn get_duration(song_path: &String) -> Result<std::time::Duration, std::io::Error> {
|
||||
match std::fs::File::open(song_path) {
|
||||
Ok(mut content) => {
|
||||
match lofty::flac::FlacFile::read_from(&mut content, lofty::config::ParseOptions::new())
|
||||
{
|
||||
Ok(flac_file) => {
|
||||
let properties = flac_file.properties();
|
||||
Ok(properties.duration())
|
||||
}
|
||||
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||
}
|
||||
}
|
||||
Err(err) => Err(err),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
@@ -12,7 +28,7 @@ mod tests {
|
||||
match test_util::util::file_exists(&dir, &filename) {
|
||||
Ok(_) => {
|
||||
let filepath = test_util::util::get_full_path(&dir, &filename).unwrap();
|
||||
match super::properties::get_duration(&filepath) {
|
||||
match super::get_duration(&filepath) {
|
||||
Ok(duration) => {
|
||||
let song_duration: u64 = 41;
|
||||
let fetched_song_duration = duration.as_secs();
|
||||
@@ -1,17 +0,0 @@
|
||||
use lofty::file::AudioFile;
|
||||
|
||||
pub fn get_duration(song_path: &String) -> Result<std::time::Duration, std::io::Error> {
|
||||
match std::fs::File::open(song_path) {
|
||||
Ok(mut content) => {
|
||||
match lofty::flac::FlacFile::read_from(&mut content, lofty::config::ParseOptions::new())
|
||||
{
|
||||
Ok(flac_file) => {
|
||||
let properties = flac_file.properties();
|
||||
Ok(properties.duration())
|
||||
}
|
||||
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||
}
|
||||
}
|
||||
Err(err) => Err(err),
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user