Code cleanup

Cargo.lock

@@ -142,7 +142,7 @@ checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 
 [[package]]
 name = "icarus_models"
-version = "0.6.4"
+version = "0.6.0"
 dependencies = [
  "josekit",
  "rand",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icarus_models"
-version = "0.6.4"
+version = "0.6.0"
 edition = "2024"
 rust-version = "1.88"
 description = "models used for the icarus project"

src/coverart.rs

@@ -1,3 +1,5 @@
+use std::io::Read;
+
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
@@ -26,16 +28,8 @@ pub mod init {
 }
 
 impl CoverArt {
-    // TODO: Add method to save to filesystem
-    // TODO: Add method to remove from filesystem
-}
-
-pub mod io {
-    use std::io::Read;
-
-    /// Gets the raw data of the cover art
-    pub fn to_data(coverart: &super::CoverArt) -> Result<Vec<u8>, std::io::Error> {
-        let path: &String = &coverart.path;
+    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) {
@@ -43,6 +37,9 @@ pub mod io {
             Err(err) => Err(err),
         }
     }
+
+    // TODO: Add method to save to filesystem
+    // TODO: Add method to remove from filesystem
 }
 
 #[cfg(test)]

src/song.rs

@@ -7,9 +7,6 @@ use crate::constants;
 use crate::init;
 use crate::types;
 
-/// Length of characters of a filename to be generated
-const FILENAME_LENGTH: i32 = 16;
-
 #[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct Song {
     #[serde(skip_serializing_if = "init::is_uuid_nil")]
@@ -93,42 +90,11 @@ impl Song {
         }
     }
 
-    /// Saves the song to the filesystem using the song's data
-    pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> {
-        match self.song_path() {
-            Ok(song_path) => match std::fs::File::create(&song_path) {
-                Ok(mut file) => match file.write_all(&self.data) {
-                    Ok(_res) => Ok(()),
-                    Err(err) => Err(err),
-                },
-                Err(err) => Err(err),
-            },
-            Err(err) => Err(err),
-        }
-    }
+    // TODO: Make this available as a function
+    pub fn generate_filename(&self, typ: types::MusicTypes, randomize: bool) -> String {
+        let mut filename: String = String::new();
+        let filename_len = 10;
 
-    /// Removes the song from the filesystem
-    pub fn remove_from_filesystem(&self) -> Result<(), std::io::Error> {
-        match self.song_path() {
-            Ok(song_path) => {
-                let p = std::path::Path::new(&song_path);
-                if p.exists() {
-                    match std::fs::remove_file(&p) {
-                        Ok(_) => Ok(()),
-                        Err(err) => Err(err),
-                    }
-                } else {
-                    Ok(())
-                }
-            }
-            Err(err) => Err(err),
-        }
-    }
-}
-
-/// Generates a filename. In order to save a song to the filesystem, the song must have
-/// a directory and filename
-pub fn generate_filename(typ: types::MusicTypes, randomize: bool) -> String {
         let file_extension = match typ {
             types::MusicTypes::DefaultMusicExtension => {
                 String::from(constants::file_extensions::audio::DEFAULTMUSICEXTENSION)
@@ -146,22 +112,42 @@ pub fn generate_filename(typ: types::MusicTypes, randomize: bool) -> String {
         };
 
         if randomize {
-        let mut filename: String = String::new();
             let some_chars: String = String::from("abcdefghij0123456789");
             let mut rng = rand::rng();
 
-        for _ in 0..FILENAME_LENGTH {
-            let index = rng.random_range(0..=19);
+            for _i in 0..filename_len {
+                let random_number: i32 = rng.random_range(0..=19);
+                let index = random_number as usize;
                 let rando_char = some_chars.chars().nth(index);
 
                 if let Some(c) = rando_char {
                     filename.push(c);
                 }
             }
-        filename + &file_extension
         } else {
-        "track-output".to_string() + &file_extension
+            filename += "track-output";
         }
+
+        filename += &file_extension;
+
+        filename
+    }
+
+    /// Saves the song to the filesystem using the song's data
+    pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> {
+        match self.song_path() {
+            Ok(song_path) => match std::fs::File::create(&song_path) {
+                Ok(mut file) => match file.write_all(&self.data) {
+                    Ok(_res) => Ok(()),
+                    Err(err) => Err(err),
+                },
+                Err(err) => Err(err),
+            },
+            Err(err) => Err(err),
+        }
+    }
+
+    // TODO: Add function to remove file from the filesystem
 }
 
 /// I/O operations for songs

tests/tests.rs

@@ -107,7 +107,7 @@ mod song_tests {
         };
 
         assert_eq!(song.directory.is_empty(), false);
-        song_cpy.filename = song::generate_filename(types::MusicTypes::FlacExtension, true);
+        song_cpy.filename = song.generate_filename(types::MusicTypes::FlacExtension, true);
         println!("Directory: {:?}", song_cpy.directory);
         println!("File to be created: {:?}", song_cpy.filename);
 
@@ -120,7 +120,7 @@ mod song_tests {
     }
 
     #[test]
-    fn test_save_song_to_filesystem_and_remove() {
+    fn test_save_song_to_filesystem() {
         let mut song = song::Song::default();
         song.directory = utils::get_tests_directory();
         song.filename = String::from("track02.flac");
@@ -132,21 +132,17 @@ mod song_tests {
         };
 
         match song::io::copy_song(&song, &mut copied_song) {
-            Ok(_) => match copied_song.remove_from_filesystem() {
             Ok(_) => {}
             Err(err) => {
                 assert!(false, "Error: {err:?}")
             }
-            },
-            Err(err) => {
-                assert!(false, "Error: {err:?}")
-            }
         }
     }
 }
 
 #[cfg(test)]
 mod album_tests {
+
     use crate::utils;
     use icarus_models::album;