Merge branch 'coverart' into 'dev'

Added coverart struct

See merge request kdeng00/icarus-models!40

src/album.rs

@@ -0,0 +1,31 @@
+pub mod collection {
+    use serde::{Deserialize, Serialize};
+
+    fn is_set(num: &i32) -> bool {
+        *num >= 0
+    }
+
+    #[derive(Clone, Debug, Deserialize, Serialize)]
+    pub struct Album {
+        #[serde(skip_serializing_if = "String::is_empty")]
+        #[serde(alias = "album")]
+        pub title: String,
+        pub genre: String,
+        pub year: i32,
+        pub track_count: i32,
+        #[serde(skip_serializing_if = "is_set")]
+        pub disc_count: i32,
+        #[serde(skip_serializing_if = "Vec::is_empty")]
+        pub tracks: Vec<Track>,
+    }
+
+    #[derive(Clone, Debug, Deserialize, Serialize)]
+    pub struct Track {
+        pub title: String,
+        pub artist: String,
+        pub disc: i32,
+        pub track: i32,
+        // In seconds
+        pub duration: f64,
+    }
+}

src/coverart.rs

@@ -0,0 +1,27 @@
+use std::io::Read;
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct CoverArt {
+    pub id: i32,
+    pub title: String,
+    pub path: String,
+    pub data: Vec<u8>,
+}
+
+impl CoverArt {
+    pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
+        let path: &String = &self.path;
+        let mut file = std::fs::File::open(path)?;
+        let mut buffer = Vec::new();
+        match file.read_to_end(&mut buffer) {
+            Ok(_) => {
+                return Ok(buffer);
+            }
+            Err(err) => {
+                return Err(err);
+            }
+        }
+    }
+}

src/lib.rs

@@ -1,5 +1,7 @@
 pub mod access_level;
+pub mod album;
 pub mod constants;
+pub mod coverart;
 pub mod login_result;
 pub mod song;
 pub mod token;

src/song.rs

@@ -159,23 +159,13 @@ impl Song {
         let filename_len = 10;
 
         let file_extension = match typ {
-            types::types::Types::DefaultMusicExtension =>
-            {
+            types::types::Types::DefaultMusicExtension => {
                 String::from(constants::DEFAULTMUSICEXTENSION)
             }
 
-            types::types::Types::WavExtension =>
-            {
-                String::from(constants::WAVEXTENSION)
-            }
-            types::types::Types::FlacExtension =>
-            {
-                String::from(constants::FLACEXTENSION)
-            }
-            types::types::Types::MPThreeExtension =>
-            {
-                String::from(constants::MPTHREEEXTENSION)
-            }
+            types::types::Types::WavExtension => String::from(constants::WAVEXTENSION),
+            types::types::Types::FlacExtension => String::from(constants::FLACEXTENSION),
+            types::types::Types::MPThreeExtension => String::from(constants::MPTHREEEXTENSION),
         };
 
         if randomize {