Merge branch 'extend_ver_hash' into 'dev'

Extended the hash

See merge request kdeng00/icarus-models!31

.gitlab-ci.yml

@@ -47,6 +47,8 @@ extract_version:
   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"

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 id: i32,
-    pub title: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
-    pub artist: Option<String>,
+    pub title: String,
-    pub album: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
-    pub album_artist: Option<String>,
+    pub artist: String,
-    pub genre: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
-    pub year: Option<i32>,
+    pub album: String,
-    pub duration: Option<i32>,
+    #[serde(skip_serializing_if = "String::is_empty")]
-    pub track: Option<i32>,
+    pub album_artist: String,
-    pub disc: Option<i32>,
+    #[serde(skip_serializing_if = "String::is_empty")]
-    pub disc_count: Option<i32>,
+    pub genre: String,
-    pub track_count: Option<i32>,
+    #[serde(skip_serializing_if = "is_zero")]
-    pub audio_type: Option<String>,
+    pub year: i32,
-    pub date_created: Option<String>,
+    #[serde(skip_serializing_if = "is_dur_not_set")]
-    pub filename: Option<String>,
+    pub duration: i32,
-    pub user_id: Option<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,
+            id: 0,
-            title: None,
+            title: String::new(),
-            artist: None,
+            artist: String::new(),
-            album: None,
+            album: String::new(),
-            album_artist: None,
+            album_artist: String::new(),
-            genre: None,
+            genre: String::new(),
-            year: None,
+            year: 0,
-            duration: None,
+            duration: 0,
-            track: None,
+            track: 0,
-            disc: None,
+            disc: 0,
-            disc_count: None,
+            disc_count: 0,
-            track_count: None,
+            track_count: 0,
-            audio_type: None,
+            audio_type: String::new(),
-            date_created: None,
+            date_created: String::new(),
-            filename: None,
+            filename: String::new(),
-            user_id: None,
+            user_id: 0,
-            data: None,
+            data: Vec::new(),
-            directory: None,
+            directory: String::new(),
-            album_id: None,
+            album_id: 0,
-            artist_id: None,
+            artist_id: 0,
-            genre_id: None,
+            genre_id: 0,
-            coverart_id: None,
+            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,
+            }
+        }
+    }
+}