Workflow changes (#9) (#10)

Reviewed-on: #9
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
Reviewed-on: #10
Co-committed-by: phoenix <kundeng94@gmail.com>

.env.docker.sample

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

.env.sample

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

.gitea/workflows/workflow.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.88.0
+          toolchain: 1.85.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.88.0
+          toolchain: 1.85.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.88.0
+          toolchain: 1.85.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.88.0
+          toolchain: 1.85.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.88.0
+          toolchain: 1.85.0
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key

.gitignore

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

Cargo.toml

@@ -1,18 +1,7 @@
 [package]
 name = "songparser"
-version = "0.2.3"
+version = "0.1.0"
 edition = "2024"
-rust-version = "1.88"
 
 [dependencies]
-tokio = { version = "1.45.1", features = ["full"] }
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.2.0" }
-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.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

@@ -1,131 +0,0 @@
-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,494 +1,3 @@
-pub mod api;
+fn main() {
-pub mod responses;
+    println!("Hello, world!");
-pub mod the_rest;
-pub mod update_queued_song;
-pub mod util;
-
-use std::io::Write;
-
-pub const SECONDS_TO_SLEEP: u64 = 5;
-
-#[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let app_base_url = icarus_envy::environment::get_icarus_base_api_url().await;
-
-    loop {
-        println!("Base URL: {app_base_url}");
-
-        match is_queue_empty(&app_base_url).await {
-            Ok((empty, song_queue_item)) => {
-                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((
-                            _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:?}");
-                        }
-                    }
-                } else {
-                    println!("Queue is empty");
-                }
-            }
-            Err(err) => {
-                eprintln!("Error checking if queue is empty: {err:?}");
-            }
-        }
-
-        println!("Sleeping");
-        tokio::time::sleep(tokio::time::Duration::from_secs(SECONDS_TO_SLEEP)).await;
-    }
-}
-
-async fn 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> {
-    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<
-    (
-        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, coverart_queue_id)) => {
-            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:?}");
-
-                                    // 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())),
-                            }
-                        }
-                        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,
-        uuid::Uuid,
-    ),
-    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(), *coverart_queue_id))
-                                                            }
-                                                            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);
-        }
-    }
-
-    // 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),
-    }
 }

src/responses.rs

@@ -1,16 +0,0 @@
-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,125 +0,0 @@
-// TODO: Refactor this file when this app is functional
-
-pub mod create_song {
-    pub async fn create(
-        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>,
-            }
-        }
-    }
-}

src/update_queued_song.rs

@@ -1,35 +0,0 @@
-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!("{base_url}/api/v2/song/queue/{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

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