From bf5808a06a0af7b4297585e2dd50bffb386578d4 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 22:36:47 +0000 Subject: [PATCH 1/5] Added default to coverart model (#18) Reviewed-on: https://git.kundeng.us/phoenix/icarus-models/pulls/18 Co-authored-by: phoenix Co-committed-by: phoenix --- src/coverart.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coverart.rs b/src/coverart.rs index f8aaec5..16ffdf8 100644 --- a/src/coverart.rs +++ b/src/coverart.rs @@ -2,7 +2,7 @@ use std::io::Read; use serde::{Deserialize, Serialize}; -#[derive(Debug, Clone, Deserialize, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Serialize)] pub struct CoverArt { pub id: i32, pub title: String, From 56384fb371bb918c17f4a50fc5a076967d5a04e3 Mon Sep 17 00:00:00 2001 From: KD Date: Sat, 29 Mar 2025 22:37:02 +0000 Subject: [PATCH 2/5] Added file extension constant and updated constants module (#17) Reviewed-on: https://git.kundeng.us/phoenix/icarus-models/pulls/17 Co-authored-by: KD Co-committed-by: KD --- src/constants.rs | 19 ++++++++++++++----- src/song.rs | 14 ++++++++++---- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/constants.rs b/src/constants.rs index 51dd5ea..4a982b1 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -1,5 +1,14 @@ -pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION; -pub const FLACEXTENSION: &str = ".flac"; -pub const WAVEXTENSION: &str = ".wav"; -pub const MPTHREEEXTENSION: &str = ".mp3"; -pub const JPGEXTENSION: &str = ".jpg"; +pub mod file_extensions { + pub mod audio { + pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION; + pub const FLACEXTENSION: &str = ".flac"; + pub const WAVEXTENSION: &str = ".wav"; + pub const MPTHREEEXTENSION: &str = ".mp3"; + } + + pub mod image { + pub const JPGEXTENSION: &str = ".jpg"; + pub const JPEGEXTENSION: &str = ".jpeg"; + pub const PNGEXTENSION: &str = ".png"; + } +} diff --git a/src/song.rs b/src/song.rs index 4d319dc..3f0d15f 100644 --- a/src/song.rs +++ b/src/song.rs @@ -128,12 +128,18 @@ impl Song { let file_extension = match typ { types::MusicTypes::DefaultMusicExtension => { - String::from(constants::DEFAULTMUSICEXTENSION) + String::from(constants::file_extensions::audio::DEFAULTMUSICEXTENSION) } - types::MusicTypes::WavExtension => String::from(constants::WAVEXTENSION), - types::MusicTypes::FlacExtension => String::from(constants::FLACEXTENSION), - types::MusicTypes::MPThreeExtension => String::from(constants::MPTHREEEXTENSION), + types::MusicTypes::WavExtension => { + String::from(constants::file_extensions::audio::WAVEXTENSION) + } + types::MusicTypes::FlacExtension => { + String::from(constants::file_extensions::audio::FLACEXTENSION) + } + types::MusicTypes::MPThreeExtension => { + String::from(constants::file_extensions::audio::MPTHREEEXTENSION) + } }; if randomize { From a8ffe8029799c09d385f2436ee15064dfb03f82c Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Mar 2025 19:35:02 -0400 Subject: [PATCH 3/5] Changing project name Change name in the project settings and in other projects later --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2e6113e..413ab71 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "icarus-models" +name = "icarus_models" version = "0.1.14" edition = "2024" description = "models used for the icarus project" From e5c1eabe8c5b43a7b2795fdfdd034be045a6af2a Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 30 Mar 2025 16:53:17 +0000 Subject: [PATCH 4/5] Removed main branch from tag release workflow (#19) Reviewed-on: https://git.kundeng.us/phoenix/icarus-models/pulls/19 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yaml | 3 +-- .gitea/workflows/workflow.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index 287ac4f..25c260c 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -3,14 +3,13 @@ name: Release Tagging on: push: branches: - - main - devel tags: - 'v*' # Trigger on tags matching v* jobs: release: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index c3640b8..cf14ef2 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -13,7 +13,7 @@ on: jobs: check: name: Check - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions-rust-lang/setup-rust-toolchain@v1 @@ -23,7 +23,7 @@ jobs: test: name: Test Suite - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions-rust-lang/setup-rust-toolchain@v1 @@ -33,7 +33,7 @@ jobs: fmt: name: Rustfmt - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions-rust-lang/setup-rust-toolchain@v1 @@ -44,7 +44,7 @@ jobs: clippy: name: Clippy - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions-rust-lang/setup-rust-toolchain@v1 @@ -55,7 +55,7 @@ jobs: build: name: build - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions-rust-lang/setup-rust-toolchain@v1 From a64d35d15328c464c67a77ae9b6259789b76a840 Mon Sep 17 00:00:00 2001 From: KD Date: Sun, 30 Mar 2025 17:14:13 +0000 Subject: [PATCH 5/5] Version bump (#22) v0.1.16 Reviewed-on: https://git.kundeng.us/phoenix/icarus-models/pulls/22 Co-authored-by: KD Co-committed-by: KD --- .gitea/workflows/tag_release.yaml | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index 25c260c..6a11acb 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -9,7 +9,7 @@ on: jobs: release: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/Cargo.toml b/Cargo.toml index 413ab71..4189aef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus_models" -version = "0.1.14" +version = "0.2.0" edition = "2024" description = "models used for the icarus project" license = "MIT"