tsk-72: Code formatting

src/coverart.rs

@@ -10,22 +10,18 @@ pub struct CoverArt {
     pub directory: String,
     pub filename: String,
     #[serde(skip)]
-    pub path: String,
-    #[serde(skip)]
     pub data: Vec<u8>,
     pub song_id: uuid::Uuid,
 }
 
 pub mod init {
-    use crate::coverart::CoverArt;
+    use super::CoverArt;
 
-    pub fn init_coverart_only_path(path: String) -> CoverArt {
+    /// Initializes the CoverArt with just the directory and filename
+    pub fn init_coverart_dir_and_filename(directory: &str, filename: &str) -> CoverArt {
         CoverArt {
-            id: uuid::Uuid::nil(),
+            directory: String::from(directory),
-            title: String::new(),
+            filename: String::from(filename),
-            path: path.clone(),
-            data: Vec::new(),
-            song_id: uuid::Uuid::nil(),
             ..Default::default()
         }
     }
@@ -34,9 +30,12 @@ pub mod init {
 impl CoverArt {
     /// Saves the coverart to the filesystem
     pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> {
-        match std::fs::File::create(&self.path) {
+        match self.get_path() {
-            Ok(mut file) => match file.write_all(&self.data) {
+            Ok(path) => match std::fs::File::create(&path) {
-                Ok(_) => Ok(()),
+                Ok(mut file) => match file.write_all(&self.data) {
+                    Ok(_) => Ok(()),
+                    Err(err) => Err(err),
+                },
                 Err(err) => Err(err),
             },
             Err(err) => Err(err),
@@ -45,16 +44,21 @@ impl CoverArt {
 
     /// Removes the coverart from the filesystem
     pub fn remove_from_filesystem(&self) -> Result<(), std::io::Error> {
-        let p = std::path::Path::new(&self.path);
+        match self.get_path() {
-        if p.exists() {
+            Ok(path) => {
-            match std::fs::remove_file(p) {
+                let p = std::path::Path::new(&path);
-                Ok(_) => Ok(()),
+                if p.exists() {
-                Err(err) => Err(err),
+                    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",
+                    ))
+                }
             }
-        } else {
+            Err(err) => Err(err),
-            Err(std::io::Error::other(
-                "Cannot delete file that does not exist",
-            ))
         }
     }
 
@@ -90,11 +94,15 @@ pub mod io {
 
     /// 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;
+        match coverart.get_path() {
-        let mut file = std::fs::File::open(path)?;
+            Ok(path) => {
-        let mut buffer = Vec::new();
+                let mut file = std::fs::File::open(path)?;
-        match file.read_to_end(&mut buffer) {
+                let mut buffer = Vec::new();
-            Ok(_) => Ok(buffer),
+                match file.read_to_end(&mut buffer) {
+                    Ok(_) => Ok(buffer),
+                    Err(err) => Err(err),
+                }
+            }
             Err(err) => Err(err),
         }
     }