Compare commits

...

5 Commits

Author SHA1 Message Date
6df220ad73 tsk-50: Added properties
Some checks failed
Release Tagging / release (pull_request) Successful in 31s
Rust Build / Check (pull_request) Successful in 32s
Rust Build / Test Suite (pull_request) Failing after 34s
Rust Build / Clippy (pull_request) Failing after 31s
Rust Build / Rustfmt (pull_request) Failing after 37s
Rust Build / build (pull_request) Successful in 30s
2025-11-06 11:47:10 -05:00
ff1c7c9a59 tsk-50: File rename 2025-11-06 11:34:40 -05:00
4459d89eab tsk-50: Created properties module
Some checks failed
Rust Build / Check (pull_request) Successful in 33s
Release Tagging / release (pull_request) Successful in 45s
Rust Build / Test Suite (pull_request) Failing after 33s
Rust Build / Rustfmt (pull_request) Successful in 47s
Rust Build / Clippy (pull_request) Failing after 42s
Rust Build / build (pull_request) Successful in 35s
2025-11-06 11:29:36 -05:00
a28de5a712 tsk-50: Moving file
Some checks failed
Rust Build / Check (pull_request) Failing after 33s
Release Tagging / release (pull_request) Successful in 35s
Rust Build / Test Suite (pull_request) Failing after 35s
Rust Build / Rustfmt (pull_request) Failing after 38s
Rust Build / Clippy (pull_request) Failing after 47s
Rust Build / build (pull_request) Failing after 1m5s
2025-11-06 11:26:55 -05:00
f5e6ac567e tsk-49: Initialize FileType with file type of the media (#51)
All checks were successful
Release Tagging / release (push) Successful in 34s
Rust Build / Check (push) Successful in 37s
Rust Build / Clippy (push) Successful in 28s
Rust Build / Test Suite (push) Successful in 34s
Rust Build / Rustfmt (push) Successful in 33s
Rust Build / build (push) Successful in 44s
Closes #49

Reviewed-on: #51
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-11-06 15:52:46 +00:00
5 changed files with 78 additions and 14 deletions

2
Cargo.lock generated
View File

@@ -104,7 +104,7 @@ dependencies = [
[[package]]
name = "icarus_meta"
version = "0.4.3"
version = "0.4.4"
dependencies = [
"imghdr",
"infer",

View File

@@ -1,6 +1,6 @@
[package]
name = "icarus_meta"
version = "0.4.3"
version = "0.4.4"
edition = "2024"
rust-version = "1.90"

View File

@@ -6,3 +6,29 @@ pub struct FileType {
pub mime: String,
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 {
Ok(FileType {
mime: String::from(song::constants::mime::FLAC),
file_type: String::from(song::constants::FLAC_TYPE),
})
} else if filetype == coverart::constants::PNG_TYPE {
Ok(FileType {
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
{
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:?}"
)))
}
}

16
src/properties/audio.rs Normal file
View File

@@ -0,0 +1,16 @@
use lofty::file::AudioFile;
pub fn get_properties(songpath: &str) -> Result<lofty::flac::FlacProperties, std::io::Error> {
match std::fs::File::open(songpath) {
Ok(mut content) => {
match lofty::flac::FlacFile::read_from(&mut content, lofty::config::ParseOptions::new())
{
Ok(flac_file) => {
Ok(*flac_file.properties())
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
Err(err) => Err(err),
}
}

View File

@@ -1,21 +1,43 @@
use lofty::file::AudioFile;
pub mod audio;
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())),
}
#[derive(Clone, Debug, Default)]
pub struct SongProperties {
pub duration: std::time::Duration,
pub sample_rate: u32,
pub bitrate: u32,
pub overall_bitrate: u32,
pub bit_depth: u8,
pub channels: u8,
}
pub fn get_song_properties(song_path: &str) -> Result<SongProperties, std::io::Error> {
match audio::get_properties(song_path) {
Ok(flac_properties) => {
Ok(SongProperties {
duration: flac_properties.duration(),
sample_rate: flac_properties.sample_rate(),
bitrate: flac_properties.audio_bitrate(),
overall_bitrate: flac_properties.overall_bitrate(),
bit_depth: flac_properties.bit_depth(),
channels: flac_properties.channels(),
})
}
Err(err) => Err(err),
}
}
pub fn get_duration(song_path: &String) -> Result<std::time::Duration, std::io::Error> {
match get_song_properties(song_path) {
Ok(song_properties) => {
Ok(song_properties.duration)
}
Err(err) => Err(err),
}
}
#[cfg(test)]
mod tests {
use crate::test_util;