Added todos

Cargo.lock

@@ -536,8 +536,8 @@ dependencies = [
 
 [[package]]
 name = "icarus_models"
-version = "0.7.3"
+version = "0.7.0"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.7.3-next-v0.8-44d08cdb1f-111#44d08cdb1f41c0de292b820f859b25cb08a7c0a3"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.7.0#11e5b1745cdb256b027cb8ce3e18e949351ea9ea"
 dependencies = [
  "josekit",
  "rand",
@@ -1349,7 +1349,7 @@ dependencies = [
 
 [[package]]
 name = "songparser"
-version = "0.4.2"
+version = "0.4.1"
 dependencies = [
  "futures",
  "icarus_envy",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "songparser"
-version = "0.4.2"
+version = "0.4.1"
 edition = "2024"
 rust-version = "1.90"
 
@@ -14,5 +14,5 @@ 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.0" }
-icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.7.3-next-v0.8-44d08cdb1f-111" }
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.7.0" }
 icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.5.0" }

src/main.rs

@@ -251,33 +251,11 @@ async fn some_work(
     std::io::Error,
 > {
     match prep_song(app, song_queue_id).await {
-        Ok((
+        Ok(((song_directory, song_filename), coverart_queue_path, metadata, coverart_queue_id)) => {
-            (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 apply_metadata(&song_queue_path, &coverart_queue_path, &metadata).await {
                 Ok(_applied) => {
@@ -294,7 +272,6 @@ async fn some_work(
                                 .await
                             {
                                 Ok(_inner_response) => {
-                                    println!("Updated queued song");
                                     println!("Response: {_inner_response:?}");
 
                                     // TODO: Place this somewhere else
@@ -322,9 +299,7 @@ async fn some_work(
                                                             println!("CoverArt sent and successfully parsed response");
                                                             println!("json: {resp:?}");
                                                             let mut coverart = resp.data[0].clone();
-                                                            coverart.directory = coverart_queue.directory;
+                                                            coverart.path = coverart_queue_path.clone();
-                                                            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) => {
@@ -360,7 +335,7 @@ async fn prep_song(
 ) -> Result<
     (
         (String, String),
-        (String, String),
+        String,
         api::get_metadata_queue::response::Metadata,
         uuid::Uuid,
     ),
@@ -414,25 +389,16 @@ async fn prep_song(
                                                             Ok(coverart_queue_bytes) => {
                                                                 let (directory, filename) = generate_coverart_queue_dir_and_filename().await;
                                                                 let coverart = icarus_models::coverart::CoverArt {
-                                                                    directory,
+                                                                    path: directory + "/" + &filename,
-                                                                    filename,
                                                                     data: coverart_queue_bytes,
                                                                     ..Default::default()
                                                                 };
                                                                 coverart.save_to_filesystem().unwrap();
-                                                                let coverart_queue_fs_path = match coverart.get_path() {
+                                                                let coverart_queue_path = std::path::Path::new(&coverart.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))
+                                                                let c_path = util::path_buf_to_string(coverart_queue_path);
+                                                                Ok(((song.directory, song.filename), c_path, metadata.clone(), *coverart_queue_id))
                                                             }
                                                             Err(err) => {
                                                                 Err(err)

todos.txt

@@ -0,0 +1,5 @@
+// TODO: Make filename random in update_queued_song() function src/api.rs
+// TODO: Make did_token_expire() function use functions/methods from icarus_models src/main.rs
+// NO-TODO: Do not do generate_song_queue_dir_and_filename() changes changes of moving it to icarus_models
+// NO-TODO: Do not do generate_coverart_queue_dir_and_filename() changes of moving it to icarus_models
+// TODO: Do something about hard-coded file extensions