Merge pull request 'Coverart changes' (#65) from coverart_changes into main

Reviewed-on: #65

Cargo.lock

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

Cargo.toml

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

src/coverart.rs

@@ -1,4 +1,4 @@
-use std::io::Read;
+use std::io::Write;
 
 use serde::{Deserialize, Serialize};
 
@@ -28,8 +28,39 @@ pub mod init {
 }
 
 impl CoverArt {
-    pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
+    /// Saves the coverart to the filesystem
-        let path: &String = &self.path;
+    pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> {
+        match std::fs::File::create(&self.path) {
+            Ok(mut file) => match file.write_all(&self.data) {
+                Ok(_) => Ok(()),
+                Err(err) => Err(err),
+            },
+            Err(err) => Err(err),
+        }
+    }
+
+    /// Removes the coverart from the filesystem
+    pub fn remove_from_filesystem(&self) -> Result<(), std::io::Error> {
+        let p = std::path::Path::new(&self.path);
+        if p.exists() {
+            match std::fs::remove_file(p) {
+                Ok(_) => Ok(()),
+                Err(err) => Err(err),
+            }
+        } else {
+            Err(std::io::Error::other(
+                "Cannot delete file that does not exist",
+            ))
+        }
+    }
+}
+
+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;
         let mut file = std::fs::File::open(path)?;
         let mut buffer = Vec::new();
         match file.read_to_end(&mut buffer) {
@@ -37,9 +68,6 @@ impl CoverArt {
             Err(err) => Err(err),
         }
     }
-
-    // TODO: Add method to save to filesystem
-    // TODO: Add method to remove from filesystem
 }
 
 #[cfg(test)]

src/song.rs

@@ -7,6 +7,7 @@ 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)]
@@ -92,7 +93,6 @@ 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() {
@@ -107,10 +107,27 @@ impl Song {
         }
     }
 
-    // TODO: Add function to remove file from the filesystem
+    /// 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 {
+                    Err(std::io::Error::other(
+                        "Cannot delete file that does not exist",
+                    ))
+                }
+            }
+            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 {

tests/tests.rs

@@ -120,7 +120,7 @@ mod song_tests {
     }
 
     #[test]
-    fn test_save_song_to_filesystem() {
+    fn test_save_song_to_filesystem_and_remove() {
         let mut song = song::Song::default();
         song.directory = utils::get_tests_directory();
         song.filename = String::from("track02.flac");
@@ -132,7 +132,12 @@ mod song_tests {
         };
 
         match song::io::copy_song(&song, &mut copied_song) {
-            Ok(_) => {}
+            Ok(_) => match copied_song.remove_from_filesystem() {
+                Ok(_) => {}
+                Err(err) => {
+                    assert!(false, "Error: {err:?}")
+                }
+            },
             Err(err) => {
                 assert!(false, "Error: {err:?}")
             }
@@ -142,7 +147,6 @@ mod song_tests {
 
 #[cfg(test)]
 mod album_tests {
-
     use crate::utils;
     use icarus_models::album;