Merge branch 'extend_ver_hash' into 'dev'

Extended the hash

See merge request kdeng00/icarus-models!31

.gitlab-ci.yml

@@ -1,6 +1,7 @@
 stages:
   - build
   - test
+  - version
   - deploy
 
 build:
@@ -40,6 +41,32 @@ test_variable:
     rules:
         - if: '$CI_COMMIT_TAG'
 
+extract_version:
+  stage: version
+  image: alpine:latest
+  script:
+    - apk add --no-cache jq
+    - VERSION=$(grep 'version = "' Cargo.toml | awk -F'"' '{print $2}' | head -n 1)
+    - VER_HASH=${CI_COMMIT_SHA:0:10}
+    - VERSION="$VERSION-$VER_HASH"
+    - if [ $? -ne 0 ]; then echo "Error extracting version"; exit 1; fi
+    - echo "Extracted version is"
+    - echo "$VERSION"
+    - echo "VERSION=$VERSION" > version.env
+  artifacts:
+    reports:
+      dotenv: version.env
+
+tag_release:
+  stage: deploy
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: '($CI_COMMIT_BRANCH == "dev" || $CI_COMMIT_BRANCH == "main") && $CI_PIPELINE_SOURCE == "push"'
+  dependencies:
+    - extract_version
+  script:
+    - release-cli create --name "Release $CI_COMMIT_BRANCH-v$VERSION" --tag-name "$CI_COMMIT_BRANCH-v$VERSION"
+
 deploy:
   stage: deploy
   image: rust:1.85
@@ -53,3 +80,4 @@ deploy:
     - build
   rules:
     - if: '$CI_COMMIT_TAG'
+

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "icarus-models"
+version = "0.1.7"
+edition = "2024"
 description = "models used for the icarus project"
 license = "MIT"
-version = "0.1.3"
-edition = "2024"
 
 [dependencies]
 serde = { version = "1.0.218", features = ["derive"] }

src/access_level.rs

@@ -19,13 +19,12 @@ impl Default for AccessLevel {
     }
 }
 
-
 pub fn default_level() -> AccessLevel {
     return AccessLevel {
         id: -1,
         level: String::from("Public"),
         song_id: -1,
-    }
+    };
 }
 
 pub fn private_level() -> AccessLevel {
@@ -33,10 +32,8 @@ pub fn private_level() -> AccessLevel {
         id: -1,
         level: String::from("Private"),
         song_id: -1,
+    };
 }
-}
-
-
 
 impl AccessLevel {
     pub fn _to_json(&self) -> Result<String, serde_json::Error> {

src/constants.rs

@@ -0,0 +1,5 @@
+pub const DEFAULT_MUSIC_EXTENSION: &str = FLAC_EXTENSION;
+pub const FLAC_EXTENSION: &str = ".flac";
+pub const WAV_EXTENSION: &str = ".wav";
+pub const MPTHREE_EXTENSION: &str = ".mp3";
+pub const JPG_EXTENSION: &str = ".jpg";

src/lib.rs

@@ -1,4 +1,5 @@
 pub mod access_level;
+pub mod constants;
 pub mod login_result;
 pub mod song;
 pub mod token;

src/song.rs

@@ -5,62 +5,86 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Song {
+    #[serde(skip_serializing_if = "is_zero")]
     #[serde(alias = "id")]
-    pub id: Option<i32>,
-    pub title: Option<String>,
-    pub artist: Option<String>,
-    pub album: Option<String>,
-    pub album_artist: Option<String>,
-    pub genre: Option<String>,
-    pub year: Option<i32>,
-    pub duration: Option<i32>,
-    pub track: Option<i32>,
-    pub disc: Option<i32>,
-    pub disc_count: Option<i32>,
-    pub track_count: Option<i32>,
-    pub audio_type: Option<String>,
-    pub date_created: Option<String>,
-    pub filename: Option<String>,
-    pub user_id: Option<i32>,
+    pub id: i32,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub title: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub artist: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub album: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub album_artist: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub genre: String,
+    #[serde(skip_serializing_if = "is_zero")]
+    pub year: i32,
+    #[serde(skip_serializing_if = "is_dur_not_set")]
+    pub duration: i32,
+    #[serde(skip_serializing_if = "is_zero")]
+    pub track: i32,
+    #[serde(skip_serializing_if = "is_zero")]
+    pub disc: i32,
+    #[serde(skip_serializing_if = "is_zero")]
+    pub disc_count: i32,
+    #[serde(skip_serializing_if = "is_zero")]
+    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(skip_serializing_if = "String::is_empty")]
+    pub filename: String,
+    #[serde(skip_serializing_if = "is_zero")]
+    pub user_id: i32,
     #[serde(skip)]
-    pub data: Option<Vec<u8>>,
+    pub data: Vec<u8>,
     #[serde(skip)]
-    pub directory: Option<String>,
+    pub directory: String,
     #[serde(skip)]
-    pub album_id: Option<i32>,
+    pub album_id: i32,
     #[serde(skip)]
-    pub artist_id: Option<i32>,
+    pub artist_id: i32,
     #[serde(skip)]
-    pub genre_id: Option<i32>,
+    pub genre_id: i32,
     #[serde(skip)]
-    pub coverart_id: Option<i32>,
+    pub coverart_id: i32,
+}
+
+fn is_zero(num: &i32) -> bool {
+    *num == 0
+}
+
+fn is_dur_not_set(num: &i32) -> bool {
+    *num == 0
 }
 
 impl Default for Song {
     fn default() -> Self {
         Song {
-            id: None,
-            title: None,
-            artist: None,
-            album: None,
-            album_artist: None,
-            genre: None,
-            year: None,
-            duration: None,
-            track: None,
-            disc: None,
-            disc_count: None,
-            track_count: None,
-            audio_type: None,
-            date_created: None,
-            filename: None,
-            user_id: None,
-            data: None,
-            directory: None,
-            album_id: None,
-            artist_id: None,
-            genre_id: None,
-            coverart_id: None,
+            id: 0,
+            title: String::new(),
+            artist: String::new(),
+            album: String::new(),
+            album_artist: String::new(),
+            genre: String::new(),
+            year: 0,
+            duration: 0,
+            track: 0,
+            disc: 0,
+            disc_count: 0,
+            track_count: 0,
+            audio_type: String::new(),
+            date_created: String::new(),
+            filename: String::new(),
+            user_id: 0,
+            data: Vec::new(),
+            directory: String::new(),
+            album_id: 0,
+            artist_id: 0,
+            genre_id: 0,
+            coverart_id: 0,
         }
     }
 }
@@ -71,3 +95,94 @@ impl Song {
         return serde_json::to_string_pretty(&self);
     }
 }
+
+mod embedded {
+    use serde::{Deserialize, Serialize};
+
+    // The song's duration is a floating point in seconds
+    #[derive(Clone, Debug, Deserialize, Serialize)]
+    pub struct Song {
+        #[serde(skip_serializing_if = "is_embed_zero")]
+        #[serde(alias = "id")]
+        pub id: i32,
+        #[serde(skip_serializing_if = "String::is_empty")]
+        pub title: String,
+        #[serde(skip_serializing_if = "String::is_empty")]
+        pub artist: String,
+        #[serde(skip_serializing_if = "String::is_empty")]
+        pub album: String,
+        #[serde(skip_serializing_if = "String::is_empty")]
+        pub album_artist: String,
+        #[serde(skip_serializing_if = "String::is_empty")]
+        pub genre: String,
+        #[serde(skip_serializing_if = "is_embed_zero")]
+        pub year: i32,
+        #[serde(skip_serializing_if = "is_embed_dur_not_set")]
+        pub duration: f64,
+        #[serde(skip_serializing_if = "is_embed_zero")]
+        pub track: i32,
+        #[serde(skip_serializing_if = "is_embed_zero")]
+        pub disc: i32,
+        #[serde(skip_serializing_if = "is_embed_zero")]
+        pub disc_count: i32,
+        #[serde(skip_serializing_if = "is_embed_zero")]
+        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(skip_serializing_if = "String::is_empty")]
+        pub filename: String,
+        #[serde(skip_serializing_if = "is_embed_zero")]
+        pub user_id: i32,
+        #[serde(skip)]
+        pub data: Vec<u8>,
+        #[serde(skip)]
+        pub directory: String,
+        #[serde(skip)]
+        pub album_id: i32,
+        #[serde(skip)]
+        pub artist_id: i32,
+        #[serde(skip)]
+        pub genre_id: i32,
+        #[serde(skip)]
+        pub coverart_id: i32,
+    }
+
+    fn is_embed_zero(num: &i32) -> bool {
+        *num == 0
+    }
+
+    fn is_embed_dur_not_set(num: &f64) -> bool {
+        *num == 0.0
+    }
+
+    impl Default for Song {
+        fn default() -> Self {
+            Song {
+                id: 0,
+                title: String::new(),
+                artist: String::new(),
+                album: String::new(),
+                album_artist: String::new(),
+                genre: String::new(),
+                year: 0,
+                duration: 0.0,
+                track: 0,
+                disc: 0,
+                disc_count: 0,
+                track_count: 0,
+                audio_type: String::new(),
+                date_created: String::new(),
+                filename: String::new(),
+                user_id: 0,
+                data: Vec::new(),
+                directory: String::new(),
+                album_id: 0,
+                artist_id: 0,
+                genre_id: 0,
+                coverart_id: 0,
+            }
+        }
+    }
+}

src/token.rs

@@ -11,6 +11,22 @@ pub struct Token {
     pub issued: i32,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct AccessToken {
+    #[serde(alias = "user_id")]
+    pub user_id: i32,
+    #[serde(alias = "username")]
+    pub username: String,
+    #[serde(alias = "token")]
+    pub token: String,
+    #[serde(alias = "token_type")]
+    pub token_type: String,
+    #[serde(alias = "expiration")]
+    pub expiration: i32,
+    #[serde(alias = "message")]
+    pub message: String,
+}
+
 impl Default for Token {
     fn default() -> Self {
         Token {
@@ -23,6 +39,14 @@ impl Default for Token {
     }
 }
 
+impl AccessToken {
+    pub fn bearer_token(&self) -> String {
+        let mut token: String = String::from("Bearer ");
+        token += &self.token.clone();
+        return token;
+    }
+}
+
 impl Token {
     pub fn _to_json(&self) -> Result<String, serde_json::Error> {
         return serde_json::to_string_pretty(&self);

src/user.rs

@@ -4,19 +4,33 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct User {
+    #[serde(skip_serializing_if = "is_id_valid")]
     pub id: i32,
+    #[serde(skip_serializing_if = "String::is_empty")]
     pub username: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
     pub password: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
     pub email: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
     pub phone: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
     pub firstname: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
     pub lastname: String,
     pub email_verified: bool,
+    #[serde(skip_serializing_if = "String::is_empty")]
     pub date_created: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
     pub status: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
     pub last_login: String,
 }
 
+fn is_id_valid(num: &i32) -> bool {
+    *num > 0
+}
+
 impl Default for User {
     fn default() -> Self {
         User {
@@ -36,7 +50,11 @@ impl Default for User {
 }
 
 impl User {
-    pub fn _to_json(&self) -> Result<String, serde_json::Error> {
+    pub fn to_json(&self, output_pretty: bool) -> Result<String, serde_json::Error> {
+        if output_pretty {
             return serde_json::to_string_pretty(&self);
+        } else {
+            return serde_json::to_string(&self);
+        }
     }
 }