From a11a82226816ee7be4c8f1a3e03cfd305ad79dee Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 15:02:54 -0400 Subject: [PATCH 1/5] 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 30d4546..1a9da24 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1016,8 +1016,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 0.9.2", diff --git a/Cargo.toml b/Cargo.toml index 70236c5..d0ff098 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ josekit = { version = "0.10.3" } utoipa = { version = "5.4.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.4.3" } -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" } icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.5.0" } [dev-dependencies] -- 2.47.3 From c11da0d1de2e8168d7ab3b9092a8d68ee8e1e72a Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 15:06:57 -0400 Subject: [PATCH 2/5] Fix test --- src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index 0baf7dd..3e2c0a2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -575,7 +575,6 @@ mod tests { .body(axum::body::Body::from_stream(body)) .unwrap(); - // Send request app.clone().oneshot(req).await } @@ -1132,9 +1131,10 @@ mod tests { let song = icarus_models::song::Song { directory: test_dir, filename: icarus_models::song::generate_filename( - icarus_models::types::MusicTypes::FlacExtension, + icarus_models::types::MusicType::FlacExtension, true, - ), + ) + .unwrap(), data: bytes.to_vec(), ..Default::default() }; -- 2.47.3 From 8926ae1bc584752beb0b4ae0ae6d17837b34ca13 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 15:10:01 -0400 Subject: [PATCH 3/5] Build fixes --- src/callers/coverart.rs | 12 +++++------- src/callers/song.rs | 5 +++-- src/repo/coverart.rs | 2 ++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index fec5fed..553b254 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -185,18 +185,15 @@ pub mod endpoint { if file_type.file_type == icarus_meta::detection::coverart::constants::JPEG_TYPE { - ( - file_type, - icarus_models::types::CoverArtTypes::JpegExtension, - ) + (file_type, icarus_models::types::CoverArtType::JpegExtension) } else if file_type.file_type == icarus_meta::detection::coverart::constants::JPG_TYPE { - (file_type, icarus_models::types::CoverArtTypes::JpgExtension) + (file_type, icarus_models::types::CoverArtType::JpgExtension) } else if file_type.file_type == icarus_meta::detection::coverart::constants::PNG_TYPE { - (file_type, icarus_models::types::CoverArtTypes::PngExtension) + (file_type, icarus_models::types::CoverArtType::PngExtension) } else { return ( axum::http::StatusCode::INTERNAL_SERVER_ERROR, @@ -215,7 +212,8 @@ 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); + let filename = + icarus_models::coverart::generate_filename(img_type, true).unwrap(); headers.insert( axum::http::header::CONTENT_TYPE, file_type.mime.parse().unwrap(), diff --git a/src/callers/song.rs b/src/callers/song.rs index db97d00..69da51b 100644 --- a/src/callers/song.rs +++ b/src/callers/song.rs @@ -135,9 +135,10 @@ pub mod endpoint { if payload.is_valid() { let mut song = payload.to_song(); song.filename = icarus_models::song::generate_filename( - icarus_models::types::MusicTypes::FlacExtension, + icarus_models::types::MusicType::FlacExtension, true, - ); + ) + .unwrap(); song.directory = icarus_envy::environment::get_root_directory().await.value; match repo_queue::song::get_data(&pool, &payload.song_queue_id).await { diff --git a/src/repo/coverart.rs b/src/repo/coverart.rs index 2032f1d..8ed25a2 100644 --- a/src/repo/coverart.rs +++ b/src/repo/coverart.rs @@ -115,6 +115,7 @@ pub async fn get_coverart_with_song_id( .try_get("song_id") .map_err(|_e| sqlx::Error::RowNotFound) .unwrap(), + ..Default::default() }), Err(_) => Err(sqlx::Error::RowNotFound), } @@ -161,6 +162,7 @@ pub async fn delete_coverart( .map_err(|_e| sqlx::Error::RowNotFound) .unwrap(), data: Vec::new(), + ..Default::default() }), Err(_err) => Err(sqlx::Error::RowNotFound), } -- 2.47.3 From ad23eda8b96252583c53ba770ab56be338d79e51 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 15:10:16 -0400 Subject: [PATCH 4/5] Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a9da24..e1c9bd1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -964,7 +964,7 @@ dependencies = [ [[package]] name = "icarus" -version = "0.3.12" +version = "0.3.13" dependencies = [ "axum", "axum-extra", diff --git a/Cargo.toml b/Cargo.toml index d0ff098..dff2390 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus" -version = "0.3.12" +version = "0.3.13" edition = "2024" rust-version = "1.90" -- 2.47.3 From 398afe59bd5c9e56d5f9e76f0562a091b4b1a1a7 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 30 Oct 2025 15:28:27 -0400 Subject: [PATCH 5/5] 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 e1c9bd1..1508538 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1017,7 +1017,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 0.9.2", diff --git a/Cargo.toml b/Cargo.toml index dff2390..24d91a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ josekit = { version = "0.10.3" } utoipa = { version = "5.4.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.4.3" } -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" } icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.5.0" } [dev-dependencies] -- 2.47.3