Replace code with constants

Cargo.lock

@@ -510,7 +510,7 @@ dependencies = [
 [[package]]
 name = "icarus_meta"
 version = "0.4.3"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_meta.git?tag=v0.4.3#c0607597f196eb71f8069f23c91359968ef639ad"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_meta.git?tag=v0.4.3-48-8acf220fc4-680#8acf220fc4a646090cfb54eff78aaa2f172bf882"
 dependencies = [
  "imghdr",
  "infer",
@@ -520,8 +520,8 @@ dependencies = [
 
 [[package]]
 name = "icarus_models"
-version = "0.9.2"
+version = "0.8.0"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.9.2#05525618514409101c1d6474dafb201386d14a30"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.8.0#860d684e7b340b05d43d1fc3e6bd36b7cc45d81b"
 dependencies = [
  "josekit",
  "rand",
@@ -1322,7 +1322,7 @@ dependencies = [
 
 [[package]]
 name = "songparser"
-version = "0.4.12"
+version = "0.4.4"
 dependencies = [
  "futures",
  "icarus_envy",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "songparser"
-version = "0.4.12"
+version = "0.4.4"
 edition = "2024"
 rust-version = "1.90"
 
@@ -13,6 +13,6 @@ serde_json = { version = "1.0.145" }
 time = { version = "0.3.44", features = ["macros", "serde"] }
 uuid = { version = "1.18.1", features = ["v4", "serde"] }
 rand = { version = "0.9.2" }
-icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.4.3" }
+icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.4.3-48-8acf220fc4-680" }
-icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.9.2" }
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.8.0" }
 icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.5.0" }

src/api.rs

@@ -1,4 +1,5 @@
 pub mod fetch_next_queue_item {
+
     pub async fn fetch_next_queue_item(
         app: &crate::config::App,
     ) -> Result<reqwest::Response, reqwest::Error> {
@@ -11,7 +12,9 @@ pub mod fetch_next_queue_item {
     }
 
     pub mod response {
-        #[derive(Debug, serde::Deserialize, serde::Serialize)]
+        use serde::{Deserialize, Serialize};
+
+        #[derive(Debug, Deserialize, Serialize)]
         pub struct QueueItem {
             pub id: uuid::Uuid,
             pub filename: String,
@@ -19,7 +22,7 @@ pub mod fetch_next_queue_item {
             pub user_id: uuid::Uuid,
         }
 
-        #[derive(Debug, serde::Deserialize, serde::Serialize)]
+        #[derive(Debug, Deserialize, Serialize)]
         pub struct SongQueueItem {
             pub message: String,
             pub data: Vec<QueueItem>,
@@ -190,19 +193,21 @@ pub mod refresh_token {
 pub mod update_queued_song {
     pub async fn update_queued_song(
         app: &crate::config::App,
-        queued_song: &crate::queued_item::QueuedSong,
+        song_path: &String,
+        song_queue_id: &uuid::Uuid,
     ) -> Result<reqwest::Response, reqwest::Error> {
         let client = reqwest::Client::builder().build()?;
 
-        println!("Queued song path: {:?}", queued_song.path);
+        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(&queued_song.path).unwrap())
+            reqwest::multipart::Part::bytes(std::fs::read(song_path).unwrap())
-                .file_name(queued_song.song.filename.clone()),
+                .file_name("track01.flac"),
         );
 
-        let url = format!("{}/api/v2/song/queue/{}", app.uri, queued_song.id);
+        let url = format!("{}/api/v2/song/queue/{song_queue_id}", app.uri);
         println!("Url: {url:?}");
 
         let (key, header) = crate::api::auth_header(app).await;
@@ -269,14 +274,15 @@ pub mod create_song {
 }
 
 pub mod create_coverart {
+
     pub async fn create(
         app: &crate::config::App,
-        song: &icarus_models::song::Song,
+        song_id: &uuid::Uuid,
-        queued_coverart: &crate::queued_item::QueuedCoverArt,
+        coverart_queue_id: &uuid::Uuid,
     ) -> Result<reqwest::Response, reqwest::Error> {
         let client = reqwest::Client::builder().build()?;
         let url = format!("{}/api/v2/coverart", app.uri);
-        let payload = get_payload(&song.id, &queued_coverart.id);
+        let payload = get_payload(song_id, coverart_queue_id);
         let (key, header) = crate::api::auth_header(app).await;
         let request = client.post(url).json(&payload).header(key, header);
 
@@ -303,12 +309,12 @@ pub mod wipe_data {
     pub mod song_queue {
         pub async fn wipe_data(
             app: &crate::config::App,
-            queued_song: &crate::queued_item::QueuedSong,
+            song_queue_id: &uuid::Uuid,
         ) -> Result<reqwest::Response, reqwest::Error> {
             let client = reqwest::Client::builder().build()?;
             let url = format!("{}/api/v2/song/queue/data/wipe", app.uri);
             let payload = serde_json::json!({
-                "song_queue_id": queued_song.id
+                "song_queue_id": song_queue_id
             });
             let (key, header) = crate::api::auth_header(app).await;
             let request = client.patch(url).json(&payload).header(key, header);
@@ -327,12 +333,12 @@ pub mod wipe_data {
     pub mod coverart_queue {
         pub async fn wipe_data(
             app: &crate::config::App,
-            queued_coverart: &crate::queued_item::QueuedCoverArt,
+            coverart_queue_id: &uuid::Uuid,
         ) -> Result<reqwest::Response, reqwest::Error> {
             let client = reqwest::Client::builder().build()?;
             let url = format!("{}/api/v2/coverart/queue/data/wipe", app.uri);
             let payload = serde_json::json!({
-                "coverart_queue_id": queued_coverart.id
+                "coverart_queue_id": coverart_queue_id
             });
             let (key, header) = crate::api::auth_header(app).await;
             let request = client.patch(url).json(&payload).header(key, header);

src/config.rs

@@ -3,25 +3,4 @@ pub struct App {
     pub uri: String,
     pub auth_uri: String,
     pub token: icarus_models::login_result::LoginResult,
-    pub root_directory: String,
-}
-
-impl App {
-    pub fn does_root_directory_exists(&self) -> bool {
-        let path = std::path::Path::new(&self.root_directory);
-        if path.exists() { path.is_dir() } else { false }
-    }
-}
-
-pub async fn initialize_app_config() -> App {
-    App {
-        uri: icarus_envy::environment::get_icarus_base_api_url()
-            .await
-            .value,
-        auth_uri: icarus_envy::environment::get_icarus_auth_base_api_url()
-            .await
-            .value,
-        root_directory: icarus_envy::environment::get_root_directory().await.value,
-        ..Default::default()
-    }
 }

src/main.rs

@@ -2,36 +2,28 @@ pub mod api;
 pub mod auth;
 pub mod config;
 pub mod metadata;
-pub mod parser;
-pub mod queue;
-pub mod queued_item;
 pub mod util;
 
 pub const SECONDS_TO_SLEEP: u64 = 5;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut app = config::initialize_app_config().await;
+    let mut app = config::App {
+        uri: icarus_envy::environment::get_icarus_base_api_url()
+            .await
+            .value,
+        auth_uri: icarus_envy::environment::get_icarus_auth_base_api_url()
+            .await
+            .value,
+        ..Default::default()
+    };
     println!("Base URL: {:?}", app.uri);
     println!("Auth URL: {:?}", app.auth_uri);
 
-    if !app.does_root_directory_exists() {
+    match auth::get_token(&app).await {
-        eprintln!("Root directory does not exist");
+        Ok(login_result) => {
-        println!("Attempting to create directory");
+            app.token = login_result;
-        let path = std::path::Path::new(&app.root_directory);
-        match std::fs::create_dir(path) {
-            Ok(_) => {
-                println!("Directory created");
         }
-            Err(err) => {
-                eprintln!("Error creating directory: {err:?}");
-                std::process::exit(-1);
-            }
-        }
-    }
-
-    app.token = match auth::get_token(&app).await {
-        Ok(login_result) => login_result,
         Err(err) => {
             eprintln!("Error: {err:?}");
             std::process::exit(-1);
@@ -39,6 +31,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     loop {
+        println!("Token: {:?}", app.token);
+
         if app.token.token_expired() {
             println!("Token expired");
             app.token = match auth::get_refresh_token(&app).await {
@@ -55,7 +49,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             println!("Token did not expire");
         }
 
-        match queue::is_queue_empty(&app).await {
+        match is_queue_empty(&app).await {
             Ok((empty, song_queue_item)) => {
                 if !empty {
                     println!("Queue is not empty");
@@ -64,12 +58,17 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                     let song_queue_id = song_queue_item.data[0].id;
                     let user_id = song_queue_item.data[0].user_id;
 
-                    match parser::some_work(&app, &song_queue_id, &user_id).await {
+                    match some_work(&app, &song_queue_id, &user_id).await {
-                        Ok((song, coverart, _metadata, queued_song, queued_coverart)) => {
+                        Ok((
-                            match queue::wipe_data_from_queues(&app, &queued_song, &queued_coverart)
+                            song,
+                            coverart,
+                            (song_queue_id, _song_queue_path),
+                            (coverart_queue_id, _coverart_queue_path),
+                        )) => {
+                            match wipe_data_from_queues(&app, &song_queue_id, &coverart_queue_id)
                                 .await
                             {
-                                Ok(_) => match parser::cleanup(&song, &coverart).await {
+                                Ok(_) => match cleanup(&song, &coverart).await {
                                     Ok(_) => {
                                         println!("Successful cleanup");
                                     }
@@ -99,3 +98,353 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         tokio::time::sleep(tokio::time::Duration::from_secs(SECONDS_TO_SLEEP)).await;
     }
 }
+
+async fn wipe_data_from_queues(
+    app: &config::App,
+    song_queue_id: &uuid::Uuid,
+    coverart_queue_id: &uuid::Uuid,
+) -> Result<(), std::io::Error> {
+    match api::wipe_data::song_queue::wipe_data(app, song_queue_id).await {
+        Ok(response) => match response
+            .json::<api::wipe_data::song_queue::response::Response>()
+            .await
+        {
+            Ok(_resp) => {
+                match api::wipe_data::coverart_queue::wipe_data(app, coverart_queue_id).await {
+                    Ok(inner_response) => match inner_response
+                        .json::<api::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 cleanup(
+    song: &icarus_models::song::Song,
+    coverart: &icarus_models::coverart::CoverArt,
+) -> Result<(), std::io::Error> {
+    match song.remove_from_filesystem() {
+        Ok(_) => {}
+        Err(err) => {
+            eprintln!("Error: Problem cleaning up SongQueue files {err:?}");
+        }
+    }
+
+    match coverart.remove_from_filesystem() {
+        Ok(_) => Ok(()),
+        Err(err) => Err(err),
+    }
+}
+
+async fn is_queue_empty(
+    app: &config::App,
+) -> Result<(bool, api::fetch_next_queue_item::response::SongQueueItem), reqwest::Error> {
+    match api::fetch_next_queue_item::fetch_next_queue_item(app).await {
+        Ok(response) => {
+            match response
+                .json::<api::fetch_next_queue_item::response::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: &crate::config::App,
+    song_queue_id: &uuid::Uuid,
+    user_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, song_queue_id).await {
+        Ok((
+            (song_directory, song_filename),
+            (coverart_directory, coverart_filename),
+            metadata,
+            coverart_queue_id,
+        )) => {
+            println!("Prepping song");
+
+            let mut song_queue_path: String = String::new();
+            let p = std::path::Path::new(&song_directory);
+            let sp = p.join(&song_filename);
+            song_queue_path.push_str(sp.to_str().unwrap_or_default());
+            let coverart_queue = icarus_models::coverart::CoverArt {
+                directory: coverart_directory,
+                filename: coverart_filename,
+                ..Default::default()
+            };
+            let coverart_queue_path = match coverart_queue.get_path() {
+                Ok(path) => path,
+                Err(err) => {
+                    eprintln!("Could not get CoverArt path");
+                    eprintln!("Error: {err:?}");
+                    std::process::exit(-1);
+                }
+            };
+
+            println!("CoverArt path: {coverart_queue_path:?}");
+
+            match metadata::apply_metadata(&song_queue_path, &coverart_queue_path, &metadata).await
+            {
+                Ok(_applied) => {
+                    match api::update_queued_song::update_queued_song(
+                        app,
+                        &song_queue_path,
+                        song_queue_id,
+                    )
+                    .await
+                    {
+                        Ok(response) => {
+                            match response
+                                .json::<api::update_queued_song::response::Response>()
+                                .await
+                            {
+                                Ok(_inner_response) => {
+                                    println!("Updated queued song");
+                                    println!("Response: {_inner_response:?}");
+
+                                    // TODO: Place this somewhere else
+                                    let song_type = String::from("flac");
+
+                                    match api::create_song::create(
+                                        app, &metadata, user_id, &song_type,
+                                    )
+                                    .await
+                                    {
+                                        Ok(response) => match response
+                                            .json::<api::create_song::response::Response>()
+                                            .await
+                                        {
+                                            Ok(resp) => {
+                                                println!("Response: {resp:?}");
+
+                                                let mut song = resp.data[0].clone();
+                                                song.directory = song_directory;
+                                                song.filename = song_filename;
+
+                                                match api::create_coverart::create(app, &song.id, &coverart_queue_id).await {
+                                                    Ok(response) => match response.json::<api::create_coverart::response::Response>().await {
+                                                        Ok(resp) => {
+                                                            println!("CoverArt sent and successfully parsed response");
+                                                            println!("json: {resp:?}");
+                                                            let mut coverart = resp.data[0].clone();
+                                                            coverart.directory = coverart_queue.directory;
+                                                            coverart.filename = coverart_queue.filename;
+
+                                                            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(
+    app: &crate::config::App,
+    song_queue_id: &uuid::Uuid,
+) -> Result<
+    (
+        (String, String),
+        (String, String),
+        api::get_metadata_queue::response::Metadata,
+        uuid::Uuid,
+    ),
+    reqwest::Error,
+> {
+    match api::fetch_song_queue_data::get_data(app, song_queue_id).await {
+        Ok(response) => {
+            // Process data here...
+            match api::parsing::parse_response_into_bytes(response).await {
+                Ok(song_bytes) => {
+                    let (song_directory, song_filename) =
+                        generate_song_queue_dir_and_filename().await;
+                    let song = icarus_models::song::Song {
+                        directory: song_directory,
+                        filename: song_filename,
+                        data: song_bytes,
+                        ..Default::default()
+                    };
+                    let songpath = song.song_path().unwrap_or_default();
+                    let song_queue_path = match song.save_to_filesystem() {
+                        Ok(_) => std::path::Path::new(&songpath),
+                        Err(_err) => std::path::Path::new(""),
+                    };
+
+                    println!("Saved at: {song_queue_path:?}");
+
+                    match api::get_metadata_queue::get(app, 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(app, song_queue_id).await {
+                                        Ok(response) => {
+                                            match response.json::<api::get_coverart_queue::response::Response>().await {
+                                                Ok(response) => {
+                                                    let coverart_queue = &response.data[0];
+                                                    let coverart_queue_id = coverart_queue.id;
+                                                    println!("Coverart queue Id: {coverart_queue_id:?}");
+
+                                                    match api::get_coverart_queue::get_data(app, &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(&coverart_queue.file_type).await;
+                                                                let coverart = icarus_models::coverart::CoverArt {
+                                                                    directory,
+                                                                    filename,
+                                                                    data: coverart_queue_bytes,
+                                                                    ..Default::default()
+                                                                };
+                                                                coverart.save_to_filesystem().unwrap();
+                                                                let coverart_queue_fs_path = match coverart.get_path() {
+                                                                    Ok(path) => {
+                                                                        path
+                                                                    }
+                                                                    Err(err) => {
+                                                                        eprintln!("Error: {err:?}");
+                                                                        std::process::exit(-1);
+                                                                    }
+                                                                };
+                                                                let coverart_queue_path = std::path::Path::new(&coverart_queue_fs_path);
+                                                                println!("Saved coverart queue file at: {coverart_queue_path:?}");
+
+                                                                Ok(((song.directory, song.filename), (coverart.directory, coverart.filename), 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 = icarus_models::song::generate_filename(
+        icarus_models::types::MusicTypes::FlacExtension,
+        true,
+    );
+
+    song.directory = icarus_envy::environment::get_root_directory().await.value;
+
+    (song.directory, song.filename)
+}
+
+// TODO: Consider having something like this in icarus_models
+pub async fn generate_coverart_queue_dir_and_filename(file_type: &str) -> (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);
+        }
+    }
+
+    filename += if file_type == icarus_meta::detection::coverart::constants::JPEG_TYPE
+        || file_type == icarus_meta::detection::coverart::constants::JPG_TYPE
+    {
+        ".jpeg"
+    } else if file_type == icarus_meta::detection::coverart::constants::PNG_TYPE {
+        ".png"
+    } else {
+        ""
+    };
+
+    // TODO: Consider separating song and coverart when saving to the filesystem
+    let directory = icarus_envy::environment::get_root_directory().await.value;
+
+    (directory, filename)
+}

src/metadata/mod.rs

@@ -1,7 +1,6 @@
-/// Applies metadata to the queued song
 pub async fn apply_metadata(
-    queued_song: &crate::queued_item::QueuedSong,
+    song_queue_path: &String,
-    queued_coverart: &crate::queued_item::QueuedCoverArt,
+    coverart_queue_path: &String,
     metadata: &crate::api::get_metadata_queue::response::Metadata,
 ) -> Result<bool, std::io::Error> {
     // Apply metadata fields
@@ -12,7 +11,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, &queued_song.path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -22,7 +21,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, &queued_song.path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -32,7 +31,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, &queued_song.path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -43,7 +42,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, &queued_song.path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -52,7 +51,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, &queued_song.path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -62,7 +61,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, &queued_song.path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -72,7 +71,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, &queued_song.path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -81,7 +80,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, &queued_song.path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -90,7 +89,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, &queued_song.path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -99,7 +98,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, &queued_song.path, meta_type) {
+                match icarus_meta::meta::metadata::set_meta_value(t, song_queue_path, meta_type) {
                     Ok(_) => {}
                     Err(_err) => {
                         return Err(_err);
@@ -110,11 +109,11 @@ pub async fn apply_metadata(
     }
 
     // Apply coverart
-    match icarus_meta::meta::coverart::contains_coverart(&queued_song.path) {
+    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(&queued_song.path) {
+                match icarus_meta::meta::coverart::remove_coverart(song_queue_path) {
                     Ok(_data) => {}
                     Err(err) => {
                         return Err(err);
@@ -122,10 +121,7 @@ pub async fn apply_metadata(
                 }
             }
 
-            match icarus_meta::meta::coverart::set_coverart(
+            match icarus_meta::meta::coverart::set_coverart(song_queue_path, coverart_queue_path) {
-                &queued_song.path,
-                &queued_coverart.path,
-            ) {
                 Ok(_data) => {
                     if _data.is_empty() {
                         println!("There was an issue");

src/parser/mod.rs

@@ -1,272 +0,0 @@
-pub async fn some_work(
-    app: &crate::config::App,
-    song_queue_id: &uuid::Uuid,
-    user_id: &uuid::Uuid,
-) -> Result<
-    (
-        icarus_models::song::Song,
-        icarus_models::coverart::CoverArt,
-        crate::api::get_metadata_queue::response::Metadata,
-        crate::queued_item::QueuedSong,
-        crate::queued_item::QueuedCoverArt,
-    ),
-    std::io::Error,
-> {
-    match prep_song(app, song_queue_id).await {
-        Ok((queued_song, queued_coverart, metadata)) => {
-            println!("Prepping song");
-
-            match crate::metadata::apply_metadata(&queued_song, &queued_coverart, &metadata).await {
-                Ok(_applied) => {
-                    match crate::api::update_queued_song::update_queued_song(app, &queued_song)
-                        .await
-                    {
-                        Ok(response) => {
-                            match response
-                                .json::<crate::api::update_queued_song::response::Response>()
-                                .await
-                            {
-                                Ok(_inner_response) => {
-                                    println!("Updated queued song");
-                                    println!("Response: {_inner_response:?}");
-
-                                    let song_type = String::from(
-                                        icarus_meta::detection::song::constants::FLAC_TYPE,
-                                    );
-
-                                    match crate::api::create_song::create(
-                                        app, &metadata, user_id, &song_type,
-                                    )
-                                    .await
-                                    {
-                                        Ok(response) => match response
-                                            .json::<crate::api::create_song::response::Response>()
-                                            .await
-                                        {
-                                            Ok(resp) => {
-                                                println!("Response: {resp:?}");
-
-                                                let mut song = resp.data[0].clone();
-                                                song.directory = queued_song.song.directory.clone();
-                                                song.filename = queued_song.song.filename.clone();
-
-                                                match crate::api::create_coverart::create(app, &song, &queued_coverart).await {
-                                                    Ok(response) => match response.json::<crate::api::create_coverart::response::Response>().await {
-                                                        Ok(resp) => {
-                                                            println!("CoverArt sent and successfully parsed response");
-                                                            println!("json: {resp:?}");
-                                                            let mut coverart = resp.data[0].clone();
-                                                            coverart.directory = queued_coverart.coverart.directory.clone();
-                                                            coverart.filename = queued_coverart.coverart.filename.clone();
-
-                                                            Ok((song.clone(), coverart.clone(), metadata, queued_song.clone(), queued_coverart.clone()))
-                                                        }
-                                                        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())),
-    }
-}
-
-pub async fn prep_song(
-    app: &crate::config::App,
-    song_queue_id: &uuid::Uuid,
-) -> Result<
-    (
-        crate::queued_item::QueuedSong,
-        crate::queued_item::QueuedCoverArt,
-        crate::api::get_metadata_queue::response::Metadata,
-    ),
-    reqwest::Error,
-> {
-    match crate::api::fetch_song_queue_data::get_data(app, song_queue_id).await {
-        Ok(response) => {
-            // Process data here...
-            match crate::api::parsing::parse_response_into_bytes(response).await {
-                Ok(song_bytes) => {
-                    let song = icarus_models::song::Song {
-                        directory: icarus_envy::environment::get_root_directory().await.value,
-                        filename: icarus_models::song::generate_filename(
-                            icarus_models::types::MusicType::FlacExtension,
-                            true,
-                        )
-                        .unwrap(),
-                        data: song_bytes,
-                        ..Default::default()
-                    };
-                    let songpath = song.song_path().unwrap_or_default();
-
-                    let queued_song: crate::queued_item::QueuedSong =
-                        match song.save_to_filesystem() {
-                            Ok(_) => crate::queued_item::QueuedSong {
-                                id: *song_queue_id,
-                                song,
-                                path: songpath,
-                            },
-                            Err(err) => {
-                                eprintln!("Error: {err:?}");
-                                crate::queued_item::QueuedSong {
-                                    ..Default::default()
-                                }
-                            }
-                        };
-
-                    println!("Saved at: {:?}", queued_song.path);
-
-                    match crate::api::get_metadata_queue::get(app, &queued_song.id).await {
-                        Ok(response) => {
-                            match response
-                                .json::<crate::api::get_metadata_queue::response::Response>()
-                                .await
-                            {
-                                Ok(response) => {
-                                    let bod = &response.data[0];
-                                    match process_coverart(app, &queued_song.id, bod).await {
-                                        Ok(qc) => Ok((queued_song, qc, bod.metadata.clone())),
-                                        Err(err) => Err(err),
-                                    }
-                                }
-                                Err(err) => Err(err),
-                            }
-                        }
-                        Err(err) => Err(err),
-                    }
-                }
-                Err(err) => Err(err),
-            }
-        }
-        Err(err) => Err(err),
-    }
-}
-
-pub async fn process_coverart(
-    app: &crate::config::App,
-    queued_song_id: &uuid::Uuid,
-    queued_item: &crate::api::get_metadata_queue::response::QueueItem,
-) -> Result<crate::queued_item::QueuedCoverArt, reqwest::Error> {
-    let id = queued_item.id;
-    let created_at = queued_item.created_at;
-    let metadata = &queued_item.metadata;
-    println!("Id: {id:?}");
-    println!("Metadata: {metadata:?}");
-    println!("Created at: {created_at:?}");
-
-    println!("Getting coverart queue");
-    match crate::api::get_coverart_queue::get(app, queued_song_id).await {
-        Ok(response) => {
-            match response
-                .json::<crate::api::get_coverart_queue::response::Response>()
-                .await
-            {
-                Ok(response) => {
-                    let coverart_queue = &response.data[0];
-                    let coverart_queue_id = coverart_queue.id;
-                    println!("Coverart queue Id: {coverart_queue_id:?}");
-
-                    match crate::api::get_coverart_queue::get_data(app, &coverart_queue_id).await {
-                        Ok(response) => {
-                            match crate::api::parsing::parse_response_into_bytes(response).await {
-                                Ok(coverart_queue_bytes) => {
-                                    let queued_coverart = init_queued_coverart(
-                                        &coverart_queue_id,
-                                        &coverart_queue.file_type,
-                                        coverart_queue_bytes,
-                                    )
-                                    .await;
-                                    println!(
-                                        "Saved coverart queue file at: {:?}",
-                                        queued_coverart.path
-                                    );
-                                    println!(
-                                        "Queued CoverArt file type: {:?}",
-                                        queued_coverart.coverart.file_type
-                                    );
-
-                                    Ok(queued_coverart)
-                                }
-                                Err(err) => Err(err),
-                            }
-                        }
-                        Err(err) => Err(err),
-                    }
-                }
-                Err(err) => Err(err),
-            }
-        }
-        Err(err) => Err(err),
-    }
-}
-
-async fn init_queued_coverart(
-    coverart_queue_id: &uuid::Uuid,
-    file_type: &str,
-    bytes: Vec<u8>,
-) -> crate::queued_item::QueuedCoverArt {
-    // TODO: Consider separating song and coverart when saving to the filesystem
-    let covart_type = if file_type == icarus_meta::detection::coverart::constants::PNG_TYPE {
-        icarus_models::types::CoverArtType::PngExtension
-    } else if file_type == icarus_meta::detection::coverart::constants::JPEG_TYPE {
-        icarus_models::types::CoverArtType::JpegExtension
-    } else if file_type == icarus_meta::detection::coverart::constants::JPG_TYPE {
-        icarus_models::types::CoverArtType::JpgExtension
-    } else {
-        icarus_models::types::CoverArtType::None
-    };
-    let coverart = icarus_models::coverart::CoverArt {
-        directory: icarus_envy::environment::get_root_directory().await.value,
-        filename: match icarus_models::coverart::generate_filename(covart_type, true) {
-            Ok(filename) => filename,
-            Err(err) => {
-                eprintln!("Error generating CoverArt filename: {err:?}");
-                panic!("Error initializing queued CoverArt");
-            }
-        },
-        file_type: String::from(file_type),
-        data: bytes,
-        ..Default::default()
-    };
-    coverart.save_to_filesystem().unwrap();
-    let coverart_queue_fs_path = coverart.get_path().unwrap();
-    crate::queued_item::QueuedCoverArt {
-        id: *coverart_queue_id,
-        coverart,
-        path: coverart_queue_fs_path,
-    }
-}
-
-pub async fn cleanup(
-    song: &icarus_models::song::Song,
-    coverart: &icarus_models::coverart::CoverArt,
-) -> Result<(), std::io::Error> {
-    match song.remove_from_filesystem() {
-        Ok(_) => {}
-        Err(err) => {
-            eprintln!("Error: Problem cleaning up SongQueue files {err:?}");
-        }
-    }
-
-    match coverart.remove_from_filesystem() {
-        Ok(_) => Ok(()),
-        Err(err) => Err(err),
-    }
-}

src/queue/mod.rs

@@ -1,60 +0,0 @@
-pub async fn wipe_data_from_queues(
-    app: &crate::config::App,
-    queued_song: &crate::queued_item::QueuedSong,
-    queued_coverart: &crate::queued_item::QueuedCoverArt,
-) -> Result<(), std::io::Error> {
-    match crate::api::wipe_data::song_queue::wipe_data(app, queued_song).await {
-        Ok(response) => match response
-            .json::<crate::api::wipe_data::song_queue::response::Response>()
-            .await
-        {
-            Ok(_resp) => {
-                match crate::api::wipe_data::coverart_queue::wipe_data(app, queued_coverart).await {
-                    Ok(inner_response) => match inner_response
-                        .json::<crate::api::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())),
-    }
-}
-
-pub async fn is_queue_empty(
-    app: &crate::config::App,
-) -> Result<
-    (
-        bool,
-        crate::api::fetch_next_queue_item::response::SongQueueItem,
-    ),
-    reqwest::Error,
-> {
-    match crate::api::fetch_next_queue_item::fetch_next_queue_item(app).await {
-        Ok(response) => {
-            match response
-                .json::<crate::api::fetch_next_queue_item::response::SongQueueItem>()
-                .await
-            {
-                Ok(response) => {
-                    if response.data.is_empty() {
-                        Ok((true, response))
-                    } else {
-                        Ok((false, response))
-                    }
-                }
-                Err(err) => Err(err),
-            }
-        }
-        Err(err) => Err(err),
-    }
-}

src/queued_item.rs

@@ -1,13 +0,0 @@
-#[derive(Clone, Debug, Default)]
-pub struct QueuedSong {
-    pub id: uuid::Uuid,
-    pub song: icarus_models::song::Song,
-    pub path: String,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct QueuedCoverArt {
-    pub id: uuid::Uuid,
-    pub coverart: icarus_models::coverart::CoverArt,
-    pub path: String,
-}