From 8041dc6ff544ae9c6abaa3af204f5822363cd8f1 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 19 Oct 2025 00:48:49 +0000 Subject: [PATCH] tsk-72: Separating directory and filename from path in coverart (#74) This will be a breaking change Closes #72 Reviewed-on: https://git.kundeng.us/phoenix/icarus_models/pulls/74 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yaml | 1 + .gitea/workflows/workflow.yaml | 1 + Cargo.lock | 2 +- Cargo.toml | 2 +- src/coverart.rs | 90 ++++++++++++++++++++++--------- 5 files changed, 69 insertions(+), 27 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index dafd1bf..52ebe9c 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -4,6 +4,7 @@ on: pull_request: branches: - main + - next-v0.8 jobs: release: diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 0db5383..bc38675 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -7,6 +7,7 @@ on: pull_request: branches: - main + - next-v0.8 jobs: check: diff --git a/Cargo.lock b/Cargo.lock index 5f275a9..9b33e3e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -149,7 +149,7 @@ checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" [[package]] name = "icarus_models" -version = "0.7.0" +version = "0.7.1" dependencies = [ "josekit", "rand", diff --git a/Cargo.toml b/Cargo.toml index 5c6418d..5637ea4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus_models" -version = "0.7.0" +version = "0.7.1" edition = "2024" rust-version = "1.90" description = "models used for the icarus project" diff --git a/src/coverart.rs b/src/coverart.rs index 06ac2fc..259ed35 100644 --- a/src/coverart.rs +++ b/src/coverart.rs @@ -7,22 +7,22 @@ pub struct CoverArt { pub id: uuid::Uuid, pub title: String, #[serde(skip)] - pub path: String, + pub directory: String, + pub filename: String, #[serde(skip)] pub data: Vec, 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(), - title: String::new(), - path: path.clone(), - data: Vec::new(), - song_id: uuid::Uuid::nil(), + directory: String::from(directory), + filename: String::from(filename), + ..Default::default() } } } @@ -30,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) { - Ok(mut file) => match file.write_all(&self.data) { - Ok(_) => Ok(()), + match self.get_path() { + Ok(path) => match std::fs::File::create(&path) { + Ok(mut file) => match file.write_all(&self.data) { + Ok(_) => Ok(()), + Err(err) => Err(err), + }, Err(err) => Err(err), }, Err(err) => Err(err), @@ -41,15 +44,46 @@ 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); - if p.exists() { - match std::fs::remove_file(p) { - Ok(_) => Ok(()), - Err(err) => Err(err), + match self.get_path() { + Ok(path) => { + let p = std::path::Path::new(&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), + } + } + + /// Gets the path of the CoverArt + pub fn get_path(&self) -> Result { + if self.directory.is_empty() { + return Err(std::io::Error::other("Directory has not been initialized")); + } else if self.filename.is_empty() { + return Err(std::io::Error::other("Filename has not bee initialized")); + } + + let directory = &self.directory; + let last_index = directory.len() - 1; + + if let Some(character) = directory.chars().nth(last_index) { + let buffer = if character != '/' { + directory.clone() + "/" + } else { + directory.clone() + }; + + Ok(buffer + &self.filename.clone()) } else { Err(std::io::Error::other( - "Cannot delete file that does not exist", + "Could not access last character of directory", )) } } @@ -60,11 +94,15 @@ pub mod io { /// Gets the raw data of the cover art pub fn to_data(coverart: &super::CoverArt) -> Result, 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) { - Ok(_) => Ok(buffer), + match coverart.get_path() { + Ok(path) => { + let mut file = std::fs::File::open(path)?; + let mut buffer = Vec::new(); + match file.read_to_end(&mut buffer) { + Ok(_) => Ok(buffer), + Err(err) => Err(err), + } + } Err(err) => Err(err), } } @@ -76,9 +114,11 @@ mod tests { #[test] fn test_cover_art_image() { - let path: String = String::from("somepath"); - let coverart = coverart::init::init_coverart_only_path(path.clone()); + let dir = String::from("./"); + let filename = String::from("CoverArt.png"); + let coverart = coverart::init::init_coverart_dir_and_filename(&dir, &filename); - assert_eq!(path, coverart.path); + assert_eq!(dir, coverart.directory); + assert_eq!(filename, coverart.filename); } }