Wipe data from CoverArt queue (#36)

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

.gitea/workflows/tag_release.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.88.0
+          toolchain: 1.86.0
           components: cargo
 
       - name: Extract Version from Cargo.toml
@@ -29,7 +29,7 @@ jobs:
           BRANCH_REF="${GITHUB_REF}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
           PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH"
-          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-431"
+          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-372"
           echo "Version: $VERSION"
           echo "Hash: $PROJECT_COMMIT_HASH"
           echo "Branch: $BRANCH_NAME"

Cargo.lock

@@ -518,8 +518,8 @@ dependencies = [
 
 [[package]]
 name = "icarus_models"
-version = "0.5.0"
+version = "0.4.5"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.5.0-devel-7958b89abc-111#7958b89abc56bc9262015b3e201ea2906cc8a9ff"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.4.5-devel-655d05dabb-111#655d05dabbdadb9b28940564a1eb82470aa4f166"
 dependencies = [
  "rand",
  "serde",
@@ -1255,7 +1255,7 @@ dependencies = [
 
 [[package]]
 name = "songparser"
-version = "0.2.0"
+version = "0.2.3"
 dependencies = [
  "futures",
  "icarus_envy",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "songparser"
-version = "0.2.0"
+version = "0.2.3"
 edition = "2024"
 rust-version = "1.88"
 
@@ -14,5 +14,5 @@ time = { version = "0.3.41", features = ["macros", "serde"] }
 uuid = { version = "1.17.0", features = ["v4", "serde"] }
 rand = { version = "0.9.1" }
 icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.3.0-devel-f4b71de969-680" }
-icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.5.0-devel-7958b89abc-111" }
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.5-devel-655d05dabb-111" }
 icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.3.0-devel-d73fba9899-006" }

src/api.rs

@@ -0,0 +1,131 @@
+pub async fn fetch_next_queue_item(base_url: &String) -> Result<reqwest::Response, reqwest::Error> {
+    let client = reqwest::Client::new();
+    let fetch_endpoint = String::from("api/v2/song/queue/next");
+    let api_url = format!("{base_url}/{fetch_endpoint}");
+    client.get(api_url).send().await
+}
+
+pub mod parsing {
+    use futures::StreamExt;
+
+    pub async fn parse_response_into_bytes(
+        response: reqwest::Response,
+    ) -> Result<Vec<u8>, reqwest::Error> {
+        // TODO: At some point, handle the flow if the size is small or
+        // large
+        let mut byte_stream = response.bytes_stream();
+        let mut all_bytes = Vec::new();
+
+        while let Some(chunk) = byte_stream.next().await {
+            let chunk = chunk?;
+            all_bytes.extend_from_slice(&chunk);
+        }
+
+        Ok(all_bytes)
+    }
+}
+
+pub mod fetch_song_queue_data {
+    pub async fn get_data(
+        base_url: &String,
+        id: &uuid::Uuid,
+    ) -> Result<reqwest::Response, reqwest::Error> {
+        let client = reqwest::Client::new();
+        let endpoint = String::from("api/v2/song/queue");
+        let api_url = format!("{base_url}/{endpoint}/{id}");
+        client.get(api_url).send().await
+    }
+}
+
+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(Clone, Debug, Deserialize, Serialize)]
+        pub struct Metadata {
+            pub song_queue_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>,
+        }
+    }
+}
+
+pub mod get_coverart_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/coverart/queue");
+        let api_url = format!("{base_url}/{endpoint}");
+        client
+            .get(api_url)
+            .query(&[("song_queue_id", song_queue_id)])
+            .send()
+            .await
+    }
+
+    pub async fn get_data(
+        base_url: &String,
+        coverart_queue_id: &uuid::Uuid,
+    ) -> Result<reqwest::Response, reqwest::Error> {
+        let client = reqwest::Client::new();
+        let endpoint = String::from("api/v2/coverart/queue/data");
+        let api_url = format!("{base_url}/{endpoint}/{coverart_queue_id}");
+        client.get(api_url).send().await
+    }
+
+    pub mod response {
+        use serde::{Deserialize, Serialize};
+
+        #[derive(Debug, Deserialize, Serialize)]
+        pub struct CoverArtQueue {
+            pub id: uuid::Uuid,
+            pub song_queue_id: uuid::Uuid,
+        }
+
+        #[derive(Debug, Deserialize, Serialize)]
+        pub struct Response {
+            pub message: String,
+            pub data: Vec<CoverArtQueue>,
+        }
+    }
+}

src/main.rs

@@ -1,3 +1,5 @@
+pub mod api;
+pub mod responses;
 pub mod the_rest;
 pub mod update_queued_song;
 pub mod util;
@@ -22,7 +24,28 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
                     // TODO: Do something with the result later
                     match some_work(&app_base_url, &song_queue_id).await {
-                        Ok(_) => {}
+                        Ok((
+                            _song,
+                            _coverart,
+                            (song_queue_id, song_queue_path),
+                            (coverart_queue_id, coverart_queue_path),
+                        )) => {
+                            // TODO: Wipe data from song and coverart queues
+                            match wipe_data_from_queues(
+                                &app_base_url,
+                                &song_queue_id,
+                                &coverart_queue_id,
+                            )
+                            .await
+                            {
+                                Ok(_) => {
+                                    // TODO: Cleanup files in local filesystem
+                                }
+                                Err(err) => {
+                                    eprintln!("Error: {err:?}");
+                                }
+                            }
+                        }
                         Err(err) => {
                             eprintln!("Error: {err:?}");
                         }
@@ -41,6 +64,41 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     }
 }
 
+async fn wipe_data_from_queues(
+    app_base_url: &String,
+    song_queue_id: &uuid::Uuid,
+    coverart_queue_id: &uuid::Uuid,
+) -> Result<(), std::io::Error> {
+    match the_rest::wipe_data::song_queue::wipe_data(app_base_url, song_queue_id).await {
+        Ok(response) => match response
+            .json::<the_rest::wipe_data::song_queue::response::Response>()
+            .await
+        {
+            Ok(_resp) => match the_rest::wipe_data::coverart_queue::wipe_data(
+                app_base_url,
+                coverart_queue_id,
+            )
+            .await
+            {
+                Ok(inner_response) => match inner_response
+                    .json::<the_rest::wipe_data::coverart_queue::response::Response>()
+                    .await
+                {
+                    Ok(_inner_resp) => {
+                        println!("Wiped data from CoverArt queue");
+                        println!("Resp: {_inner_resp:?}");
+                        Ok(())
+                    }
+                    Err(err) => Err(std::io::Error::other(err.to_string())),
+                },
+                Err(err) => Err(std::io::Error::other(err.to_string())),
+            },
+            Err(err) => Err(std::io::Error::other(err.to_string())),
+        },
+        Err(err) => Err(std::io::Error::other(err.to_string())),
+    }
+}
+
 async fn is_queue_empty(
     api_url: &String,
 ) -> Result<(bool, responses::fetch_next_queue_item::SongQueueItem), reqwest::Error> {
@@ -67,9 +125,17 @@ async fn is_queue_empty(
 async fn some_work(
     app_base_url: &String,
     song_queue_id: &uuid::Uuid,
-) -> Result<(), std::io::Error> {
+) -> Result<
+    (
+        icarus_models::song::Song,
+        icarus_models::coverart::CoverArt,
+        (uuid::Uuid, String),
+        (uuid::Uuid, String),
+    ),
+    std::io::Error,
+> {
     match prep_song(app_base_url, song_queue_id).await {
-        Ok((song_queue_path, coverart_queue_path, metadata)) => {
+        Ok((song_queue_path, coverart_queue_path, metadata, coverart_queue_id)) => {
             match apply_metadata(&song_queue_path, &coverart_queue_path, &metadata).await {
                 Ok(_applied) => {
                     match update_queued_song::update_queued_song(
@@ -86,7 +152,50 @@ async fn some_work(
                             {
                                 Ok(_inner_response) => {
                                     println!("Response: {_inner_response:?}");
-                                    Ok(())
+
+                                    // TODO: Do not hard code this. Check if one of the existing
+                                    // endpoints already have the user_id
+                                    let user_id = uuid::Uuid::new_v4();
+                                    // TODO: Place this somewhere else
+                                    let song_type = String::from("flac");
+                                    // Err(std::io::Error::other(err.to_string()))
+                                    match the_rest::create_song::create(
+                                        app_base_url,
+                                        &metadata,
+                                        &user_id,
+                                        &song_type,
+                                    )
+                                    .await
+                                    {
+                                        Ok(response) => match response
+                                            .json::<the_rest::create_song::response::Response>()
+                                            .await
+                                        {
+                                            Ok(resp) => {
+                                                println!("Response: {resp:?}");
+
+                                                let song = &resp.data[0];
+                                                match the_rest::create_coverart::create(app_base_url, &song.id, &coverart_queue_id).await {
+                                                    Ok(response) => match response.json::<the_rest::create_coverart::response::Response>().await {
+                                                        Ok(resp) => {
+                                                            println!("CoverArt sent and successfully parsed response");
+                                                            println!("json: {resp:?}");
+                                                            let coverart = &resp.data[0];
+                                                            Ok((song.clone(), coverart.clone(), (metadata.song_queue_id, song_queue_path), (coverart_queue_id, coverart_queue_path)))
+                                                        }
+                                                        Err(err) => {
+                                                            Err(std::io::Error::other(err.to_string()))
+                                                        }
+                                                    }
+                                                    Err(err) => {
+                                                        Err(std::io::Error::other(err.to_string()))
+                                                    }
+                                                }
+                                            }
+                                            Err(err) => Err(std::io::Error::other(err.to_string())),
+                                        },
+                                        Err(err) => Err(std::io::Error::other(err.to_string())),
+                                    }
                                 }
                                 Err(err) => Err(std::io::Error::other(err.to_string())),
                             }
@@ -104,7 +213,15 @@ async fn some_work(
 async fn prep_song(
     api_url: &String,
     song_queue_id: &uuid::Uuid,
-) -> Result<(String, String, api::get_metadata_queue::response::Metadata), reqwest::Error> {
+) -> Result<
+    (
+        String,
+        String,
+        api::get_metadata_queue::response::Metadata,
+        uuid::Uuid,
+    ),
+    reqwest::Error,
+> {
     match api::fetch_song_queue_data::get_data(api_url, song_queue_id).await {
         Ok(response) => {
             // Process data here...
@@ -148,7 +265,7 @@ async fn prep_song(
 
                                                                 let c_path = util::path_buf_to_string(&coverart_queue_path);
                                                                 let s_path = util::path_buf_to_string(&song_queue_path);
-                                                                Ok((s_path, c_path, metadata.clone()))
+                                                                Ok((s_path, c_path, metadata.clone(), *coverart_queue_id))
                                                             }
                                                             Err(err) => {
                                                                 Err(err)
@@ -375,158 +492,3 @@ pub async fn apply_metadata(
         Err(err) => Err(err),
     }
 }
-
-mod responses {
-    pub mod fetch_next_queue_item {
-        use serde::{Deserialize, Serialize};
-
-        #[derive(Debug, Deserialize, Serialize)]
-        pub struct QueueItem {
-            pub id: uuid::Uuid,
-            pub filename: String,
-            pub status: String,
-        }
-
-        #[derive(Debug, Deserialize, Serialize)]
-        pub struct SongQueueItem {
-            pub message: String,
-            pub data: Vec<QueueItem>,
-        }
-    }
-}
-
-mod api {
-    pub async fn fetch_next_queue_item(
-        base_url: &String,
-    ) -> Result<reqwest::Response, reqwest::Error> {
-        let client = reqwest::Client::new();
-        let fetch_endpoint = String::from("api/v2/song/queue/next");
-        let api_url = format!("{base_url}/{fetch_endpoint}");
-        client.get(api_url).send().await
-    }
-
-    pub mod parsing {
-        use futures::StreamExt;
-
-        pub async fn parse_response_into_bytes(
-            response: reqwest::Response,
-        ) -> Result<Vec<u8>, reqwest::Error> {
-            // TODO: At some point, handle the flow if the size is small or
-            // large
-            let mut byte_stream = response.bytes_stream();
-            let mut all_bytes = Vec::new();
-
-            while let Some(chunk) = byte_stream.next().await {
-                let chunk = chunk?;
-                all_bytes.extend_from_slice(&chunk);
-            }
-
-            Ok(all_bytes)
-        }
-    }
-
-    pub mod fetch_song_queue_data {
-        pub async fn get_data(
-            base_url: &String,
-            id: &uuid::Uuid,
-        ) -> Result<reqwest::Response, reqwest::Error> {
-            let client = reqwest::Client::new();
-            let endpoint = String::from("api/v2/song/queue");
-            let api_url = format!("{base_url}/{endpoint}/{id}");
-            client.get(api_url).send().await
-        }
-    }
-
-    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(Clone, Debug, Deserialize, Serialize)]
-            pub struct Metadata {
-                pub song_queue_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>,
-            }
-        }
-    }
-
-    pub mod get_coverart_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/coverart/queue");
-            let api_url = format!("{base_url}/{endpoint}");
-            client
-                .get(api_url)
-                .query(&[("song_queue_id", song_queue_id)])
-                .send()
-                .await
-        }
-
-        pub async fn get_data(
-            base_url: &String,
-            coverart_queue_id: &uuid::Uuid,
-        ) -> Result<reqwest::Response, reqwest::Error> {
-            let client = reqwest::Client::new();
-            let endpoint = String::from("api/v2/coverart/queue/data");
-            let api_url = format!("{base_url}/{endpoint}/{coverart_queue_id}");
-            client.get(api_url).send().await
-        }
-
-        pub mod response {
-            use serde::{Deserialize, Serialize};
-
-            #[derive(Debug, Deserialize, Serialize)]
-            pub struct CoverArtQueue {
-                pub id: uuid::Uuid,
-                pub song_queue_id: uuid::Uuid,
-            }
-
-            #[derive(Debug, Deserialize, Serialize)]
-            pub struct Response {
-                pub message: String,
-                pub data: Vec<CoverArtQueue>,
-            }
-        }
-    }
-}

src/responses.rs

@@ -0,0 +1,16 @@
+pub mod fetch_next_queue_item {
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Debug, Deserialize, Serialize)]
+    pub struct QueueItem {
+        pub id: uuid::Uuid,
+        pub filename: String,
+        pub status: String,
+    }
+
+    #[derive(Debug, Deserialize, Serialize)]
+    pub struct SongQueueItem {
+        pub message: String,
+        pub data: Vec<QueueItem>,
+    }
+}

src/the_rest.rs

@@ -1,6 +1,125 @@
 // TODO: Refactor this file when this app is functional
 
-// TODO: Create song
+pub mod create_song {
-// TODO: Create coverart
+    pub async fn create(
-// TODO: Wipe data from queued song
+        base_url: &String,
+        metadata_queue: &crate::api::get_metadata_queue::response::Metadata,
+        user_id: &uuid::Uuid,
+        song_type: &String,
+    ) -> Result<reqwest::Response, reqwest::Error> {
+        let payload = serde_json::json!(
+        {
+            "album": &metadata_queue.album,
+            "album_artist": &metadata_queue.album_artist,
+            "artist": &metadata_queue.artist,
+            "disc": metadata_queue.disc,
+            "disc_count": metadata_queue.disc_count,
+            "duration": metadata_queue.duration,
+            "genre": &metadata_queue.genre,
+            "title": &metadata_queue.title,
+            "track": metadata_queue.track,
+            "track_count": metadata_queue.track_count,
+            "date": metadata_queue.year.to_string(),
+            "audio_type": &song_type,
+            "user_id": &user_id,
+            "song_queue_id": &metadata_queue.song_queue_id,
+        }
+        );
+
+        let client = reqwest::Client::builder().build()?;
+
+        let url = format!("{base_url}/api/v2/song");
+
+        let request = client.post(url).json(&payload);
+        request.send().await
+    }
+
+    pub mod response {
+        #[derive(Debug, serde::Deserialize, serde::Serialize)]
+        pub struct Response {
+            pub message: String,
+            pub data: Vec<icarus_models::song::Song>,
+        }
+    }
+}
+
+pub mod create_coverart {
+
+    pub async fn create(
+        base_url: &String,
+        song_id: &uuid::Uuid,
+        coverart_queue_id: &uuid::Uuid,
+    ) -> Result<reqwest::Response, reqwest::Error> {
+        let client = reqwest::Client::builder().build()?;
+        let url = format!("{base_url}/api/v2/coverart");
+        let payload = get_payload(song_id, coverart_queue_id);
+        let request = client.post(url).json(&payload);
+
+        request.send().await
+    }
+
+    fn get_payload(song_id: &uuid::Uuid, coverart_queue_id: &uuid::Uuid) -> serde_json::Value {
+        serde_json::json!({
+            "song_id": &song_id,
+            "coverart_queue_id": &coverart_queue_id,
+        })
+    }
+
+    pub mod response {
+        #[derive(Debug, serde::Deserialize, serde::Serialize)]
+        pub struct Response {
+            pub message: String,
+            pub data: Vec<icarus_models::coverart::CoverArt>,
+        }
+    }
+}
+
+pub mod wipe_data {
+    pub mod song_queue {
+        pub async fn wipe_data(
+            base_url: &String,
+            song_queue_id: &uuid::Uuid,
+        ) -> Result<reqwest::Response, reqwest::Error> {
+            let client = reqwest::Client::builder().build()?;
+            let url = format!("{base_url}/api/v2/song/queue/data/wipe");
+            let payload = serde_json::json!({
+                "song_queue_id": song_queue_id
+            });
+            let request = client.patch(url).json(&payload);
+
+            request.send().await
+        }
+
+        pub mod response {
+            #[derive(Debug, serde::Deserialize, serde::Serialize)]
+            pub struct Response {
+                pub message: String,
+                pub data: Vec<uuid::Uuid>,
+            }
+        }
+    }
     // TODO: Wipe data from queued coverart
+    pub mod coverart_queue {
+        pub async fn wipe_data(
+            base_url: &String,
+            coverart_queue_id: &uuid::Uuid,
+        ) -> Result<reqwest::Response, reqwest::Error> {
+            let client = reqwest::Client::builder().build()?;
+            let url = format!("{base_url}/api/v2/coverart/queue/data/wipe");
+            let payload = serde_json::json!({
+                "coverart_queue_id": coverart_queue_id
+            });
+            let request = client.patch(url).json(&payload);
+
+            request.send().await
+        }
+
+        pub mod response {
+            #[derive(Debug, serde::Deserialize, serde::Serialize)]
+            pub struct Response {
+                pub message: String,
+                pub data: Vec<uuid::Uuid>,
+            }
+        }
+    }
+}