Update dependencies (#30)

Reviewed-on: #30
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.86.0
+          toolchain: 1.88.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-372"
+          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-431"
           echo "Version: $VERSION"
           echo "Hash: $PROJECT_COMMIT_HASH"
           echo "Branch: $BRANCH_NAME"

.gitea/workflows/workflow.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.86.0
+          toolchain: 1.88.0
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.86.0
+          toolchain: 1.88.0
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
@@ -54,7 +54,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.86.0
+          toolchain: 1.88.0
       - run: rustup component add rustfmt
       - run: |
           mkdir -p ~/.ssh
@@ -73,7 +73,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.86.0
+          toolchain: 1.88.0
       - run: rustup component add clippy
       - run: |
           mkdir -p ~/.ssh
@@ -92,7 +92,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.86.0
+          toolchain: 1.88.0
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key

Cargo.lock

@@ -501,8 +501,8 @@ dependencies = [
 
 [[package]]
 name = "icarus_envy"
-version = "0.2.2"
+version = "0.3.0"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.2.2-devel-84ea6e4c22-006#84ea6e4c223f19ff96f6b7cae944e831ef4aa831"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.3.0-devel-d73fba9899-006#d73fba9899372b0655a90cb426645930135152da"
 dependencies = [
  "const_format",
  "dotenvy",
@@ -510,16 +510,16 @@ dependencies = [
 
 [[package]]
 name = "icarus_meta"
-version = "0.2.2"
+version = "0.3.0"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_meta.git?tag=v0.2.2-devel-565d361b64-680#565d361b64f23c2a0100b33fceeebacfad3331c4"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_meta.git?tag=v0.3.0-devel-f4b71de969-680#f4b71de9692029a706b1ce82c39f6715c560158e"
 dependencies = [
  "lofty",
 ]
 
 [[package]]
 name = "icarus_models"
-version = "0.4.3"
+version = "0.5.0"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.4.3#6aa4c3d74142f5fceb4a6e95078bb3ae0a2d99c5"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.5.0-devel-7958b89abc-111#7958b89abc56bc9262015b3e201ea2906cc8a9ff"
 dependencies = [
  "rand",
  "serde",
@@ -749,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"
@@ -963,13 +973,12 @@ checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
 
 [[package]]
 name = "rand"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
 dependencies = [
  "rand_chacha",
  "rand_core",
- "zerocopy",
 ]
 
 [[package]]
@@ -1002,9 +1011,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.19"
+version = "0.12.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f8e5513d63f2e5b386eb5106dc67eaf3f84e95258e210489136b8b92ad6119"
+checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813"
 dependencies = [
  "base64",
  "bytes",
@@ -1019,12 +1028,11 @@ dependencies = [
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
- "ipnet",
  "js-sys",
  "log",
  "mime",
+ "mime_guess",
  "native-tls",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "rustls-pki-types",
@@ -1512,6 +1520,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

@@ -2,17 +2,17 @@
 name = "songparser"
 version = "0.1.0"
 edition = "2024"
-rust-version = "1.86"
+rust-version = "1.88"
 
 [dependencies]
-tokio = { version = "1.44.1", features = ["full"] }
+tokio = { version = "1.45.1", features = ["full"] }
 futures = { version = "0.3.31" }
-reqwest = { version = "0.12.19", features = ["json", "stream"] }
+reqwest = { version = "0.12.20", features = ["json", "stream", "multipart"] }
-serde = { version = "1.0.218", features = ["derive"] }
+serde = { version = "1.0.219", features = ["derive"] }
-serde_json = { version = "1.0.139" }
+serde_json = { version = "1.0.140" }
 time = { version = "0.3.41", features = ["macros", "serde"] }
-uuid = { version = "1.16.0", features = ["v4", "serde"] }
+uuid = { version = "1.17.0", features = ["v4", "serde"] }
-rand = { version = "0.9" }
+rand = { version = "0.9.1" }
-icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.2.2-devel-565d361b64-680" }
+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.4.3" }
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.5.0-devel-7958b89abc-111" }
-icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.2.2-devel-84ea6e4c22-006" }
+icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.3.0-devel-d73fba9899-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,7 +64,47 @@ 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...
@@ -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);
@@ -97,47 +146,20 @@ async fn process_song(api_url: &String, song_queue_id: &uuid::Uuid) -> Result<()
 
                                                                 println!("Saved coverart queue file at: {:?}", coverart_queue_path);
 
-                                                                match apply_metadata(song_queue_path, coverart_queue_path, metadata).await {
+                                                                let c_path = util::path_buf_to_string(&coverart_queue_path);
-                                                                    Ok(_) => {
+                                                                let s_path = util::path_buf_to_string(&song_queue_path);
-                                                                        // TODO: Update the queued song with the updated queued song
+                                                                Ok((s_path, c_path, metadata.clone()))
-                                                                        // TODO: Create song
-                                                                        // TODO: Create coverart
-                                                                        // TODO: Wipe data from queued song
-                                                                        // TODO: Wipe data from queued coverart
                                                             }
                                                             Err(err) => {
-                                                                        eprintln!("Error: {:?}", err);
+                                                                Err(err)
-                                                                    }
                                                             }
                                                         }
                                                         Err(err) => {
-                                                                eprintln!("Error: {:?}", err);
-                                                            }
-                                                        }
-                                                        Err(err) => {
-                                                            eprintln!("Error: {:?}", err);
-                                                        }
-                                                    }
-                                                }
-                                                Err(err) => {
-                                                    eprintln!("Error: {:?}", err);
-                                                }
-                                            }
-                                        }
-                                        Err(err) => {
-                                            eprintln!("Error: {:?}", err);
-                                        }
-                                    }
-                                    Ok(())
-                                }
-                                Err(err) => {
-                                    eprintln!("Error: {:?}", err);
                                                             Err(err)
                                                         }
                                                     }
                                                 }
                                                 Err(err) => {
-                            eprintln!("Error: {:?}", err);
                                                     Err(err)
                                                 }
                                             }
@@ -148,6 +170,15 @@ async fn process_song(api_url: &String, song_queue_id: &uuid::Uuid) -> Result<()
                                 Err(err) => Err(err),
                             }
                         }
+                        Err(err) => Err(err),
+                    }
+                }
+                Err(err) => Err(err),
+            }
+        }
+        Err(err) => Err(err),
+    }
+}
 
 // TODO: Consider having something like this in icarus_models
 pub async fn generate_song_queue_dir_and_filename() -> (String, String) {
@@ -206,21 +237,11 @@ pub async fn save_file_to_fs(
 }
 
 pub async fn apply_metadata(
-    song_queue_path: std::path::PathBuf,
+    song_queue_path: &String,
-    coverart_queue_path: std::path::PathBuf,
+    coverart_queue_path: &String,
     metadata: &api::get_metadata_queue::response::Metadata,
 ) -> Result<bool, std::io::Error> {
     // Apply metadata fields
-    let s_path = match song_queue_path.to_str() {
-        Some(val) => String::from(val),
-        None => String::new(),
-    };
-
-    if s_path.is_empty() {
-        println!("Song queue path is empty");
-        return Ok(false);
-    }
-
     let types = icarus_meta::types::all_metadata_types();
 
     for t in types {
@@ -228,7 +249,7 @@ pub async fn apply_metadata(
             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, &s_path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -238,7 +259,7 @@ pub async fn apply_metadata(
             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, &s_path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -248,7 +269,7 @@ pub async fn apply_metadata(
             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, &s_path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -259,7 +280,7 @@ pub async fn apply_metadata(
                 // 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, &s_path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -268,7 +289,7 @@ pub async fn apply_metadata(
             }
             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, &s_path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -278,7 +299,7 @@ pub async fn apply_metadata(
             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, &s_path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -288,7 +309,7 @@ pub async fn apply_metadata(
             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, &s_path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -297,7 +318,7 @@ pub async fn apply_metadata(
             }
             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, &s_path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -306,7 +327,7 @@ pub async fn apply_metadata(
             }
             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, &s_path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -315,7 +336,7 @@ pub async fn apply_metadata(
             }
             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, &s_path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -326,16 +347,11 @@ pub async fn apply_metadata(
     }
 
     // Apply coverart
-    let c_path: String = match coverart_queue_path.to_str() {
+    match icarus_meta::meta::coverart::contains_coverart(song_queue_path) {
-        Some(val) => String::from(val),
-        None => String::new(),
-    };
-
-    match icarus_meta::meta::coverart::contains_coverart(&s_path) {
         Ok((exists, size)) => {
             if exists {
                 println!("Coverart exists: {:?} size", size);
-                match icarus_meta::meta::coverart::remove_coverart(&s_path) {
+                match icarus_meta::meta::coverart::remove_coverart(song_queue_path) {
                     Ok(_data) => {}
                     Err(err) => {
                         return Err(err);
@@ -343,7 +359,7 @@ pub async fn apply_metadata(
                 }
             }
 
-            match icarus_meta::meta::coverart::set_coverart(&s_path, &c_path) {
+            match icarus_meta::meta::coverart::set_coverart(song_queue_path, coverart_queue_path) {
                 Ok(_data) => {
                     if _data.is_empty() {
                         println!("There was an issue");
@@ -439,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(),
+    }
+}