Version bump with breaking change

Cargo.lock

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

Cargo.toml

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

src/song.rs

@@ -1,12 +1,12 @@
 use std::io::{Read, Write};
 
+use rand::Rng;
+use serde::{Deserialize, Serialize};
+
 use crate::constants;
 use crate::init;
 use crate::types;
 
-use rand::Rng;
-use serde::{Deserialize, Serialize};
-
 #[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct Song {
     #[serde(skip_serializing_if = "init::is_uuid_nil")]
@@ -170,29 +170,35 @@ impl Song {
     // TODO: Add function to remove file from the filesystem
 }
 
-/// Copies a song using the source song's data
+/// I/O operations for songs
-pub fn copy_song(song_source: &Song, song_target: &mut Song) -> Result<(), std::io::Error> {
+pub mod io {
-    match song_target.song_path() {
+    /// Copies a song using the source song's data
-        Ok(songpath) => {
+    pub fn copy_song(
-            let p = std::path::Path::new(&songpath);
+        song_source: &super::Song,
-            if p.exists() {
+        song_target: &mut super::Song,
-                Err(std::io::Error::other(
+    ) -> Result<(), std::io::Error> {
-                    "Cannot copy song over to one that already exists",
+        match song_target.song_path() {
-                ))
+            Ok(songpath) => {
-            } else {
+                let p = std::path::Path::new(&songpath);
-                if song_target.data.is_empty() {
+                if p.exists() {
-                    song_target.data = song_source.data.clone();
+                    Err(std::io::Error::other(
+                        "Cannot copy song over to one that already exists",
+                    ))
                 } else {
-                    song_target.data.clear();
+                    if song_target.data.is_empty() {
-                    song_target.data = song_source.data.clone();
+                        song_target.data = song_source.data.clone();
-                }
+                    } else {
+                        song_target.data.clear();
+                        song_target.data = song_source.data.clone();
+                    }
 
-                match song_target.save_to_filesystem() {
+                    match song_target.save_to_filesystem() {
-                    Ok(_) => Ok(()),
+                        Ok(_) => Ok(()),
-                    Err(err) => Err(err),
+                        Err(err) => Err(err),
+                    }
                 }
             }
+            Err(err) => Err(err),
         }
-        Err(err) => Err(err),
     }
 }

tests/tests.rs

@@ -30,16 +30,12 @@ mod utils {
 
 #[cfg(test)]
 mod song_tests {
-    use std::fs::File;
-    use std::io::Write;
-
     use tempfile::tempdir;
 
+    use crate::utils;
     use icarus_models::song;
     use icarus_models::types;
 
-    use crate::utils;
-
     #[test]
     fn test_song_to_data() {
         println!("Test");
@@ -103,50 +99,22 @@ mod song_tests {
         song.directory = utils::get_tests_directory();
         song.filename = String::from("track01.flac");
 
-        match song.song_path() {
+        let mut song_cpy = song.clone();
-            Ok(songpath) => match utils::extract_data_from_file(&songpath) {
+        let temp_dir = tempdir().expect("Failed to create temp dir");
-                Ok(buffer) => {
+        song_cpy.directory = match temp_dir.path().to_str() {
-                    let mut song_cpy = song.clone();
+            Some(s) => String::from(s),
-                    let temp_dir = tempdir().expect("Failed to create temp dir");
+            None => String::new(),
-                    song_cpy.directory = match temp_dir.path().to_str() {
+        };
-                        Some(s) => String::from(s),
-                        None => String::new(),
-                    };
 
-                    assert_eq!(song.directory.is_empty(), false);
+        assert_eq!(song.directory.is_empty(), false);
-                    song_cpy.filename =
+        song_cpy.filename = song.generate_filename(types::MusicTypes::FlacExtension, true);
-                        song.generate_filename(types::MusicTypes::FlacExtension, true);
+        println!("Directory: {:?}", song_cpy.directory);
-                    println!("Directory: {:?}", song_cpy.directory);
+        println!("File to be created: {:?}", song_cpy.filename);
-                    println!("File to be created: {:?}", song_cpy.filename);
 
-                    let path = match song_cpy.song_path() {
+        match song::copy_song(&song, &mut song_cpy) {
-                        Ok(s_path) => s_path,
+            Ok(_) => {}
-                        Err(err) => {
-                            assert!(false, "Error: {:?}", err);
-                            String::new()
-                        }
-                    };
-
-                    match File::create(path) {
-                        Ok(mut file_cpy) => match file_cpy.write_all(&buffer) {
-                            Ok(success) => {
-                                println!("Success: {:?}", success);
-                            }
-                            Err(err) => {
-                                assert!(false, "Error saving file: {:?}", err);
-                            }
-                        },
-                        Err(err) => {
-                            assert!(false, "Error: {:?}", err);
-                        }
-                    };
-                }
-                Err(err) => {
-                    assert!(false, "Error: {:?}", err);
-                }
-            },
             Err(err) => {
-                assert!(false, "Error extracting song data: {:?}", err);
+                assert!(false, "Error copying song: Error: {err:?}")
             }
         }
     }