Compare commits
3 Commits
v0.7.2-75-
...
v0.7.2-77-
Author | SHA1 | Date | |
---|---|---|---|
bd26afdddf
|
|||
580f5e9be7
|
|||
3ee3ac737b
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -149,7 +149,7 @@ checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
|
||||
|
||||
[[package]]
|
||||
name = "icarus_models"
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
dependencies = [
|
||||
"josekit",
|
||||
"rand",
|
||||
|
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "icarus_models"
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
edition = "2024"
|
||||
rust-version = "1.90"
|
||||
description = "models used for the icarus project"
|
||||
|
21
src/song.rs
21
src/song.rs
@@ -39,8 +39,8 @@ pub struct Song {
|
||||
pub track_count: i32,
|
||||
#[serde(skip_serializing_if = "String::is_empty")]
|
||||
pub audio_type: String,
|
||||
#[serde(skip_serializing_if = "String::is_empty")]
|
||||
pub date_created: String,
|
||||
#[serde(with = "time::serde::rfc3339::option")]
|
||||
pub date_created: Option<time::OffsetDateTime>,
|
||||
#[serde(skip_serializing_if = "String::is_empty")]
|
||||
pub filename: String,
|
||||
#[serde(skip_serializing_if = "init::is_uuid_nil")]
|
||||
@@ -71,21 +71,22 @@ impl Song {
|
||||
|
||||
pub fn song_path(&self) -> Result<String, std::io::Error> {
|
||||
if self.directory.is_empty() {
|
||||
return Err(std::io::Error::other("Directory does not exist"));
|
||||
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 mut buffer: String = directory.clone();
|
||||
let last_index = directory.len() - 1;
|
||||
|
||||
if let Some(character) = directory.chars().nth(last_index) {
|
||||
if character != '/' {
|
||||
buffer += "/";
|
||||
}
|
||||
let buffer: String = if character != '/' {
|
||||
directory.clone() + "/"
|
||||
} else {
|
||||
directory.clone()
|
||||
};
|
||||
|
||||
buffer += &self.filename.clone();
|
||||
|
||||
Ok(buffer)
|
||||
Ok(buffer + &self.filename.clone())
|
||||
} else {
|
||||
Err(std::io::Error::other(
|
||||
"Could not access last character of directory",
|
||||
|
Reference in New Issue
Block a user