From 9f3e49bd015973c31c38d3a0b45422a2eb00c98b Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 16:32:13 -0400 Subject: [PATCH] tsk-202: Make downloaded CoverArt filename random --- src/callers/coverart.rs | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index 118e23f..df14443 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -69,18 +69,35 @@ pub mod endpoint { match crate::repo::song::get_song(&pool, &song_id).await { Ok(song) => { let directory = icarus_envy::environment::get_root_directory().await.value; + let file_type = icarus_meta::detection::coverart::file_type_from_data(&data).unwrap(); + let coverart_type = if file_type.file_type + == icarus_meta::detection::coverart::constants::JPEG_TYPE + { + icarus_models::types::CoverArtType::JpegExtension + } else if file_type.file_type + == icarus_meta::detection::coverart::constants::JPG_TYPE + { + icarus_models::types::CoverArtType::JpgExtension + } else if file_type.file_type + == icarus_meta::detection::coverart::constants::PNG_TYPE + { + icarus_models::types::CoverArtType::PngExtension + } else { + response.message = String::from("Invalid CoverArt type"); + return ( + axum::http::StatusCode::INTERNAL_SERVER_ERROR, + axum::Json(response) + ); + }; // TODO: Make this random and the file extension should not be hard coded - let filename = format!("{}-coverart.jpeg", &song.filename[..8]); + let filename = icarus_models::coverart::generate_filename(coverart_type, true).unwrap(); let mut coverart = icarus_models::coverart::init::init_coverart_dir_and_filename( &directory, &filename, ); coverart.title = song.album.clone(); - coverart.file_type = - icarus_meta::detection::coverart::file_type_from_data(&data) - .unwrap() - .file_type; + coverart.file_type = file_type.file_type; coverart.data = data; match coverart.save_to_filesystem() {