Merge branch 'dev' into 'main'

Dev

See merge request kdeng00/icarus-models!30

Cargo.toml

@@ -7,5 +7,4 @@ license = "MIT"
 
 [dependencies]
 serde = { version = "1.0.218", features = ["derive"] }
-serde_json = { version = "1.0.139" }
-rand = { version = "0.9" }
+serde_json = "1.0.139"

src/album.rs

@@ -1,31 +0,0 @@
-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/constants.rs

@@ -1,5 +1,5 @@
-pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION;
-pub const FLACEXTENSION: &str = ".flac";
-pub const WAVEXTENSION: &str = ".wav";
-pub const MPTHREEEXTENSION: &str = ".mp3";
-pub const JPGEXTENSION: &str = ".jpg";
+pub const DEFAULT_MUSIC_EXTENSION: &str = FLAC_EXTENSION;
+pub const FLAC_EXTENSION: &str = ".flac";
+pub const WAV_EXTENSION: &str = ".wav";
+pub const MPTHREE_EXTENSION: &str = ".mp3";
+pub const JPG_EXTENSION: &str = ".jpg";

src/lib.rs

@@ -1,5 +1,4 @@
 pub mod access_level;
-pub mod album;
 pub mod constants;
 pub mod login_result;
 pub mod song;

src/song.rs

@@ -1,10 +1,6 @@
 use std::default::Default;
 use std::io::Read;
 
-use crate::constants;
-use crate::types;
-
-use rand::Rng;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -46,14 +42,14 @@ pub struct Song {
     pub data: Vec<u8>,
     #[serde(skip)]
     pub directory: String,
-    // #[serde(skip)]
-    // pub album_id: i32,
-    // #[serde(skip)]
-    // pub artist_id: i32,
-    // #[serde(skip)]
-    // pub genre_id: i32,
-    // #[serde(skip)]
-    // pub coverart_id: i32,
+    #[serde(skip)]
+    pub album_id: i32,
+    #[serde(skip)]
+    pub artist_id: i32,
+    #[serde(skip)]
+    pub genre_id: i32,
+    #[serde(skip)]
+    pub coverart_id: i32,
 }
 
 fn is_zero(num: &i32) -> bool {
@@ -85,10 +81,10 @@ impl Default for Song {
             user_id: 0,
             data: Vec::new(),
             directory: String::new(),
-            // album_id: 0,
-            // artist_id: 0,
-            // genre_id: 0,
-            // coverart_id: 0,
+            album_id: 0,
+            artist_id: 0,
+            genre_id: 0,
+            coverart_id: 0,
         }
     }
 }
@@ -112,9 +108,9 @@ impl Song {
 
         let directory = &self.directory;
         let mut buffer: String = String::from(directory.clone());
-        let last_index = directory.len() - 1;
+        let lastIndex = directory.len() - 1;
 
-        if let Some(character) = directory.chars().nth(last_index) {
+        if let Some(character) = directory.chars().nth(lastIndex) {
             if character != '/' {
                 buffer += "/";
             }
@@ -131,9 +127,9 @@ impl Song {
     }
 
     pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
-        let path_result = self.song_path();
+        let pathResult = self.song_path();
 
-        match path_result {
+        match pathResult {
             Ok(path) => {
                 let mut file = std::fs::File::open(path)?;
                 let mut buffer: Vec<u8> = Vec::new();
@@ -153,55 +149,6 @@ impl Song {
             }
         }
     }
-
-    pub fn generate_filename(&self, typ: types::types::Types, randomize: bool) -> String {
-        let mut filename: String = String::new();
-        let filename_len = 10;
-
-        let file_extension = match typ {
-            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)
-            }
-        };
-
-        if randomize {
-            let some_chars: String = String::from("abcdefghij0123456789");
-            let mut rng = rand::thread_rng();
-
-            for _i in 0..filename_len {
-                let random_number: i32 = rng.gen_range(0..=19);
-                let index = random_number as usize;
-                let rando_char = some_chars.chars().nth(index);
-
-                match rando_char {
-                    Some(c) => {
-                        filename.push(c);
-                    }
-                    None => {}
-                };
-            }
-        } else {
-            filename += "track-output";
-        }
-
-        filename += &file_extension;
-
-        return filename;
-    }
 }
 
 mod embedded {
@@ -228,9 +175,9 @@ mod embedded {
 
             let directory = &self.directory;
             let mut buffer: String = String::from(directory.clone());
-            let last_index = directory.len() - 1;
+            let lastIndex = directory.len() - 1;
 
-            if let Some(character) = directory.chars().nth(last_index) {
+            if let Some(character) = directory.chars().nth(lastIndex) {
                 if character != '/' {
                     buffer += "/";
                 }
@@ -247,9 +194,9 @@ mod embedded {
         }
 
         pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
-            let path_result = self.song_path();
+            let pathResult = self.song_path();
 
-            match path_result {
+            match pathResult {
                 Ok(path) => {
                     let mut file = std::fs::File::open(path)?;
                     let mut buffer: Vec<u8> = Vec::new();
@@ -311,14 +258,14 @@ mod embedded {
         pub data: Vec<u8>,
         #[serde(skip)]
         pub directory: String,
-        // #[serde(skip)]
-        // pub album_id: i32,
-        // #[serde(skip)]
-        // pub artist_id: i32,
-        // #[serde(skip)]
-        // pub genre_id: i32,
-        // #[serde(skip)]
-        // pub coverart_id: i32,
+        #[serde(skip)]
+        pub album_id: i32,
+        #[serde(skip)]
+        pub artist_id: i32,
+        #[serde(skip)]
+        pub genre_id: i32,
+        #[serde(skip)]
+        pub coverart_id: i32,
     }
 
     fn is_embed_zero(num: &i32) -> bool {
@@ -350,10 +297,10 @@ mod embedded {
                 user_id: 0,
                 data: Vec::new(),
                 directory: String::new(),
-                // album_id: 0,
-                // artist_id: 0,
-                // genre_id: 0,
-                // coverart_id: 0,
+                album_id: 0,
+                artist_id: 0,
+                genre_id: 0,
+                coverart_id: 0,
             }
         }
     }

src/token.rs

@@ -58,13 +58,7 @@ impl Token {
     }
 
     // TODO: Implement
-    pub fn contains_scope(&self, des_scope: &String) -> bool {
-        let extracted_token: String = String::from("Token");
-
-        if extracted_token == *des_scope {
-            return true;
-        }
-
+    pub fn contains_scope(&self, des_scope: String) -> bool {
         return false;
     }
 }

src/types.rs

@@ -1,8 +1,9 @@
-pub mod types {
+use std::default::Default;
+
+mod types {
     pub enum Types {
-        DefaultMusicExtension,
-        WavExtension,
-        FlacExtension,
-        MPThreeExtension,
+        WAV_EXTENSION,
+        FLAC_EXTENSION,
+        MP_EXTENSION,
     }
 }