From f341ee94e53850c6db8656d37cc38529708d07ab Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 18 Jul 2026 13:42:09 -0400 Subject: [PATCH] icarus_meta -> simeta --- Cargo.lock | 24 ++++++++++---------- Cargo.toml | 2 +- src/callers/coverart.rs | 16 ++++++------- src/callers/queue/coverart.rs | 42 +++++++++++++++-------------------- src/callers/queue/song.rs | 4 ++-- src/main.rs | 8 +++---- 6 files changed, 45 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc5e512..b46258a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1038,17 +1038,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "icarus_meta" -version = "0.6.1" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_meta.git?tag=v0.6.1#946c46a23b387323c20720cd78bbac3c34595854" -dependencies = [ - "imghdr", - "infer", - "lofty", - "rand 0.10.2", -] - [[package]] name = "icu_collections" version = "2.2.0" @@ -2141,6 +2130,17 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +[[package]] +name = "simeta" +version = "0.6.1" +source = "git+ssh://git@git.kundeng.us/phoenix/simeta.git?tag=v0.6.1-main-b690995806-680#b6909958064b1a3a4bffd6cbc0f6e12b95477e68" +dependencies = [ + "imghdr", + "infer", + "lofty", + "rand 0.10.2", +] + [[package]] name = "simodels" version = "0.11.3" @@ -2190,7 +2190,6 @@ dependencies = [ "axum-extra", "common-multipart-rfc7578", "futures", - "icarus_meta", "josekit", "jsonwebtoken", "mime_guess", @@ -2198,6 +2197,7 @@ dependencies = [ "serde", "serde_json", "sienvy", + "simeta", "simodels", "sqlx", "tempfile", diff --git a/Cargo.toml b/Cargo.toml index a105e3c..6c5ff4f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ jsonwebtoken = { version = "10.3.0", features = ["rust_crypto"] } josekit = { version = "0.10.3" } utoipa = { version = "5.5.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.6.1" } +simeta = { git = "ssh://git@git.kundeng.us/phoenix/simeta.git", tag = "v0.6.1-main-b690995806-680" } simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.3-main-fe9d101bd0-111" } sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.0-main-d06c8fdf49-006" } diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index 9a879b8..2b66f08 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -70,17 +70,17 @@ pub mod endpoint { Ok(song) => { let directory = sienvy::environment::get_root_directory().value; let file_type = - icarus_meta::detection::coverart::file_type_from_data(&data).unwrap(); + simeta::detection::coverart::file_type_from_data(&data).unwrap(); let coverart_type = if file_type.file_type - == icarus_meta::detection::coverart::constants::JPEG_TYPE + == simeta::detection::coverart::constants::JPEG_TYPE { simodels::types::CoverArtType::JpegExtension } else if file_type.file_type - == icarus_meta::detection::coverart::constants::JPG_TYPE + == simeta::detection::coverart::constants::JPG_TYPE { simodels::types::CoverArtType::JpgExtension } else if file_type.file_type - == icarus_meta::detection::coverart::constants::PNG_TYPE + == simeta::detection::coverart::constants::PNG_TYPE { simodels::types::CoverArtType::PngExtension } else { @@ -201,18 +201,18 @@ pub mod endpoint { Ok(coverart) => match simodels::coverart::io::to_data(&coverart) { Ok(data) => { let (file_type, img_type) = - match icarus_meta::detection::coverart::file_type_from_data(&data) { + match simeta::detection::coverart::file_type_from_data(&data) { Ok(file_type) => { if file_type.file_type - == icarus_meta::detection::coverart::constants::JPEG_TYPE + == simeta::detection::coverart::constants::JPEG_TYPE { (file_type, simodels::types::CoverArtType::JpegExtension) } else if file_type.file_type - == icarus_meta::detection::coverart::constants::JPG_TYPE + == simeta::detection::coverart::constants::JPG_TYPE { (file_type, simodels::types::CoverArtType::JpgExtension) } else if file_type.file_type - == icarus_meta::detection::coverart::constants::PNG_TYPE + == simeta::detection::coverart::constants::PNG_TYPE { (file_type, simodels::types::CoverArtType::PngExtension) } else { diff --git a/src/callers/queue/coverart.rs b/src/callers/queue/coverart.rs index 01de867..46612b2 100644 --- a/src/callers/queue/coverart.rs +++ b/src/callers/queue/coverart.rs @@ -102,9 +102,9 @@ pub mod response { mod helper { pub fn is_coverart_file_type_valid(file_type: &String) -> bool { let valid_file_types = vec![ - String::from(icarus_meta::detection::coverart::constants::JPEG_TYPE), - String::from(icarus_meta::detection::coverart::constants::JPG_TYPE), - String::from(icarus_meta::detection::coverart::constants::PNG_TYPE), + String::from(simeta::detection::coverart::constants::JPEG_TYPE), + String::from(simeta::detection::coverart::constants::JPG_TYPE), + String::from(simeta::detection::coverart::constants::PNG_TYPE), ]; for valid_file_type in valid_file_types { @@ -150,18 +150,17 @@ pub mod endpoint { let content_type = field.content_type().unwrap().to_string(); let data = field.bytes().await.unwrap(); let raw_data = data.to_vec(); - let file_type = - match icarus_meta::detection::coverart::file_type_from_data(&raw_data) { - Ok(file_type) => file_type, - Err(err) => { - eprintln!("Error: {err:?}"); - response.message = err.to_string(); - return ( - axum::http::StatusCode::INTERNAL_SERVER_ERROR, - axum::Json(response), - ); - } - }; + let file_type = match simeta::detection::coverart::file_type_from_data(&raw_data) { + Ok(file_type) => file_type, + Err(err) => { + eprintln!("Error: {err:?}"); + response.message = err.to_string(); + return ( + axum::http::StatusCode::INTERNAL_SERVER_ERROR, + axum::Json(response), + ); + } + }; if !super::helper::is_coverart_file_type_valid(&file_type.file_type) { response.message = format!("CoverArt file type not supported: {file_type:?}"); @@ -318,8 +317,7 @@ pub mod endpoint { ) -> (axum::http::StatusCode, axum::response::Response) { match repo::coverart::get_coverart_queue_data_with_id(&pool, &id).await { Ok(data) => { - let file_type = - icarus_meta::detection::coverart::file_type_from_data(&data).unwrap(); + let file_type = simeta::detection::coverart::file_type_from_data(&data).unwrap(); let bytes = axum::body::Bytes::from(data); let mut response = bytes.into_response(); let headers = response.headers_mut(); @@ -329,16 +327,12 @@ pub mod endpoint { ); let coverart_type = if file_type.file_type - == icarus_meta::detection::coverart::constants::JPEG_TYPE + == simeta::detection::coverart::constants::JPEG_TYPE { simodels::types::CoverArtType::JpegExtension - } else if file_type.file_type - == icarus_meta::detection::coverart::constants::JPG_TYPE - { + } else if file_type.file_type == simeta::detection::coverart::constants::JPG_TYPE { simodels::types::CoverArtType::JpgExtension - } else if file_type.file_type - == icarus_meta::detection::coverart::constants::PNG_TYPE - { + } else if file_type.file_type == simeta::detection::coverart::constants::PNG_TYPE { simodels::types::CoverArtType::PngExtension } else { return ( diff --git a/src/callers/queue/song.rs b/src/callers/queue/song.rs index d82feb8..5ec55b3 100644 --- a/src/callers/queue/song.rs +++ b/src/callers/queue/song.rs @@ -97,9 +97,9 @@ pub mod response { } pub async fn is_song_valid(data: &[u8]) -> Result { - match icarus_meta::detection::song::file_type_from_data(data) { + match simeta::detection::song::file_type_from_data(data) { Ok(file_type) => { - if file_type.file_type == icarus_meta::detection::song::constants::FLAC_TYPE { + if file_type.file_type == simeta::detection::song::constants::FLAC_TYPE { Ok(true) } else { Ok(false) diff --git a/src/main.rs b/src/main.rs index 451f305..af7f0a4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -149,8 +149,8 @@ mod tests { pub fn token_fields() -> (String, String, String) { ( String::from("What a twist!"), - String::from("icarus_test"), - String::from("icarus"), + String::from("soaricarus_test"), + String::from("soaricarus"), ) } @@ -289,7 +289,7 @@ mod tests { .uri(uri) .header( axum::http::header::CONTENT_TYPE, - icarus_meta::detection::song::constants::mime::FLAC, + simeta::detection::song::constants::mime::FLAC, ) .header( axum::http::header::AUTHORIZATION, @@ -306,7 +306,7 @@ mod tests { ) -> Result { let mut form = MultipartForm::default(); let _ = form.add_file( - icarus_meta::detection::coverart::constants::JPEG_TYPE, + simeta::detection::coverart::constants::JPEG_TYPE, "tests/I/Coverart-1.jpg", );