Code cleanup

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:?}")
             }
         }
     }