Version bump

.gitea/workflows/tag_release.yaml

@@ -1,17 +1,16 @@
 name: Release Tagging
 
 on:
-  push:
+  pull_request:
     branches:
       - main
-      - next-v0.8
 
 jobs:
   release:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Important for git describe --tags
 
@@ -26,15 +25,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="${GITHUB_REF}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
-          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111"
+          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH"
-
+          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 "Hash: $PROJECT_COMMIT_HASH"
-          echo "Branh ref: $BRANCH_REF"
           echo "Branch: $BRANCH_NAME"
           echo "Tag Release: $PROJECT_TAG_RELEASE"
 

.gitea/workflows/workflow.yaml

@@ -7,14 +7,13 @@ on:
   pull_request:
     branches:
       - main 
-      - next-v0.8
 
 jobs:
   check:
     name: Check
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.90.0
@@ -24,7 +23,7 @@ jobs:
     name: Test Suite
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.90.0
@@ -34,7 +33,7 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.90.0
@@ -45,7 +44,7 @@ jobs:
     name: Clippy
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.90.0
@@ -56,7 +55,7 @@ jobs:
     name: build
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.90.0

Cargo.lock

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

Cargo.toml

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

src/coverart.rs

@@ -7,22 +7,22 @@ pub struct CoverArt {
     pub id: uuid::Uuid,
     pub title: String,
     #[serde(skip)]
-    pub directory: String,
+    pub path: String,
-    pub filename: String,
     #[serde(skip)]
     pub data: Vec<u8>,
     pub song_id: uuid::Uuid,
 }
 
 pub mod init {
-    use super::CoverArt;
+    use crate::coverart::CoverArt;
 
-    /// Initializes the CoverArt with just the directory and filename
+    pub fn init_coverart_only_path(path: String) -> CoverArt {
-    pub fn init_coverart_dir_and_filename(directory: &str, filename: &str) -> CoverArt {
         CoverArt {
-            directory: String::from(directory),
+            id: uuid::Uuid::nil(),
-            filename: String::from(filename),
+            title: String::new(),
-            ..Default::default()
+            path: path.clone(),
+            data: Vec::new(),
+            song_id: uuid::Uuid::nil(),
         }
     }
 }
@@ -30,23 +30,18 @@ pub mod init {
 impl CoverArt {
     /// Saves the coverart to the filesystem
     pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> {
-        match self.get_path() {
+        match std::fs::File::create(&self.path) {
-            Ok(path) => match std::fs::File::create(&path) {
             Ok(mut file) => match file.write_all(&self.data) {
                 Ok(_) => Ok(()),
                 Err(err) => Err(err),
             },
             Err(err) => Err(err),
-            },
-            Err(err) => Err(err),
         }
     }
 
     /// Removes the coverart from the filesystem
     pub fn remove_from_filesystem(&self) -> Result<(), std::io::Error> {
-        match self.get_path() {
+        let p = std::path::Path::new(&self.path);
-            Ok(path) => {
-                let p = std::path::Path::new(&path);
         if p.exists() {
             match std::fs::remove_file(p) {
                 Ok(_) => Ok(()),
@@ -58,35 +53,6 @@ impl CoverArt {
             ))
         }
     }
-            Err(err) => Err(err),
-        }
-    }
-
-    /// Gets the path of the CoverArt
-    pub fn get_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"));
-        }
-
-        let directory = &self.directory;
-        let last_index = directory.len() - 1;
-
-        if let Some(character) = directory.chars().nth(last_index) {
-            let buffer = if character != '/' {
-                directory.clone() + "/"
-            } else {
-                directory.clone()
-            };
-
-            Ok(buffer + &self.filename.clone())
-        } else {
-            Err(std::io::Error::other(
-                "Could not access last character of directory",
-            ))
-        }
-    }
 }
 
 pub mod io {
@@ -94,8 +60,7 @@ pub mod io {
 
     /// Gets the raw data of the cover art
     pub fn to_data(coverart: &super::CoverArt) -> Result<Vec<u8>, std::io::Error> {
-        match coverart.get_path() {
+        let path: &String = &coverart.path;
-            Ok(path) => {
         let mut file = std::fs::File::open(path)?;
         let mut buffer = Vec::new();
         match file.read_to_end(&mut buffer) {
@@ -103,9 +68,6 @@ pub mod io {
             Err(err) => Err(err),
         }
     }
-            Err(err) => Err(err),
-        }
-    }
 }
 
 #[cfg(test)]
@@ -114,11 +76,9 @@ mod tests {
 
     #[test]
     fn test_cover_art_image() {
-        let dir = String::from("./");
+        let path: String = String::from("somepath");
-        let filename = String::from("CoverArt.png");
+        let coverart = coverart::init::init_coverart_only_path(path.clone());
-        let coverart = coverart::init::init_coverart_dir_and_filename(&dir, &filename);
 
-        assert_eq!(dir, coverart.directory);
+        assert_eq!(path, coverart.path);
-        assert_eq!(filename, coverart.filename);
     }
 }

src/login_result.rs

@@ -2,7 +2,7 @@ use std::default::Default;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct LoginResult {
     pub id: uuid::Uuid,
     pub username: String,
@@ -12,14 +12,20 @@ pub struct LoginResult {
     pub expiration: i64,
 }
 
-impl LoginResult {
+impl Default for LoginResult {
-    pub fn to_json(&self) -> Result<String, serde_json::Error> {
+    fn default() -> Self {
-        serde_json::to_string_pretty(&self)
+        LoginResult {
+            id: uuid::Uuid::nil(),
+            username: String::new(),
+            token: String::new(),
+            token_type: String::new(),
+            expiration: -1,
         }
-
+    }
-    pub fn token_expired(&self) -> bool {
+}
-        let current_time = time::OffsetDateTime::now_utc();
+
-        let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
+impl LoginResult {
-        current_time > expired
+    pub fn _to_json(&self) -> Result<String, serde_json::Error> {
+        serde_json::to_string_pretty(&self)
     }
 }

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(with = "time::serde::rfc3339::option")]
+    #[serde(skip_serializing_if = "String::is_empty")]
-    pub date_created: Option<time::OffsetDateTime>,
+    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"));
+            return Err(std::io::Error::other("Directory does not exist"));
-        } 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) {
-            let buffer: String = if character != '/' {
+            if character != '/' {
-                directory.clone() + "/"
+                buffer += "/";
-            } else {
+            }
-                directory.clone()
-            };
 
-            Ok(buffer + &self.filename.clone())
+            buffer += &self.filename.clone();
+
+            Ok(buffer)
         } else {
             Err(std::io::Error::other(
                 "Could not access last character of directory",

src/token.rs

@@ -2,7 +2,7 @@ use std::default::Default;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Token {
     pub scope: String,
     pub expiration: i64,
@@ -27,16 +27,23 @@ pub struct AccessToken {
     pub message: String,
 }
 
-impl AccessToken {
+impl Default for Token {
-    /// Get the token fit for Bearer authentication
+    fn default() -> Self {
-    pub fn bearer_token(&self) -> String {
+        Token {
-        format!("Bearer {}", self.token)
+            scope: String::new(),
+            expiration: -1,
+            audience: String::new(),
+            issuer: String::new(),
+            issued: -1,
         }
+    }
+}
 
-    pub fn token_expired(&self) -> bool {
+impl AccessToken {
-        let current_time = time::OffsetDateTime::now_utc();
+    pub fn bearer_token(&self) -> String {
-        let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
+        let mut token: String = String::from("Bearer ");
-        current_time > expired
+        token += &self.token.clone();
+        token
     }
 }
 
@@ -45,10 +52,9 @@ impl Token {
         serde_json::to_string_pretty(&self)
     }
 
+    // TODO: Implement
     pub fn token_expired(&self) -> bool {
-        let current_time = time::OffsetDateTime::now_utc();
+        false
-        let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
-        current_time > expired
     }
 
     pub fn contains_scope(&self, des_scope: &String) -> bool {