From 3ee3ac737b39fb60c500306d73f140144d6b83d2 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 18 Oct 2025 20:57:21 -0400 Subject: [PATCH 01/10] tsk-73: Change type of date_created to an option of time::OffsetDateTime --- src/song.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/song.rs b/src/song.rs index 230b516..27cd011 100644 --- a/src/song.rs +++ b/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, #[serde(skip_serializing_if = "String::is_empty")] pub filename: String, #[serde(skip_serializing_if = "init::is_uuid_nil")] -- 2.43.0 From 580f5e9be72ca5f14d0e326cdf7ba710f56f01b1 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 18 Oct 2025 21:00:38 -0400 Subject: [PATCH 02/10] tsk-73: Code cleanup: : --- src/song.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/song.rs b/src/song.rs index 27cd011..af0f209 100644 --- a/src/song.rs +++ b/src/song.rs @@ -71,21 +71,22 @@ impl Song { pub fn song_path(&self) -> Result { 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", -- 2.43.0 From bd26afdddf7c803014aa6926ec25b067a477ec16 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 18 Oct 2025 21:02:13 -0400 Subject: [PATCH 03/10] Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b33e3e..8cf848a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -149,7 +149,7 @@ checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" [[package]] name = "icarus_models" -version = "0.7.1" +version = "0.7.2" dependencies = [ "josekit", "rand", diff --git a/Cargo.toml b/Cargo.toml index 5637ea4..54a405f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" -- 2.43.0 From 3437ee7c5b40e99bee2bde25493c7e2c97482864 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 18 Oct 2025 21:12:29 -0400 Subject: [PATCH 04/10] tsk-73: Updated tag release workflow --- .gitea/workflows/tag_release.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index 52ebe9c..564d103 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -27,11 +27,14 @@ jobs: VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/') PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10) 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" + BRANCH_NAME="${$BRANCH_REFNAME}" + PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111" + + echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE" + echo "Version: $VERSION" echo "Hash: $PROJECT_COMMIT_HASH" + echo "Branh ref: $BRANCH_REF" echo "Branch: $BRANCH_NAME" echo "Tag Release: $PROJECT_TAG_RELEASE" -- 2.43.0 From 19b785e0106aa843a8b21f3e585f6b1c3412eb43 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 18 Oct 2025 21:17:36 -0400 Subject: [PATCH 05/10] tsk-73: Workflow fix --- .gitea/workflows/tag_release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index 564d103..20123cf 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -27,7 +27,7 @@ jobs: VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/') PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10) BRANCH_REF="${GITHUB_REF}" - BRANCH_NAME="${$BRANCH_REFNAME}" + BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3) PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111" echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE" -- 2.43.0 From 933c9b7f34567abba9dd8a3bc32c35d77422d997 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 18 Oct 2025 21:21:00 -0400 Subject: [PATCH 06/10] tsk-73: Workflow fix --- .gitea/workflows/tag_release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index 20123cf..e700034 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -26,8 +26,8 @@ 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="${GITHUB_REF}" - BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3) + BRANCH_REF="${{ gitea.ref }}" + BRANCH_NAME=${{ gitea.ref_name }} PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111" echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE" -- 2.43.0 From 0edda1a23f3d2319b804261fbf55949223cfa0ed Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 18 Oct 2025 21:25:01 -0400 Subject: [PATCH 07/10] tsk-73: Workflow tweaks --- .gitea/workflows/tag_release.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index e700034..750097b 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -27,7 +27,8 @@ jobs: 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_NAME=${{ gitea.ref_name }} + 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" @@ -35,6 +36,7 @@ jobs: 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.43.0 From ea79bd14c5315ced21829d6f515d5631da4f2cf8 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 18 Oct 2025 21:30:20 -0400 Subject: [PATCH 08/10] tsk-73: Might fix the issue --- .gitea/workflows/tag_release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index 750097b..9eefd49 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -27,8 +27,8 @@ jobs: 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 }} + 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" -- 2.43.0 From 1265c10df83b75ef194d7edded3124c7ada2c3e1 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 18 Oct 2025 21:36:03 -0400 Subject: [PATCH 09/10] tsk-73: Another tweak --- .gitea/workflows/tag_release.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index 9eefd49..9e8ba84 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -27,8 +27,7 @@ jobs: 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 }}" + BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3) PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111" echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE" @@ -36,7 +35,6 @@ jobs: 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.43.0 From 7035fd979bd4866cd66e86e3e3d22c7c5c27d8f0 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 18 Oct 2025 21:38:01 -0400 Subject: [PATCH 10/10] tsk-73: Modified tag workflow triggering --- .gitea/workflows/tag_release.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index 9e8ba84..717f9ac 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -1,10 +1,12 @@ name: Release Tagging on: + push: + branches: + - next-v0.8 pull_request: branches: - main - - next-v0.8 jobs: release: -- 2.43.0