From f9f3dbda367aff4e36620d812241400785ec24dd Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 29 Jun 2025 22:08:23 +0000 Subject: [PATCH] Refactoring (#31) Reviewed-on: https://git.kundeng.us/phoenix/songparser/pulls/31 Co-authored-by: phoenix Co-committed-by: phoenix --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/main.rs | 34 +++++++++++++++++----------------- src/update_queued_song.rs | 6 +++--- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index beae7e8..b8911f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1255,7 +1255,7 @@ dependencies = [ [[package]] name = "songparser" -version = "0.1.0" +version = "0.2.0" dependencies = [ "futures", "icarus_envy", diff --git a/Cargo.toml b/Cargo.toml index abcbb1b..b568463 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "songparser" -version = "0.1.0" +version = "0.2.0" edition = "2024" rust-version = "1.88" diff --git a/src/main.rs b/src/main.rs index 429eac7..8532b50 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,20 +11,20 @@ async fn main() -> Result<(), Box> { let app_base_url = icarus_envy::environment::get_icarus_base_api_url().await; loop { - println!("Base URL: {}", app_base_url); + 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); + println!("SongQueueItem: {song_queue_item:?}"); let song_queue_id = song_queue_item.data[0].id; // TODO: Do something with the result later match some_work(&app_base_url, &song_queue_id).await { Ok(_) => {} Err(err) => { - eprintln!("Error: {:?}", err); + eprintln!("Error: {err:?}"); } } } else { @@ -32,7 +32,7 @@ async fn main() -> Result<(), Box> { } } Err(err) => { - eprintln!("Error checking if queue is empty: {:?}", err); + eprintln!("Error checking if queue is empty: {err:?}"); } } @@ -85,7 +85,7 @@ async fn some_work( .await { Ok(_inner_response) => { - println!("Response: {:?}", _inner_response); + println!("Response: {_inner_response:?}"); Ok(()) } Err(err) => Err(std::io::Error::other(err.to_string())), @@ -113,7 +113,7 @@ async fn prep_song( 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); + println!("Saved at: {song_queue_path:?}"); match api::get_metadata_queue::get(api_url, song_queue_id).await { Ok(response) => { @@ -125,9 +125,9 @@ async fn prep_song( 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!("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 @@ -136,7 +136,7 @@ async fn prep_song( match response.json::().await { Ok(response) => { let coverart_queue_id = &response.data[0].id; - println!("Coverart queue Id: {:?}", coverart_queue_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 { @@ -144,7 +144,7 @@ async fn prep_song( 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); + 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); @@ -350,7 +350,7 @@ pub async fn apply_metadata( match icarus_meta::meta::coverart::contains_coverart(song_queue_path) { Ok((exists, size)) => { if exists { - println!("Coverart exists: {:?} size", size); + println!("Coverart exists: {size:?} size"); match icarus_meta::meta::coverart::remove_coverart(song_queue_path) { Ok(_data) => {} Err(err) => { @@ -401,7 +401,7 @@ mod api { ) -> Result { let client = reqwest::Client::new(); let fetch_endpoint = String::from("api/v2/song/queue/next"); - let api_url = format!("{}/{}", base_url, fetch_endpoint); + let api_url = format!("{base_url}/{fetch_endpoint}"); client.get(api_url).send().await } @@ -432,7 +432,7 @@ mod api { ) -> Result { let client = reqwest::Client::new(); let endpoint = String::from("api/v2/song/queue"); - let api_url = format!("{}/{}/{}", base_url, endpoint, id); + let api_url = format!("{base_url}/{endpoint}/{id}"); client.get(api_url).send().await } } @@ -444,7 +444,7 @@ mod api { ) -> Result { let client = reqwest::Client::new(); let endpoint = String::from("api/v2/song/metadata/queue"); - let api_url = format!("{}/{}", base_url, endpoint); + let api_url = format!("{base_url}/{endpoint}"); client .get(api_url) .query(&[("song_queue_id", song_queue_id)]) @@ -495,7 +495,7 @@ mod api { ) -> Result { let client = reqwest::Client::new(); let endpoint = String::from("api/v2/coverart/queue"); - let api_url = format!("{}/{}", base_url, endpoint); + let api_url = format!("{base_url}/{endpoint}"); client .get(api_url) .query(&[("song_queue_id", song_queue_id)]) @@ -509,7 +509,7 @@ mod api { ) -> Result { let client = reqwest::Client::new(); let endpoint = String::from("api/v2/coverart/queue/data"); - let api_url = format!("{}/{}/{}", base_url, endpoint, coverart_queue_id); + let api_url = format!("{base_url}/{endpoint}/{coverart_queue_id}"); client.get(api_url).send().await } diff --git a/src/update_queued_song.rs b/src/update_queued_song.rs index ba51eeb..b7f3322 100644 --- a/src/update_queued_song.rs +++ b/src/update_queued_song.rs @@ -5,7 +5,7 @@ pub async fn update_queued_song( ) -> Result { let client = reqwest::Client::builder().build()?; - println!("Song path: {:?}", song_path); + println!("Song path: {song_path:?}"); // TODO: Make the filename random let form = reqwest::multipart::Form::new().part( @@ -14,8 +14,8 @@ pub async fn update_queued_song( .file_name("track01.flac"), ); - let url = format!("{}/api/v2/song/queue/{}", base_url, song_queue_id); - println!("Url: {:?}", url); + let url = format!("{base_url}/api/v2/song/queue/{song_queue_id}"); + println!("Url: {url:?}"); let request = client.patch(url).multipart(form);