From 60930ca10c5732a449a7dad70d8174ccec874af2 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Tue, 17 Jun 2025 21:33:32 -0400 Subject: [PATCH] Formatting --- src/callers/coverart.rs | 19 +++++++++++-------- src/main.rs | 42 +++++++++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index 40a185b..79661f1 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -450,10 +450,7 @@ pub mod endpoint { pub async fn fetch_coverart_with_data( axum::Extension(pool): axum::Extension, axum::extract::Path(id): axum::extract::Path, - ) -> ( - axum::http::StatusCode, - axum::response::Response, - ) { + ) -> (axum::http::StatusCode, axum::response::Response) { match super::db::get_coverart_queue_data_with_id(&pool, &id).await { Ok(data) => { let bytes = axum::body::Bytes::from(data); @@ -462,13 +459,19 @@ pub mod endpoint { // TODO: Address this hard coding for the coverart content type headers.insert(axum::http::header::CONTENT_TYPE, "image".parse().unwrap()); // TODO: Make the conent disposition more dynamic - headers.insert(axum::http::header::CONTENT_DISPOSITION, format!("attachment; filename=\"{}.jpg\"", id).parse().unwrap()); + headers.insert( + axum::http::header::CONTENT_DISPOSITION, + format!("attachment; filename=\"{}.jpg\"", id) + .parse() + .unwrap(), + ); (axum::http::StatusCode::OK, response) } - Err(_err) => { - (axum::http::StatusCode::BAD_REQUEST, axum::response::Response::default()) - } + Err(_err) => ( + axum::http::StatusCode::BAD_REQUEST, + axum::response::Response::default(), + ), } } diff --git a/src/main.rs b/src/main.rs index d9f3016..572dd37 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1258,9 +1258,14 @@ mod tests { "Should not be empty" ); - let raw_uri = String::from(crate::callers::endpoints::QUEUECOVERARTDATA); + let raw_uri = + String::from(crate::callers::endpoints::QUEUECOVERARTDATA); let end_index = raw_uri.len() - 5; - let uri = format!("{}/{}", (&raw_uri[..end_index]).to_string(), resp_coverart_id); + let uri = format!( + "{}/{}", + (&raw_uri[..end_index]).to_string(), + resp_coverart_id + ); println!("Uri: {:?}", uri); match app @@ -1275,22 +1280,27 @@ mod tests { ) .await { - Ok(response) => { - match resp_to_bytes(response).await { - Ok(bytes) => { - assert_eq!(false, bytes.is_empty(), "Downloaded coverart data should not be empty"); - let temp_file = tempfile::tempdir().expect("Could not create test directory"); - let test_dir = String::from(temp_file.path().to_str().unwrap()); - let new_file = format!("{}/new_image.jpeg", test_dir); + Ok(response) => match resp_to_bytes(response).await { + Ok(bytes) => { + assert_eq!( + false, + bytes.is_empty(), + "Downloaded coverart data should not be empty" + ); + let temp_file = tempfile::tempdir() + .expect("Could not create test directory"); + let test_dir = + String::from(temp_file.path().to_str().unwrap()); + let new_file = format!("{}/new_image.jpeg", test_dir); - let mut file = std::fs::File::create(&new_file).unwrap(); - file.write_all(&bytes).unwrap(); - } - Err(err) => { - assert!(false, "Error: {:?}", err); - } + let mut file = + std::fs::File::create(&new_file).unwrap(); + file.write_all(&bytes).unwrap(); } - } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + }, Err(err) => { assert!(false, "Error: {:?}", err); }