Update dependencies (#30)

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

.env.docker.sample

@@ -0,0 +1,2 @@
+ROOT_DIRECTORY=/home/songparser/mydata
+ICARUS_BASE_API_URL=http://localhost:3000

.env.sample

@@ -0,0 +1,2 @@
+ROOT_DIRECTORY=/home/songparser/mydata
+ICARUS_BASE_API_URL=http://localhost:3000

.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

.gitignore

@@ -1,2 +1,2 @@
 /target
-Cargo.lock
+.env

Cargo.toml

@@ -2,8 +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"] }
-icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.3" }
+futures = { version = "0.3.31" }
+reqwest = { version = "0.12.20", features = ["json", "stream", "multipart"] }
+serde = { version = "1.0.219", features = ["derive"] }
+serde_json = { version = "1.0.140" }
+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_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.3.0-devel-d73fba9899-006" }

src/main.rs

@@ -1,38 +1,532 @@
-use std::error::Error;
+pub mod the_rest;
-use tokio::io::AsyncReadExt;
+pub mod update_queued_song;
-use tokio::net::{TcpListener, TcpStream};
+pub mod util;
-use tokio::spawn;
+
+use std::io::Write;
+
+pub const SECONDS_TO_SLEEP: u64 = 5;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let listener = TcpListener::bind("127.0.0.1:8080").await?;
+    let app_base_url = icarus_envy::environment::get_icarus_base_api_url().await;
-    println!("API calling service listening on 127.0.0.1:8080");
 
     loop {
-        let (stream, addr) = listener.accept().await?;
+        println!("Base URL: {}", app_base_url);
-        println!("Accepted connection from: {}", addr);
 
-        spawn(async move {
+        match is_queue_empty(&app_base_url).await {
-            if let Err(e) = handle_connection(stream).await {
+            Ok((empty, song_queue_item)) => {
-                eprintln!("Error handling connection from {}: {}", addr, e);
+                if !empty {
+                    println!("Queue is not empty");
+                    println!("SongQueueItem: {:?}", song_queue_item);
+                    let song_queue_id = song_queue_item.data[0].id;
+
+                    // TODO: Do something with the result later
+                    match some_work(&app_base_url, &song_queue_id).await {
+                        Ok(_) => {}
+                        Err(err) => {
+                            eprintln!("Error: {:?}", err);
+                        }
+                    }
+                } else {
+                    println!("Queue is empty");
+                }
+            }
+            Err(err) => {
+                eprintln!("Error checking if queue is empty: {:?}", err);
             }
-        });
-    }
-}
-
-async fn handle_connection(mut stream: TcpStream) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let mut buffer = [0; 1024];
-
-    loop {
-        let n = stream.read(&mut buffer).await?;
-
-        if n == 0 {
-            break; // Connection closed
         }
 
-        let request_data = String::from_utf8_lossy(&buffer[..n]).trim().to_string();
+        println!("Sleeping");
-        println!("Received request: {}", request_data);
+        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 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 song_queue_path = save_file_to_fs(&directory, &filename, &song_bytes).await;
+
+                    println!("Saved at: {:?}", song_queue_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) => {
+                                    let id = &response.data[0].id;
+                                    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);
+
+                                    println!("Getting coverart queue");
+                                    match api::get_coverart_queue::get(api_url, song_queue_id).await
+                                    {
+                                        Ok(response) => {
+                                            match response.json::<api::get_coverart_queue::response::Response>().await {
+                                                Ok(response) => {
+                                                    let coverart_queue_id = &response.data[0].id;
+                                                    println!("Coverart queue Id: {:?}", coverart_queue_id);
+
+                                                    match api::get_coverart_queue::get_data(api_url, coverart_queue_id).await {
+                                                        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 coverart_queue_path = save_file_to_fs(&directory, &filename, &coverart_queue_bytes).await;
+
+                                                                println!("Saved coverart queue file at: {:?}", coverart_queue_path);
+
+                                                                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) => {
+                                                                Err(err)
+                                                            }
+                                                        }
+                                                        Err(err) => {
+                                                            Err(err)
+                                                        }
+                                                    }
+                                                }
+                                                Err(err) => {
+                                                    Err(err)
+                                                }
+                                            }
+                                        }
+                                        Err(err) => Err(err),
+                                    }
+                                }
+                                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) {
+    let mut song = icarus_models::song::Song::default();
+    song.filename = song.generate_filename(icarus_models::types::MusicTypes::FlacExtension, true);
+
+    song.directory = icarus_envy::environment::get_root_directory().await;
+
+    (song.directory, song.filename)
+}
+
+// TODO: Consider having something like this in icarus_models
+pub async fn generate_coverart_queue_dir_and_filename() -> (String, String) {
+    use rand::Rng;
+
+    let mut filename: String = String::new();
+    let filename_len = 10;
+
+    let some_chars: String = String::from("abcdefghij0123456789");
+    let mut rng = rand::rng();
+
+    for _i in 0..filename_len {
+        let random_number: i32 = rng.random_range(0..=19);
+        let index = random_number as usize;
+        let rando_char = some_chars.chars().nth(index);
+
+        if let Some(c) = rando_char {
+            filename.push(c);
+        }
     }
 
-    Ok(())
+    // TODO: Do not hard code the file extension
+    filename += ".jpeg";
+
+    // TODO: Consider separating song and coverart when saving to the filesystem
+    let directory = icarus_envy::environment::get_root_directory().await;
+
+    (directory, filename)
+}
+
+// TODO: Check to see if this is available in icarus_models
+pub async fn save_file_to_fs(
+    directory: &String,
+    filename: &String,
+    data: &[u8],
+) -> std::path::PathBuf {
+    // TODO: Add function to save bytes to a file in icarus_models
+    // repo
+    let dir = std::path::Path::new(directory);
+    let save_path = dir.join(filename);
+
+    let mut file = std::fs::File::create(&save_path).unwrap();
+    file.write_all(data).unwrap();
+
+    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};
+
+        #[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/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(),
+    }
+}