Refactoring (#24)

Reviewed-on: #24
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>

Cargo.lock

@@ -1175,6 +1175,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
+ "time",
  "tokio",
  "uuid",
 ]

Cargo.toml

@@ -10,6 +10,7 @@ futures = { version = "0.3.31" }
 reqwest = { version = "0.12.19", features = ["json", "stream"] }
 serde = { version = "1.0.218", features = ["derive"] }
 serde_json = { version = "1.0.139" }
+time = { version = "0.3.41", features = ["macros", "serde"] }
 uuid = { version = "1.16.0", features = ["v4", "serde"] }
 icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.3" }
 icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.2.2-devel-84ea6e4c22-006" }

src/main.rs

@@ -9,66 +9,102 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     loop {
         println!("Base URL: {}", app_base_url);
 
-        match api::fetch_next_queue_item(&app_base_url).await {
+        match is_queue_empty(&app_base_url).await {
-            Ok(response) => {
+            Ok((empty, song_queue_item)) => {
-                match response
+                if !empty {
-                    .json::<responses::fetch_next_queue_item::SongQueueItem>()
+                    println!("Queue is not empty");
-                    .await
+                    println!("SongQueueItem: {:?}", song_queue_item);
-                {
+                    let song_queue_id = song_queue_item.data[0].id;
-                    Ok(song_queue_item) => {
-                        if !song_queue_item.data.is_empty() {
-                            println!("Song queue item: {:?}", song_queue_item);
 
-                            println!("Fetching song queue data");
+                    // TODO: Do something with the result later
-                            match api::fetch_song_queue_data::get_data(
+                    let _ = process_song(&app_base_url, &song_queue_id).await;
-                                &app_base_url,
+                } else {
-                                &song_queue_item.data[0].id,
+                    println!("Queue is empty");
-                            )
+                }
-                            .await
+            }
+            Err(err) => {
+                eprintln!("Error checking if queue is empty: {:?}", err);
+            }
+        }
+
+        println!("Sleeping");
+        tokio::time::sleep(tokio::time::Duration::from_secs(SECONDS_TO_SLEEP)).await;
+    }
+}
+
+async fn is_queue_empty(
+    api_url: &String,
+) -> Result<(bool, responses::fetch_next_queue_item::SongQueueItem), reqwest::Error> {
+    match api::fetch_next_queue_item(api_url).await {
+        Ok(response) => {
+            match response
+                .json::<responses::fetch_next_queue_item::SongQueueItem>()
+                .await
+            {
+                Ok(response) => {
+                    if response.data.is_empty() {
+                        Ok((true, response))
+                    } else {
+                        Ok((false, response))
+                    }
+                }
+                Err(err) => Err(err),
+            }
+        }
+        Err(err) => Err(err),
+    }
+}
+
+async fn process_song(api_url: &String, song_queue_id: &uuid::Uuid) -> Result<(), reqwest::Error> {
+    match api::fetch_song_queue_data::get_data(api_url, song_queue_id).await {
+        Ok(response) => {
+            // Process data here...
+            match api::fetch_song_queue_data::response::parse_response(response).await {
+                Ok(all_bytes) => {
+                    let (directory, filename) = generate_song_queue_dir_and_filename().await;
+                    let save_path = save_song_to_fs(&directory, &filename, &all_bytes).await;
+
+                    println!("Saved at: {:?}", save_path);
+
+                    match api::get_metadata_queue::get(api_url, song_queue_id).await {
+                        Ok(response) => {
+                            match response
+                                .json::<api::get_metadata_queue::response::Response>()
+                                .await
                             {
                                 Ok(response) => {
-                                    // Process data here...
+                                    let id = &response.data[0].id;
-                                    let all_bytes =
+                                    let metadata = &response.data[0].metadata;
-                                        api::fetch_song_queue_data::response::parse_response(
+                                    let created_at = &response.data[0].created_at;
-                                            response,
+                                    println!("Id: {:?}", id);
-                                        )
+                                    println!("Metadata: {:?}", metadata);
-                                        .await?;
+                                    println!("Created at: {:?}", created_at);
-
-                                    let (directory, filename) =
-                                        generate_song_queue_dir_and_filename().await;
-                                    let save_path =
-                                        save_song_to_fs(&directory, &filename, &all_bytes).await;
-
-                                    println!("Saved at: {:?}", save_path);
-
-                                    // TODO: Get queued song's metadata
                                     // TODO: Get queued coverart
                                     // TODO: Get queued coverart's data
-                                    // TODO: Apply metadata to the queued song
+                                    // TODO: Apply metadata to the queued song (modifying file)
                                     // TODO: Update the queued song with the updated queued song
                                     // TODO: Create song
                                     // TODO: Create coverart
                                     // TODO: Wipe data from queued song
                                     // TODO: Wipe data from queued coverart
+                                    Ok(())
                                 }
                                 Err(err) => {
-                                    eprintln!("Error fetching song queue data: {:?}", err);
+                                    eprintln!("Error: {:?}", err);
+                                    Err(err)
                                 }
                             }
-                        } else {
+                        }
-                            println!("No data to fetch");
+                        Err(err) => {
+                            eprintln!("Error: {:?}", err);
+                            Err(err)
                         }
                     }
-                    Err(err) => {
-                        eprintln!("Error: {:?}", err);
-                    }
                 }
+                Err(err) => Err(err),
             }
-            Err(e) => eprintln!("API call failed: {}", e),
         }
-
+        Err(err) => Err(err),
-        println!("Sleeping");
-        tokio::time::sleep(tokio::time::Duration::from_secs(SECONDS_TO_SLEEP)).await;
     }
 }
 
@@ -159,4 +195,55 @@ mod api {
             }
         }
     }
+
+    pub mod get_metadata_queue {
+        pub async fn get(
+            base_url: &String,
+            song_queue_id: &uuid::Uuid,
+        ) -> Result<reqwest::Response, reqwest::Error> {
+            let client = reqwest::Client::new();
+            let endpoint = String::from("api/v2/song/metadata/queue");
+            let api_url = format!("{}/{}", base_url, endpoint);
+            client
+                .get(api_url)
+                .query(&[("song_queue_id", song_queue_id)])
+                .send()
+                .await
+        }
+
+        pub mod response {
+            use serde::{Deserialize, Serialize};
+
+            #[derive(Debug, Deserialize, Serialize)]
+            pub struct Metadata {
+                pub id: uuid::Uuid,
+                pub album: String,
+                pub album_artist: String,
+                pub artist: String,
+                pub disc: i32,
+                pub disc_count: i32,
+                pub duration: i64,
+                pub genre: String,
+                pub title: String,
+                pub track: i32,
+                pub track_count: i32,
+                pub year: i32,
+            }
+
+            #[derive(Debug, Deserialize, Serialize)]
+            pub struct QueueItem {
+                pub id: uuid::Uuid,
+                pub metadata: Metadata,
+                #[serde(with = "time::serde::rfc3339")]
+                pub created_at: time::OffsetDateTime,
+                pub song_queue_id: uuid::Uuid,
+            }
+
+            #[derive(Debug, Deserialize, Serialize)]
+            pub struct Response {
+                pub message: String,
+                pub data: Vec<QueueItem>,
+            }
+        }
+    }
 }