Compare commits

...

4 Commits

Author SHA1 Message Date
KD
05537a4f6d Merge branch 'enhance_song_model' into 'dev'
Added functions

See merge request kdeng00/icarus-models!34
2025-03-15 21:26:54 +00:00
KD
64402a0626 Added functions 2025-03-15 21:26:54 +00:00
KD
d1f63a04e4 Merge branch 'enhance_song' into 'dev'
Added functions to song

See merge request kdeng00/icarus-models!33
2025-03-15 02:30:08 +00:00
KD
842fe6302e Added functions to song 2025-03-15 02:30:08 +00:00

View File

@@ -90,15 +90,134 @@ impl Default for Song {
} }
impl Song { impl Song {
// TODO: Implement pub fn to_metadata_json(&self, pretty: bool) -> Result<String, serde_json::Error> {
pub fn to_metadata_json(&self) -> Result<String, serde_json::Error> { if pretty {
return serde_json::to_string_pretty(&self); return serde_json::to_string_pretty(&self);
} else {
return serde_json::to_string(&self);
}
}
pub fn song_path(&self) -> Result<String, std::io::Error> {
if self.directory.is_empty() {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
"Directory does not exist",
));
}
let directory = &self.directory;
let mut buffer: String = String::from(directory.clone());
let lastIndex = directory.len() - 1;
if let Some(character) = directory.chars().nth(lastIndex) {
if character != '/' {
buffer += "/";
}
buffer += &self.filename.clone();
return Ok(buffer);
} else {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
"Could not access last character of directory",
));
}
}
pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
let pathResult = self.song_path();
match pathResult {
Ok(path) => {
let mut file = std::fs::File::open(path)?;
let mut buffer: Vec<u8> = Vec::new();
file.read_to_end(&mut buffer)?;
if buffer.len() == 0 {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
"File is empty",
));
} else {
return Ok(buffer);
}
}
Err(er) => {
return Err(er);
}
}
} }
} }
mod embedded { mod embedded {
use std::io::Read;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
impl Song {
pub fn to_metadata_json(&self, pretty: bool) -> Result<String, serde_json::Error> {
if pretty {
return serde_json::to_string_pretty(&self);
} else {
return serde_json::to_string(&self);
}
}
pub fn song_path(&self) -> Result<String, std::io::Error> {
if self.directory.is_empty() {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
"Directory does not exist",
));
}
let directory = &self.directory;
let mut buffer: String = String::from(directory.clone());
let lastIndex = directory.len() - 1;
if let Some(character) = directory.chars().nth(lastIndex) {
if character != '/' {
buffer += "/";
}
buffer += &self.filename.clone();
return Ok(buffer);
} else {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
"Could not access last character of directory",
));
}
}
pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
let pathResult = self.song_path();
match pathResult {
Ok(path) => {
let mut file = std::fs::File::open(path)?;
let mut buffer: Vec<u8> = Vec::new();
file.read_to_end(&mut buffer)?;
if buffer.len() == 0 {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
"File is empty",
));
} else {
return Ok(buffer);
}
}
Err(er) => {
return Err(er);
}
}
}
}
// The song's duration is a floating point in seconds // The song's duration is a floating point in seconds
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
pub struct Song { pub struct Song {