update queued song (#28)

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

Cargo.lock

@@ -62,6 +62,12 @@ version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
 [[package]]
 name = "bytes"
 version = "1.10.1"
@@ -119,6 +125,21 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+
 [[package]]
 name = "deranged"
 version = "0.4.0"
@@ -177,6 +198,16 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
+[[package]]
+name = "flate2"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -477,6 +508,14 @@ dependencies = [
  "dotenvy",
 ]
 
+[[package]]
+name = "icarus_meta"
+version = "0.2.2"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_meta.git?tag=v0.2.2-devel-565d361b64-680#565d361b64f23c2a0100b33fceeebacfad3331c4"
+dependencies = [
+ "lofty",
+]
+
 [[package]]
 name = "icarus_models"
 version = "0.4.3"
@@ -666,6 +705,32 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "lofty"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca260c51a9c71f823fbfd2e6fbc8eb2ee09834b98c00763d877ca8bfa85cde3e"
+dependencies = [
+ "byteorder",
+ "data-encoding",
+ "flate2",
+ "lofty_attr",
+ "log",
+ "ogg_pager",
+ "paste",
+]
+
+[[package]]
+name = "lofty_attr"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9983e64b2358522f745c1251924e3ab7252d55637e80f6a0a3de642d6a9efc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "log"
 version = "0.4.27"
@@ -684,6 +749,16 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
+[[package]]
+name = "mime_guess"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
 [[package]]
 name = "miniz_oxide"
 version = "0.8.8"
@@ -736,6 +811,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "ogg_pager"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e034c10fb5c1c012c1b327b85df89fb0ef98ae66ec28af30f0d1eed804a40c19"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -809,6 +893,12 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -943,6 +1033,7 @@ dependencies = [
  "js-sys",
  "log",
  "mime",
+ "mime_guess",
  "native-tls",
  "once_cell",
  "percent-encoding",
@@ -1171,6 +1262,7 @@ version = "0.1.0"
 dependencies = [
  "futures",
  "icarus_envy",
+ "icarus_meta",
  "icarus_models",
  "rand",
  "reqwest",
@@ -1431,6 +1523,12 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "unicase"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.18"

Cargo.toml

@@ -7,11 +7,12 @@ rust-version = "1.86"
 [dependencies]
 tokio = { version = "1.44.1", features = ["full"] }
 futures = { version = "0.3.31" }
-reqwest = { version = "0.12.19", features = ["json", "stream"] }
+reqwest = { version = "0.12.19", features = ["json", "stream", "multipart"] }
 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"] }
 rand = { version = "0.9" }
+icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.2.2-devel-565d361b64-680" }
 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

@@ -1,3 +1,7 @@
+pub mod the_rest;
+pub mod update_queued_song;
+pub mod util;
+
 use std::io::Write;
 
 pub const SECONDS_TO_SLEEP: u64 = 5;
@@ -17,7 +21,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                     let song_queue_id = song_queue_item.data[0].id;
 
                     // TODO: Do something with the result later
-                    let _ = process_song(&app_base_url, &song_queue_id).await;
+                    match some_work(&app_base_url, &song_queue_id).await {
+                        Ok(_) => {}
+                        Err(err) => {
+                            eprintln!("Error: {:?}", err);
+                        }
+                    }
                 } else {
                     println!("Queue is empty");
                 }
@@ -55,16 +64,56 @@ async fn is_queue_empty(
     }
 }
 
-async fn process_song(api_url: &String, song_queue_id: &uuid::Uuid) -> Result<(), reqwest::Error> {
+async fn some_work(
+    app_base_url: &String,
+    song_queue_id: &uuid::Uuid,
+) -> Result<(), std::io::Error> {
+    match prep_song(app_base_url, song_queue_id).await {
+        Ok((song_queue_path, coverart_queue_path, metadata)) => {
+            match apply_metadata(&song_queue_path, &coverart_queue_path, &metadata).await {
+                Ok(_applied) => {
+                    match update_queued_song::update_queued_song(
+                        app_base_url,
+                        &song_queue_path,
+                        song_queue_id,
+                    )
+                    .await
+                    {
+                        Ok(response) => {
+                            match response
+                                .json::<update_queued_song::response::Response>()
+                                .await
+                            {
+                                Ok(_inner_response) => {
+                                    println!("Response: {:?}", _inner_response);
+                                    Ok(())
+                                }
+                                Err(err) => Err(std::io::Error::other(err.to_string())),
+                            }
+                        }
+                        Err(err) => Err(std::io::Error::other(err.to_string())),
+                    }
+                }
+                Err(err) => Err(err),
+            }
+        }
+        Err(err) => Err(std::io::Error::other(err.to_string())),
+    }
+}
+
+async fn prep_song(
+    api_url: &String,
+    song_queue_id: &uuid::Uuid,
+) -> Result<(String, String, api::get_metadata_queue::response::Metadata), reqwest::Error> {
     match api::fetch_song_queue_data::get_data(api_url, song_queue_id).await {
         Ok(response) => {
             // Process data here...
             match api::parsing::parse_response_into_bytes(response).await {
                 Ok(song_bytes) => {
                     let (directory, filename) = generate_song_queue_dir_and_filename().await;
-                    let save_path = save_file_to_fs(&directory, &filename, &song_bytes).await;
+                    let song_queue_path = save_file_to_fs(&directory, &filename, &song_bytes).await;
 
-                    println!("Saved at: {:?}", save_path);
+                    println!("Saved at: {:?}", song_queue_path);
 
                     match api::get_metadata_queue::get(api_url, song_queue_id).await {
                         Ok(response) => {
@@ -74,8 +123,8 @@ async fn process_song(api_url: &String, song_queue_id: &uuid::Uuid) -> Result<()
                             {
                                 Ok(response) => {
                                     let id = &response.data[0].id;
-                                    let metadata = &response.data[0].metadata;
                                     let created_at = &response.data[0].created_at;
+                                    let metadata = &response.data[0].metadata;
                                     println!("Id: {:?}", id);
                                     println!("Metadata: {:?}", metadata);
                                     println!("Created at: {:?}", created_at);
@@ -93,47 +142,35 @@ async fn process_song(api_url: &String, song_queue_id: &uuid::Uuid) -> Result<()
                                                         Ok(response) => match api::parsing::parse_response_into_bytes(response).await {
                                                             Ok(coverart_queue_bytes) => {
                                                                 let (directory, filename) = generate_coverart_queue_dir_and_filename().await;
-                                                                let save_path = save_file_to_fs(&directory, &filename, &coverart_queue_bytes).await;
+                                                                let coverart_queue_path = save_file_to_fs(&directory, &filename, &coverart_queue_bytes).await;
 
-                                                                println!("Saved coverart queue file at: {:?}", save_path);
+                                                                println!("Saved coverart queue file at: {:?}", coverart_queue_path);
 
-                                                                // 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
+                                                                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()))
                                                             }
                                                             Err(err) => {
-                                                                eprintln!("Error: {:?}", err);
+                                                                Err(err)
                                                             }
                                                         }
                                                         Err(err) => {
-                                                            eprintln!("Error: {:?}", err);
+                                                            Err(err)
                                                         }
                                                     }
                                                 }
                                                 Err(err) => {
-                                                    eprintln!("Error: {:?}", err);
+                                                    Err(err)
                                                 }
                                             }
                                         }
-                                        Err(err) => {
-                                            eprintln!("Error: {:?}", err);
-                                        }
+                                        Err(err) => Err(err),
                                     }
-                                    Ok(())
-                                }
-                                Err(err) => {
-                                    eprintln!("Error: {:?}", err);
-                                    Err(err)
                                 }
+                                Err(err) => Err(err),
                             }
                         }
-                        Err(err) => {
-                            eprintln!("Error: {:?}", err);
-                            Err(err)
-                        }
+                        Err(err) => Err(err),
                     }
                 }
                 Err(err) => Err(err),
@@ -199,6 +236,146 @@ pub async fn save_file_to_fs(
     save_path
 }
 
+pub async fn apply_metadata(
+    song_queue_path: &String,
+    coverart_queue_path: &String,
+    metadata: &api::get_metadata_queue::response::Metadata,
+) -> Result<bool, std::io::Error> {
+    // Apply metadata fields
+    let types = icarus_meta::types::all_metadata_types();
+
+    for t in types {
+        match t {
+            icarus_meta::types::Type::Album => {
+                let meta_type =
+                    icarus_meta::types::MetadataType::from_string(metadata.album.clone());
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
+                    Ok(_) => {}
+                    Err(_err) => {
+                        return Err(_err);
+                    }
+                }
+            }
+            icarus_meta::types::Type::AlbumArtist => {
+                let meta_type =
+                    icarus_meta::types::MetadataType::from_string(metadata.album_artist.clone());
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
+                    Ok(_) => {}
+                    Err(_err) => {
+                        return Err(_err);
+                    }
+                }
+            }
+            icarus_meta::types::Type::Artist => {
+                let meta_type =
+                    icarus_meta::types::MetadataType::from_string(metadata.artist.clone());
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
+                    Ok(_) => {}
+                    Err(_err) => {
+                        return Err(_err);
+                    }
+                }
+            }
+            icarus_meta::types::Type::Date => {
+                // TODO: Do something about this discrepancy
+                let meta_type =
+                    icarus_meta::types::MetadataType::from_string(metadata.year.to_string());
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
+                    Ok(_) => {}
+                    Err(_err) => {
+                        return Err(_err);
+                    }
+                }
+            }
+            icarus_meta::types::Type::Disc => {
+                let meta_type = icarus_meta::types::MetadataType::from_int(metadata.disc);
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
+                    Ok(_) => {}
+                    Err(_err) => {
+                        return Err(_err);
+                    }
+                }
+            }
+            icarus_meta::types::Type::Genre => {
+                let meta_type =
+                    icarus_meta::types::MetadataType::from_string(metadata.genre.clone());
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
+                    Ok(_) => {}
+                    Err(_err) => {
+                        return Err(_err);
+                    }
+                }
+            }
+            icarus_meta::types::Type::Title => {
+                let meta_type =
+                    icarus_meta::types::MetadataType::from_string(metadata.title.clone());
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
+                    Ok(_) => {}
+                    Err(_err) => {
+                        return Err(_err);
+                    }
+                }
+            }
+            icarus_meta::types::Type::Track => {
+                let meta_type = icarus_meta::types::MetadataType::from_int(metadata.track);
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
+                    Ok(_) => {}
+                    Err(_err) => {
+                        return Err(_err);
+                    }
+                }
+            }
+            icarus_meta::types::Type::TrackCount => {
+                let meta_type = icarus_meta::types::MetadataType::from_int(metadata.track_count);
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
+                    Ok(_) => {}
+                    Err(_err) => {
+                        return Err(_err);
+                    }
+                }
+            }
+            icarus_meta::types::Type::DiscCount => {
+                let meta_type = icarus_meta::types::MetadataType::from_int(metadata.disc_count);
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
+                    Ok(_) => {}
+                    Err(_err) => {
+                        return Err(_err);
+                    }
+                }
+            }
+        }
+    }
+
+    // Apply coverart
+    match icarus_meta::meta::coverart::contains_coverart(song_queue_path) {
+        Ok((exists, size)) => {
+            if exists {
+                println!("Coverart exists: {:?} size", size);
+                match icarus_meta::meta::coverart::remove_coverart(song_queue_path) {
+                    Ok(_data) => {}
+                    Err(err) => {
+                        return Err(err);
+                    }
+                }
+            }
+
+            match icarus_meta::meta::coverart::set_coverart(song_queue_path, coverart_queue_path) {
+                Ok(_data) => {
+                    if _data.is_empty() {
+                        println!("There was an issue");
+                        Ok(false)
+                    } else {
+                        println!("Success in applying coverart to song");
+                        Ok(true)
+                    }
+                }
+                Err(err) => Err(err),
+            }
+        }
+        Err(err) => Err(err),
+    }
+}
+
 mod responses {
     pub mod fetch_next_queue_item {
         use serde::{Deserialize, Serialize};
@@ -278,7 +455,7 @@ mod api {
         pub mod response {
             use serde::{Deserialize, Serialize};
 
-            #[derive(Debug, Deserialize, Serialize)]
+            #[derive(Clone, Debug, Deserialize, Serialize)]
             pub struct Metadata {
                 pub song_queue_id: uuid::Uuid,
                 pub album: String,

src/the_rest.rs

@@ -0,0 +1,6 @@
+// TODO: Refactor this file when this app is functional
+
+// TODO: Create song
+// TODO: Create coverart
+// TODO: Wipe data from queued song
+// TODO: Wipe data from queued coverart

src/update_queued_song.rs

@@ -0,0 +1,35 @@
+pub async fn update_queued_song(
+    base_url: &String,
+    song_path: &String,
+    song_queue_id: &uuid::Uuid,
+) -> Result<reqwest::Response, reqwest::Error> {
+    let client = reqwest::Client::builder().build()?;
+
+    println!("Song path: {:?}", song_path);
+
+    // TODO: Make the filename random
+    let form = reqwest::multipart::Form::new().part(
+        "file",
+        reqwest::multipart::Part::bytes(std::fs::read(song_path).unwrap())
+            .file_name("track01.flac"),
+    );
+
+    let url = format!("{}/api/v2/song/queue/{}", base_url, song_queue_id);
+    println!("Url: {:?}", url);
+
+    let request = client.patch(url).multipart(form);
+
+    let response = request.send().await?;
+
+    Ok(response)
+}
+
+pub mod response {
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Debug, Deserialize, Serialize)]
+    pub struct Response {
+        pub message: String,
+        pub data: Vec<uuid::Uuid>,
+    }
+}

src/util.rs

@@ -0,0 +1,6 @@
+pub fn path_buf_to_string(path: &std::path::Path) -> String {
+    match path.to_str() {
+        Some(val) => String::from(val),
+        None => String::new(),
+    }
+}