Compare commits

..

6 Commits

Author SHA1 Message Date
19b785e010 tsk-73: Workflow fix
All checks were successful
Rust Build / Check (pull_request) Successful in 51s
Release Tagging / release (pull_request) Successful in 56s
Rust Build / Rustfmt (pull_request) Successful in 37s
Rust Build / Test Suite (pull_request) Successful in 45s
Rust Build / Clippy (pull_request) Successful in 33s
Rust Build / build (pull_request) Successful in 44s
2025-10-18 21:17:36 -04:00
3437ee7c5b tsk-73: Updated tag release workflow
Some checks failed
Rust Build / Test Suite (pull_request) Successful in 31s
Rust Build / Rustfmt (pull_request) Successful in 30s
Rust Build / Clippy (pull_request) Successful in 37s
Rust Build / build (pull_request) Successful in 51s
Release Tagging / release (pull_request) Failing after 38s
Rust Build / Check (pull_request) Successful in 36s
2025-10-18 21:12:29 -04:00
bd26afdddf Version bump
All checks were successful
Release Tagging / release (pull_request) Successful in 46s
Rust Build / Test Suite (pull_request) Successful in 41s
Rust Build / Rustfmt (pull_request) Successful in 59s
Rust Build / Clippy (pull_request) Successful in 42s
Rust Build / Check (pull_request) Successful in 40s
Rust Build / build (pull_request) Successful in 48s
2025-10-18 21:02:13 -04:00
580f5e9be7 tsk-73: Code cleanup:
:
2025-10-18 21:00:38 -04:00
3ee3ac737b tsk-73: Change type of date_created to an option of time::OffsetDateTime 2025-10-18 20:57:21 -04:00
8041dc6ff5 tsk-72: Separating directory and filename from path in coverart (#74)
All checks were successful
Rust Build / Check (pull_request) Successful in 46s
Rust Build / Test Suite (pull_request) Successful in 36s
Rust Build / Clippy (pull_request) Successful in 40s
Rust Build / Rustfmt (pull_request) Successful in 1m13s
Rust Build / build (pull_request) Successful in 37s
Release Tagging / release (pull_request) Successful in 44s
This will be a breaking change

Closes #72

Reviewed-on: #74
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-10-19 00:48:49 +00:00
4 changed files with 18 additions and 14 deletions

View File

@@ -28,10 +28,13 @@ jobs:
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10) PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
BRANCH_REF="${GITHUB_REF}" BRANCH_REF="${GITHUB_REF}"
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3) BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH" PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111"
echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-111"
echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE"
echo "Version: $VERSION" echo "Version: $VERSION"
echo "Hash: $PROJECT_COMMIT_HASH" echo "Hash: $PROJECT_COMMIT_HASH"
echo "Branh ref: $BRANCH_REF"
echo "Branch: $BRANCH_NAME" echo "Branch: $BRANCH_NAME"
echo "Tag Release: $PROJECT_TAG_RELEASE" echo "Tag Release: $PROJECT_TAG_RELEASE"

2
Cargo.lock generated
View File

@@ -149,7 +149,7 @@ checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
[[package]] [[package]]
name = "icarus_models" name = "icarus_models"
version = "0.7.1" version = "0.7.2"
dependencies = [ dependencies = [
"josekit", "josekit",
"rand", "rand",

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "icarus_models" name = "icarus_models"
version = "0.7.1" version = "0.7.2"
edition = "2024" edition = "2024"
rust-version = "1.90" rust-version = "1.90"
description = "models used for the icarus project" description = "models used for the icarus project"

View File

@@ -39,8 +39,8 @@ pub struct Song {
pub track_count: i32, pub track_count: i32,
#[serde(skip_serializing_if = "String::is_empty")] #[serde(skip_serializing_if = "String::is_empty")]
pub audio_type: String, pub audio_type: String,
#[serde(skip_serializing_if = "String::is_empty")] #[serde(with = "time::serde::rfc3339::option")]
pub date_created: String, pub date_created: Option<time::OffsetDateTime>,
#[serde(skip_serializing_if = "String::is_empty")] #[serde(skip_serializing_if = "String::is_empty")]
pub filename: String, pub filename: String,
#[serde(skip_serializing_if = "init::is_uuid_nil")] #[serde(skip_serializing_if = "init::is_uuid_nil")]
@@ -71,21 +71,22 @@ impl Song {
pub fn song_path(&self) -> Result<String, std::io::Error> { pub fn song_path(&self) -> Result<String, std::io::Error> {
if self.directory.is_empty() { 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 directory = &self.directory;
let mut buffer: String = directory.clone();
let last_index = directory.len() - 1; let last_index = directory.len() - 1;
if let Some(character) = directory.chars().nth(last_index) { if let Some(character) = directory.chars().nth(last_index) {
if character != '/' { let buffer: String = if character != '/' {
buffer += "/"; directory.clone() + "/"
} } else {
directory.clone()
};
buffer += &self.filename.clone(); Ok(buffer + &self.filename.clone())
Ok(buffer)
} else { } else {
Err(std::io::Error::other( Err(std::io::Error::other(
"Could not access last character of directory", "Could not access last character of directory",