Merge branch 'warning-fix' into 'dev'

Making some changes to address warnings

See merge request kdeng00/icarus-models!36

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icarus-models"
-version = "0.1.7"
+version = "0.1.10"
 edition = "2024"
 description = "models used for the icarus project"
 license = "MIT"

src/constants.rs

@@ -1,5 +1,5 @@
-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";
+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";

src/song.rs

@@ -98,32 +98,126 @@ impl Song {
         }
     }
 
-    // TODO: Implement
-    pub fn song_path(&self) -> String {
-        return String::new();
+    pub fn song_path(&self) -> Result<String, std::io::Error> {
+        if self.directory.is_empty() {
+            return Err(std::io::Error::new(
+                std::io::ErrorKind::Other,
+                "Directory does not exist",
+            ));
+        }
+
+        let directory = &self.directory;
+        let mut buffer: String = String::from(directory.clone());
+        let last_index = directory.len() - 1;
+
+        if let Some(character) = directory.chars().nth(last_index) {
+            if character != '/' {
+                buffer += "/";
+            }
+
+            buffer += &self.filename.clone();
+
+            return Ok(buffer);
+        } else {
+            return Err(std::io::Error::new(
+                std::io::ErrorKind::Other,
+                "Could not access last character of directory",
+            ));
+        }
     }
 
     pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
-        let path = self.song_path();
+        let path_result = self.song_path();
 
-        let mut file = std::fs::File::open(path)?;
-        let mut buffer: Vec<u8> = Vec::new();
-        file.read_to_end(&mut buffer)?;
+        match path_result {
+            Ok(path) => {
+                let mut file = std::fs::File::open(path)?;
+                let mut buffer: Vec<u8> = Vec::new();
+                file.read_to_end(&mut buffer)?;
 
-        if buffer.len() == 0 {
-            Err(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                "File is empty",
-            ))
-        } else {
-            Ok(buffer)
+                if buffer.len() == 0 {
+                    return Err(std::io::Error::new(
+                        std::io::ErrorKind::Other,
+                        "File is empty",
+                    ));
+                } else {
+                    return Ok(buffer);
+                }
+            }
+            Err(er) => {
+                return Err(er);
+            }
         }
     }
 }
 
 mod embedded {
+    use std::io::Read;
+
     use serde::{Deserialize, Serialize};
 
+    impl Song {
+        pub fn to_metadata_json(&self, pretty: bool) -> Result<String, serde_json::Error> {
+            if pretty {
+                return serde_json::to_string_pretty(&self);
+            } else {
+                return serde_json::to_string(&self);
+            }
+        }
+
+        pub fn song_path(&self) -> Result<String, std::io::Error> {
+            if self.directory.is_empty() {
+                return Err(std::io::Error::new(
+                    std::io::ErrorKind::Other,
+                    "Directory does not exist",
+                ));
+            }
+
+            let directory = &self.directory;
+            let mut buffer: String = String::from(directory.clone());
+            let last_index = directory.len() - 1;
+
+            if let Some(character) = directory.chars().nth(last_index) {
+                if character != '/' {
+                    buffer += "/";
+                }
+
+                buffer += &self.filename.clone();
+
+                return Ok(buffer);
+            } else {
+                return Err(std::io::Error::new(
+                    std::io::ErrorKind::Other,
+                    "Could not access last character of directory",
+                ));
+            }
+        }
+
+        pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
+            let path_result = self.song_path();
+
+            match path_result {
+                Ok(path) => {
+                    let mut file = std::fs::File::open(path)?;
+                    let mut buffer: Vec<u8> = Vec::new();
+                    file.read_to_end(&mut buffer)?;
+
+                    if buffer.len() == 0 {
+                        return Err(std::io::Error::new(
+                            std::io::ErrorKind::Other,
+                            "File is empty",
+                        ));
+                    } else {
+                        return Ok(buffer);
+                    }
+                }
+                Err(er) => {
+                    return Err(er);
+                }
+            }
+        }
+    }
+
     // The song's duration is a floating point in seconds
     #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct Song {

src/token.rs

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

src/types.rs

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