From 19434110f698d33e6ee97edaeed8e6dd609afed3 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 14:17:12 -0400 Subject: [PATCH 1/7] icarus_models version bump --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fd486b5..840971c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -466,8 +466,8 @@ dependencies = [ [[package]] name = "icarus_models" -version = "0.8.3" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.8.3#0a27b8ccb1ac40361df8d3131f567f37f06cdc08" +version = "0.9.2" +source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.9.2-91-d121dbb06f-111#d121dbb06fd2605e8789b37245f2e1af083edd00" dependencies = [ "josekit", "rand", diff --git a/Cargo.toml b/Cargo.toml index a64f1fd..e6c1984 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,4 +14,4 @@ serde_json = "1.0.145" tokio = { version = "1.47.1", features = ["full"] } tokio-util = { version = "0.7.16", features = ["codec"] } uuid = { version = "1.18.1", features = ["v4", "serde"] } -icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.8.3" } +icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.9.2-91-d121dbb06f-111" } -- 2.47.3 From 98e3b0b5ca163f3a9755d7e4ef0a488a3c2247bc Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 14:17:39 -0400 Subject: [PATCH 2/7] Build fix --- src/managers/commit_manager.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 31b476d..101d884 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -189,10 +189,17 @@ impl CommitManager { song.data = o.as_bytes().to_vec(); song.directory = String::from("."); - song.filename = icarus_models::song::generate_filename( - icarus_models::types::MusicTypes::FlacExtension, + song.filename = match icarus_models::song::generate_filename( + icarus_models::types::MusicType::FlacExtension, true, - ); + ) { + Ok(filename) => filename, + Err(err) => { + eprintln!("Error generating song filename: {err:?}"); + utilities::checks::exit_program(-3); + return + } + }; match song.save_to_filesystem() { Ok(_) => { println!("Song saved"); -- 2.47.3 From f1320f48fe0613d2dd3e56e39d7aaf93e31af2f5 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 14:21:27 -0400 Subject: [PATCH 3/7] Removed method --- src/managers/commit_manager.rs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 101d884..7316e77 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -644,13 +644,4 @@ impl CommitManager { Ok(String::new()) } - - fn _check_for_no_confirm(&self) -> bool { - for flag in self.ica_action.flags.iter() { - if flag.flag == "-nc" { - return true; - } - } - false - } } -- 2.47.3 From 42568482fc5209d8f59121c4d3f53cb25347a0d6 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 14:28:00 -0400 Subject: [PATCH 4/7] Some refactoring --- src/managers/commit_manager.rs | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 7316e77..629e3f4 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -131,7 +131,7 @@ impl CommitManager { } fn map_actions(&self) -> HashMap { - let actions: HashMap = HashMap::from([ + HashMap::from([ ("download".to_string(), ActionValues::DownloadAct), ("download".to_string(), ActionValues::DownloadAct), ( @@ -140,9 +140,7 @@ impl CommitManager { ), ("retrieve".to_string(), ActionValues::RetrieveAct), ("delete".to_string(), ActionValues::DeleteAct), - ]); - - actions + ]) } async fn delete_song(&self, token: &icarus_models::token::AccessToken) { @@ -307,7 +305,7 @@ impl CommitManager { } else if multitarget { let _ = self.multi_target_upload(&uni, token).await; } else { - println!("Single or Multi target has not been chosen"); + eprintln!("Single or Multi target has not been chosen"); } } @@ -436,21 +434,20 @@ impl CommitManager { println!("Queued coverart Id: {id:?}"); println!("Linked queued song to queued coverart"); println!("Queued status updated"); + Ok(()) } Err(err) => { - return Err(std::io::Error::other(err.to_string())); + Err(std::io::Error::other(err.to_string())) } }, Err(err) => { - return Err(std::io::Error::other(err.to_string())); + Err(std::io::Error::other(err.to_string())) } }, Err(err) => { - return Err(std::io::Error::other(err.to_string())); + Err(std::io::Error::other(err.to_string())) } } - - Ok(()) } fn get_songs( @@ -493,7 +490,7 @@ impl CommitManager { } Ok(songs) } - Err(_) => Ok(Vec::new()), + Err(_) => Err(std::io::Error::other("Songs not retrieved")) } } @@ -538,7 +535,7 @@ impl CommitManager { println!("Response: {o:?}"); } Err(err) => { - println!("Error: {err:?}"); + eprintln!("Error: {err:?}"); return Err(err); } } @@ -547,12 +544,12 @@ impl CommitManager { Ok(()) } Err(err) => { - println!("Error: {err:?}"); + eprintln!("Error: {err:?}"); Err(std::io::Error::other(err.to_string())) } }, Err(error) => { - println!("Error: {error:?}"); + eprintln!("Error: {error:?}"); Err(std::io::Error::other(error.to_string())) } } @@ -574,7 +571,7 @@ impl CommitManager { } } - Ok((String::new(), String::new())) + Err(std::io::Error::other("CoverArt directory and filename not found")) } fn find_file_extension(&self, file_name: &std::ffi::OsString) -> En { @@ -642,6 +639,6 @@ impl CommitManager { } } - Ok(String::new()) + Err(std::io::Error::other("Metadata path not found")) } } -- 2.47.3 From 34bc38d293467ca766c985a2e4272f58b92ab82a Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 14:31:43 -0400 Subject: [PATCH 5/7] More cleanup --- src/managers/commit_manager.rs | 20 ++++++++------------ src/managers/token_manager.rs | 17 +++++------------ 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 629e3f4..7973e40 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -195,7 +195,7 @@ impl CommitManager { Err(err) => { eprintln!("Error generating song filename: {err:?}"); utilities::checks::exit_program(-3); - return + return; } }; match song.save_to_filesystem() { @@ -436,17 +436,11 @@ impl CommitManager { println!("Queued status updated"); 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())), }, - Err(err) => { - Err(std::io::Error::other(err.to_string())) - } + Err(err) => Err(std::io::Error::other(err.to_string())), } } @@ -490,7 +484,7 @@ impl CommitManager { } Ok(songs) } - Err(_) => Err(std::io::Error::other("Songs not retrieved")) + Err(_) => Err(std::io::Error::other("Songs not retrieved")), } } @@ -571,7 +565,9 @@ impl CommitManager { } } - Err(std::io::Error::other("CoverArt directory and filename not found")) + Err(std::io::Error::other( + "CoverArt directory and filename not found", + )) } fn find_file_extension(&self, file_name: &std::ffi::OsString) -> En { diff --git a/src/managers/token_manager.rs b/src/managers/token_manager.rs index a539f0e..e6a53c3 100644 --- a/src/managers/token_manager.rs +++ b/src/managers/token_manager.rs @@ -23,7 +23,6 @@ impl Default for TokenManager { user: icarus_models::user::User::default(), api: models::api::Api::default(), }; - token.init(); token @@ -35,7 +34,6 @@ impl TokenManager { println!("Sending request for a token"); let url = self.retrieve_url(); - println!("URL: {url}"); let mut token = icarus_models::token::AccessToken { @@ -62,19 +60,18 @@ impl TokenManager { token.token_type = login_result.token_type.clone(); token.expiration = login_result.expiration; token.message = response.message; + Ok(token) } - Err(_) => println!("Hm, the response didn't match the shape we expected."), - }; + Err(err) => Err(std::io::Error::other(err.to_string())), + } } reqwest::StatusCode::UNAUTHORIZED => { - println!("Need to grab a new token"); + Err(std::io::Error::other("Need to grab a new token")) } other => { panic!("Uh oh! Something unexpected happened: {other:?}"); } } - - Ok(token) } pub fn init(&mut self) { @@ -84,10 +81,6 @@ impl TokenManager { } pub fn retrieve_url(&self) -> String { - let api = &self.api; - let mut url = String::from(&api.url); - url += &String::from(&api.endpoint); - - url + format!("{}{}", self.api.url, self.api.endpoint) } } -- 2.47.3 From 9d133dcad765d4979a3051acd365e153519f5730 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 14:31:55 -0400 Subject: [PATCH 6/7] Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 840971c..08efde9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -451,7 +451,7 @@ dependencies = [ [[package]] name = "icarus-dm" -version = "0.8.10" +version = "0.8.11" dependencies = [ "futures", "http", diff --git a/Cargo.toml b/Cargo.toml index e6c1984..d9f3c8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus-dm" -version = "0.8.10" +version = "0.8.11" rust-version = "1.90" edition = "2024" -- 2.47.3 From ab9669ccdbfb002c1cf64bd86bf40cdbdf4b7a62 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 15:28:18 -0400 Subject: [PATCH 7/7] Using standard version --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 08efde9..f4a734d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -467,7 +467,7 @@ dependencies = [ [[package]] name = "icarus_models" version = "0.9.2" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.9.2-91-d121dbb06f-111#d121dbb06fd2605e8789b37245f2e1af083edd00" +source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.9.2#05525618514409101c1d6474dafb201386d14a30" dependencies = [ "josekit", "rand", diff --git a/Cargo.toml b/Cargo.toml index d9f3c8b..15359ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,4 +14,4 @@ serde_json = "1.0.145" tokio = { version = "1.47.1", features = ["full"] } tokio-util = { version = "0.7.16", features = ["codec"] } uuid = { version = "1.18.1", features = ["v4", "serde"] } -icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.9.2-91-d121dbb06f-111" } +icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.9.2" } -- 2.47.3