tsk-49: Initialize FileType with file type of the media

Cargo.lock

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

Cargo.toml

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

src/detection/mod.rs

@@ -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
+    } else if filetype == coverart::constants::JPEG_TYPE || filetype == coverart::constants::JPG_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!(
+        Err(std::io::Error::other(format!("Unsupported FileType: {filetype:?}")))
-            "Unsupported FileType: {filetype:?}"
-        )))
     }
 }

src/properties.rs

@@ -1,43 +1,21 @@
-pub mod audio;
+use lofty::file::AudioFile;
-
-
-#[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) {
+    match std::fs::File::open(song_path) {
-        Ok(song_properties) => {
+        Ok(mut content) => {
-            Ok(song_properties.duration)
+            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 {
     use crate::test_util;

src/properties/audio.rs

@@ -1,16 +0,0 @@
-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),
-    }
-}