Compare commits

..

4 Commits

Author SHA1 Message Date
fb554251f9 tsk-72: Code formatting
Some checks failed
Release Tagging / release (pull_request) Successful in 36s
Rust Build / Rustfmt (pull_request) Successful in 30s
Rust Build / Clippy (pull_request) Successful in 35s
Rust Build / build (pull_request) Successful in 30s
Rust Build / Check (pull_request) Successful in 30s
Rust Build / Test Suite (pull_request) Failing after 32s
2025-10-18 20:13:08 -04:00
1f047f60d6 tsk-72: Removed path and made some related changes: 2025-10-18 20:12:41 -04:00
de7e27251c tsk-72: Formatting
All checks were successful
Rust Build / Rustfmt (pull_request) Successful in 40s
Rust Build / Test Suite (pull_request) Successful in 46s
Rust Build / Clippy (pull_request) Successful in 37s
Rust Build / build (pull_request) Successful in 1m3s
Release Tagging / release (pull_request) Successful in 35s
Rust Build / Check (pull_request) Successful in 1m3s
2025-10-18 19:59:27 -04:00
01f24bcda6 tsk-72: Added method to get path 2025-10-18 19:57:39 -04:00

View File

@@ -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(),
title: String::new(),
path: path.clone(),
data: Vec::new(),
song_id: uuid::Uuid::nil(),
directory: String::from(directory),
filename: String::from(filename),
..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) {
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),
@@ -45,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<String, std::io::Error> {
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",
))
}
}
@@ -64,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;
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),
}
}