From 6027d90923e9442858fb5edebd4c987ef099b826 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Mon, 27 Oct 2025 14:10:53 -0400 Subject: [PATCH] tsk-203: Make downloaded coverart file random --- src/callers/coverart.rs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index 01d23af..33a4c48 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -179,9 +179,19 @@ pub mod endpoint { match repo::coverart::get_coverart(&pool, &id).await { Ok(coverart) => match icarus_models::coverart::io::to_data(&coverart) { Ok(data) => { - let file_type = + let (file_type, img_type) = match icarus_meta::detection::coverart::file_type_from_data(&data) { - Ok(file_type) => file_type, + Ok(file_type) => { + if file_type.file_type == icarus_meta::detection::coverart::constants::JPEG_TYPE { + (file_type, icarus_models::types::CoverArtTypes::JpegExtension) + } else if file_type.file_type == icarus_meta::detection::coverart::constants::JPG_TYPE { + (file_type, icarus_models::types::CoverArtTypes::JpgExtension) + } else if file_type.file_type == icarus_meta::detection::coverart::constants::PNG_TYPE { + (file_type, icarus_models::types::CoverArtTypes::PngExtension) + } else { + return (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::response::Response::default()); + } + } Err(err) => { eprintln!("Error: {err:?}"); return ( @@ -193,13 +203,14 @@ pub mod endpoint { let bytes = axum::body::Bytes::from(data); let mut response = bytes.into_response(); let headers = response.headers_mut(); + let filename = icarus_models::coverart::generate_filename(img_type, true); headers.insert( axum::http::header::CONTENT_TYPE, file_type.mime.parse().unwrap(), ); headers.insert( axum::http::header::CONTENT_DISPOSITION, - format!("attachment; filename=\"{}\"", coverart.filename) + format!("attachment; filename=\"{filename}\"") .parse() .unwrap(), );