Merge pull request 'devel' (#16) from devel into main

Reviewed-on: phoenix/icarus-models#16

.gitea/workflows/tag_release.yaml

@@ -3,13 +3,14 @@ name: Release Tagging
 on:
   push:
     branches:
+      - main
       - devel
     tags:
       - 'v*' # Trigger on tags matching v*
 
 jobs:
   release:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

.gitea/workflows/workflow.yaml

@@ -13,7 +13,7 @@ on:
 jobs:
   check:
     name: Check
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     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-24.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -33,7 +33,7 @@ jobs:
 
   fmt:
     name: Rustfmt
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -44,7 +44,7 @@ jobs:
 
   clippy:
     name: Clippy
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -55,7 +55,7 @@ jobs:
 
   build:
     name: build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "icarus_models"
+name = "icarus-models"
-version = "0.2.0"
+version = "0.1.14"
 edition = "2024"
 description = "models used for the icarus project"
 license = "MIT"

src/constants.rs

@@ -1,14 +1,5 @@
-pub mod file_extensions {
+pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION;
-    pub mod audio {
+pub const FLACEXTENSION: &str = ".flac";
-        pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION;
+pub const WAVEXTENSION: &str = ".wav";
-        pub const FLACEXTENSION: &str = ".flac";
+pub const MPTHREEEXTENSION: &str = ".mp3";
-        pub const WAVEXTENSION: &str = ".wav";
+pub const JPGEXTENSION: &str = ".jpg";
-        pub const MPTHREEEXTENSION: &str = ".mp3";
-    }
-
-    pub mod image {
-        pub const JPGEXTENSION: &str = ".jpg";
-        pub const JPEGEXTENSION: &str = ".jpeg";
-        pub const PNGEXTENSION: &str = ".png";
-    }
-}

src/coverart.rs

@@ -2,7 +2,7 @@ use std::io::Read;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct CoverArt {
     pub id: i32,
     pub title: String,

src/song.rs

@@ -128,18 +128,12 @@ impl Song {
 
         let file_extension = match typ {
             types::MusicTypes::DefaultMusicExtension => {
-                String::from(constants::file_extensions::audio::DEFAULTMUSICEXTENSION)
+                String::from(constants::DEFAULTMUSICEXTENSION)
             }
 
-            types::MusicTypes::WavExtension => {
+            types::MusicTypes::WavExtension => String::from(constants::WAVEXTENSION),
-                String::from(constants::file_extensions::audio::WAVEXTENSION)
+            types::MusicTypes::FlacExtension => String::from(constants::FLACEXTENSION),
-            }
+            types::MusicTypes::MPThreeExtension => String::from(constants::MPTHREEEXTENSION),
-            types::MusicTypes::FlacExtension => {
-                String::from(constants::file_extensions::audio::FLACEXTENSION)
-            }
-            types::MusicTypes::MPThreeExtension => {
-                String::from(constants::file_extensions::audio::MPTHREEEXTENSION)
-            }
         };
 
         if randomize {