Compare commits

..

9 Commits

Author SHA1 Message Date
3f66f4ee7b tsk-72: Test fix
All checks were successful
Rust Build / Check (pull_request) Successful in 1m1s
Rust Build / Clippy (pull_request) Successful in 51s
Rust Build / Rustfmt (pull_request) Successful in 1m10s
Rust Build / build (pull_request) Successful in 36s
Release Tagging / release (pull_request) Successful in 1m2s
Rust Build / Test Suite (pull_request) Successful in 1m44s
2025-10-18 20:25:51 -04:00
d3510a1dd2 Version bump
Some checks failed
Rust Build / Check (pull_request) Successful in 38s
Release Tagging / release (pull_request) Successful in 1m12s
Rust Build / Rustfmt (pull_request) Successful in 42s
Rust Build / Clippy (pull_request) Successful in 44s
Rust Build / build (pull_request) Successful in 36s
Rust Build / Test Suite (pull_request) Failing after 1m2s
2025-10-18 20:18:10 -04:00
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
9db4810a7b Updated build workflow
All checks were successful
Release Tagging / release (pull_request) Successful in 38s
Rust Build / Rustfmt (pull_request) Successful in 32s
Rust Build / build (pull_request) Successful in 33s
Rust Build / Clippy (pull_request) Successful in 43s
Rust Build / Check (pull_request) Successful in 32s
Rust Build / Test Suite (pull_request) Successful in 43s
2025-10-18 16:09:41 -04:00
146014f9f3 Updated release tagging workflow 2025-10-18 16:08:43 -04:00
3c6675de1e tsk-72: Adding directory and filename to coverart 2025-10-18 15:55:52 -04:00
4 changed files with 16 additions and 22 deletions

View File

@@ -26,17 +26,12 @@ jobs:
run: |
VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/')
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
BRANCH_REF="${{ gitea.ref }}"
BRANCH_REF_NAME=${{ gitea.ref_name }}
BRANCH_NAME=${{ gitea.ref_type }}
PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111"
echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE"
BRANCH_REF="${GITHUB_REF}"
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH"
echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-111"
echo "Version: $VERSION"
echo "Hash: $PROJECT_COMMIT_HASH"
echo "Branh ref: $BRANCH_REF"
echo "Branh ref name: $BRANCH_REF_NAME"
echo "Branch: $BRANCH_NAME"
echo "Tag Release: $PROJECT_TAG_RELEASE"

2
Cargo.lock generated
View File

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

View File

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

View File

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