Changing file key of processed coverart

Cargo.lock

@@ -2972,8 +2972,8 @@ dependencies = [
 
 [[package]]
 name = "simodels"
-version = "0.11.5"
+version = "0.11.4"
-source = "git+ssh://git@git.kundeng.us/phoenix/simodels.git?tag=v0.11.5-main-94d97cb81d-111#94d97cb81ddb46b06d34cb1eee41362728b8998e"
+source = "git+ssh://git@git.kundeng.us/phoenix/simodels.git?tag=v0.11.4#d6d719741945ef7719ab1db3e0ef3c617b5bb909"
 dependencies = [
  "josekit",
  "rand 0.10.2",
@@ -3013,7 +3013,7 @@ dependencies = [
 
 [[package]]
 name = "soaricarus_api"
-version = "0.5.7"
+version = "0.5.6"
 dependencies = [
  "axum",
  "axum-extra",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "soaricarus_api"
-version = "0.5.7"
+version = "0.5.6"
 edition = "2024"
 rust-version = "1.95"
 license = "MIT"
@@ -27,7 +27,7 @@ josekit = { version = "0.10.3" }
 utoipa = { version = "5.5.0", features = ["axum_extras"] }
 utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
 simeta = { git = "ssh://git@git.kundeng.us/phoenix/simeta.git", tag = "v0.6.2" }
-simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.5-main-94d97cb81d-111" }
+simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.4" }
 sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.1" }
 labyrinth = { git = "ssh://git@git.kundeng.us/phoenix/labyrinth.git", tag = "v0.0.5" }
 

migrations/20250420185217_init_migration.sql

@@ -74,6 +74,5 @@ CREATE TABLE IF NOT EXISTS "coverart" (
     directory TEXT NOT NULL,
     filename TEXT NOT NULL,
     file_type TEXT NOT NULL,
-    file_key TEXT NOT NULL,
     song_id UUID NOT NULL
 );

src/callers/coverart.rs

@@ -127,24 +127,41 @@ pub mod endpoint {
                                 coverart.title = song.album.clone();
                                 coverart.file_type = file_type.file_type;
                                 coverart.data = data.raw_data;
-                                coverart.file_key = new_file_key;
 
-                                match repo::coverart::create(&pool, &coverart, &payload.song_id)
+                                match coverart.save_to_filesystem() {
-                                    .await
+                                    Ok(_) => {
-                                {
+                                        match repo::coverart::create(
-                                    Ok(id) => {
+                                            &pool,
-                                        coverart.song_id = payload.song_id;
+                                            &coverart,
-                                        coverart.id = id;
+                                            &payload.song_id,
-                                        println!("Cover Art created");
+                                        )
+                                        .await
+                                        {
+                                            Ok(id) => {
+                                                coverart.song_id = payload.song_id;
+                                                coverart.id = id;
+                                                println!("Cover Art created");
 
-                                        response.message = String::from("Successful");
+                                                response.message = String::from("Successful");
-                                        response.data.push(coverart);
+                                                response.data.push(coverart);
 
-                                        (axum::http::StatusCode::OK, axum::Json(response))
+                                                (axum::http::StatusCode::OK, axum::Json(response))
+                                            }
+                                            Err(err) => {
+                                                response.message = err.to_string();
+                                                (
+                                                    axum::http::StatusCode::BAD_REQUEST,
+                                                    axum::Json(response),
+                                                )
+                                            }
+                                        }
                                     }
                                     Err(err) => {
                                         response.message = err.to_string();
-                                        (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
+                                        (
+                                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                            axum::Json(response),
+                                        )
                                     }
                                 }
                             }
@@ -232,11 +249,8 @@ pub mod endpoint {
         axum::Extension(pool): axum::Extension<sqlx::PgPool>,
         axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> (axum::http::StatusCode, axum::response::Response) {
-        let lab_config = crate::util::maze::get_config();
-        let lr = labyrinth::Labyrinth { config: lab_config };
-
         match repo::coverart::get_coverart(&pool, &id).await {
-            Ok(coverart) => match lr.download(&coverart.file_key).await {
+            Ok(coverart) => match simodels::coverart::io::to_data(&coverart) {
                 Ok(data) => {
                     let (file_type, img_type) =
                         match simeta::detection::coverart::file_type_from_data(&data) {

src/main.rs

@@ -503,19 +503,11 @@ mod tests {
         pub const TEST_SONG_01_FILE_KEY: &str = "processed/song/track01.flac";
         pub const TEST_SONG_02_FILE_KEY: &str = "processed/song/track02.flac";
 
-        pub const TEST_COVERART_01_FILE_KEY: &str = "processed/coverart/Coverart-1.jpg";
-        pub const TEST_COVERART_02_FILE_KEY: &str = "processed/coverart/Coverart-2.jpg";
-
         pub struct SongBucket {
             pub file_key: String,
             pub path: String,
         }
 
-        pub struct CoverArtBucket {
-            pub file_key: String,
-            pub path: String,
-        }
-
         pub async fn upload_test_songs_to_bucket() {
             let songs = vec![
                 SongBucket {
@@ -554,44 +546,6 @@ mod tests {
             }
         }
 
-        pub async fn upload_test_coverarts_to_bucket() {
-            let coverarts = vec![
-                CoverArtBucket {
-                    file_key: TEST_COVERART_01_FILE_KEY.to_string(),
-                    path: "tests/I/Coverart-1.jpg".to_string(),
-                },
-                CoverArtBucket {
-                    file_key: TEST_COVERART_02_FILE_KEY.to_string(),
-                    path: "tests/I/Coverart-2.jpg".to_string(),
-                },
-            ];
-
-            let lab_config = soaricarus_api::util::maze::get_config();
-            let lr = labyrinth::Labyrinth { config: lab_config };
-
-            for coverart in &coverarts {
-                let p = std::path::Path::new(&coverart.path);
-                match tokio::fs::File::open(p).await {
-                    Ok(mut _file) => {
-                        let data = labyrinth::Data {
-                            filepath: coverart.path.clone(),
-                            ..Default::default()
-                        };
-
-                        match lr.upload(&coverart.file_key, &data).await {
-                            Ok(_) => {}
-                            Err(err) => {
-                                assert!(false, "Error: {err:?}");
-                            }
-                        }
-                    }
-                    Err(err) => {
-                        assert!(false, "Error: {err:?}");
-                    }
-                };
-            }
-        }
-
         pub async fn delete_test_songs_from_bucket() {
             let songs = vec![
                 SongBucket {
@@ -679,7 +633,6 @@ mod tests {
             app: &axum::Router,
             song_queue_id: &uuid::Uuid,
         ) -> Result<axum::response::Response, axum::http::Error> {
-            upload_test_coverarts_to_bucket().await;
             match super::request::upload_coverart_queue_req(&app).await {
                 Ok(response) => {
                     let resp = super::util::get_resp_data::<

src/repo/coverart.rs

@@ -7,14 +7,13 @@ pub async fn create(
 ) -> Result<uuid::Uuid, sqlx::Error> {
     let result = sqlx::query(
         r#"
-        INSERT INTO "coverart" (title, directory, filename, file_type, file_key, song_id) VALUES($1, $2, $3, $4, $5, $6) RETURNING id;
+        INSERT INTO "coverart" (title, directory, filename, file_type, song_id) VALUES($1, $2, $3, $4, $5) RETURNING id;
         "#,
     )
     .bind(&coverart.title)
     .bind(&coverart.directory)
     .bind(&coverart.filename)
     .bind(&coverart.file_type)
-    .bind(&coverart.file_key)
     .bind(song_id)
     .fetch_one(pool)
     .await
@@ -40,7 +39,7 @@ pub async fn get_coverart(
 ) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
     let result = sqlx::query(
         r#"
-        SELECT id, title, directory, filename, file_type, file_key, song_id FROM "coverart" WHERE id = $1;
+        SELECT id, title, directory, filename, file_type, song_id FROM "coverart" WHERE id = $1;
         "#,
     )
     .bind(id)
@@ -72,10 +71,6 @@ pub async fn get_coverart(
                 .try_get("file_type")
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap(),
-            file_key: row
-                .try_get("file_key")
-                .map_err(|_e| sqlx::Error::RowNotFound)
-                .unwrap(),
             song_id: row
                 .try_get("song_id")
                 .map_err(|_e| sqlx::Error::RowNotFound)
@@ -92,7 +87,7 @@ pub async fn get_coverart_with_song_id(
 ) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
     let result = sqlx::query(
         r#"
-        SELECT id, title, directory, filename, file_type, file_key, song_id FROM "coverart" WHERE song_id = $1;
+        SELECT id, title, directory, filename, file_type, song_id FROM "coverart" WHERE song_id = $1;
         "#,
     )
     .bind(song_id)
@@ -124,10 +119,6 @@ pub async fn get_coverart_with_song_id(
                 .try_get("file_type")
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap(),
-            file_key: row
-                .try_get("file_key")
-                .map_err(|_e| sqlx::Error::RowNotFound)
-                .unwrap(),
             data: Vec::new(),
             song_id: row
                 .try_get("song_id")
@@ -146,7 +137,7 @@ pub async fn delete_coverart(
         r#"
         DELETE FROM "coverart"
         WHERE id = $1
-        RETURNING id, title, directory, filename, file_type, file_key, song_id
+        RETURNING id, title, directory, filename, file_type, song_id
         "#,
     )
     .bind(id)
@@ -157,43 +148,33 @@ pub async fn delete_coverart(
     });
 
     match result {
-        Ok(row) => parse_row(&row).await,
+        Ok(row) => Ok(simodels::coverart::CoverArt {
+            id: row
+                .try_get("id")
+                .map_err(|_e| sqlx::Error::RowNotFound)
+                .unwrap(),
+            title: row
+                .try_get("title")
+                .map_err(|_e| sqlx::Error::RowNotFound)
+                .unwrap(),
+            directory: row
+                .try_get("directory")
+                .map_err(|_e| sqlx::Error::RowNotFound)
+                .unwrap(),
+            filename: row
+                .try_get("filename")
+                .map_err(|_e| sqlx::Error::RowNotFound)
+                .unwrap(),
+            file_type: row
+                .try_get("file_type")
+                .map_err(|_e| sqlx::Error::RowNotFound)
+                .unwrap(),
+            song_id: row
+                .try_get("song_id")
+                .map_err(|_e| sqlx::Error::RowNotFound)
+                .unwrap(),
+            data: Vec::new(),
+        }),
         Err(_err) => Err(sqlx::Error::RowNotFound),
     }
 }
-
-async fn parse_row(
-    row: &sqlx::postgres::PgRow,
-) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
-    Ok(simodels::coverart::CoverArt {
-        id: row
-            .try_get("id")
-            .map_err(|_e| sqlx::Error::RowNotFound)
-            .unwrap(),
-        title: row
-            .try_get("title")
-            .map_err(|_e| sqlx::Error::RowNotFound)
-            .unwrap(),
-        directory: row
-            .try_get("directory")
-            .map_err(|_e| sqlx::Error::RowNotFound)
-            .unwrap(),
-        filename: row
-            .try_get("filename")
-            .map_err(|_e| sqlx::Error::RowNotFound)
-            .unwrap(),
-        file_type: row
-            .try_get("file_type")
-            .map_err(|_e| sqlx::Error::RowNotFound)
-            .unwrap(),
-        file_key: row
-            .try_get("file_key")
-            .map_err(|_e| sqlx::Error::RowNotFound)
-            .unwrap(),
-        song_id: row
-            .try_get("song_id")
-            .map_err(|_e| sqlx::Error::RowNotFound)
-            .unwrap(),
-        data: Vec::new(),
-    })
-}

test_migrations/20250725213944_init.sql

@@ -72,6 +72,5 @@ CREATE TABLE IF NOT EXISTS "coverart" (
     directory TEXT NOT NULL,
     filename TEXT NOT NULL,
     file_type TEXT NOT NULL,
-    file_key TEXT NOT NULL,
     song_id UUID NOT NULL
 );

test_migrations/20250725214735_song_queue_processed.sql

@@ -2,10 +2,10 @@
 INSERT INTO "song" (id, title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, date_created, filename, directory, file_key, user_id) 
 VALUES('44cf7940-34ff-489f-9124-d0ec90a55af9', 'Hypocrite Like The Rest', 'Kuoth', 'Kuoth', 'I', 'Alternative Hip-Hop', 2020, 1, 1, 9, 1, 139, 'flac', '2020-01-01 13:00:00-05', 'track01.flac', 'tests/I', 'processed/song/track01.flac', '47491f9b-725a-4ba4-b9a5-711e1be46670');
 
-INSERT INTO "coverart" (id, title, directory, filename, file_type, file_key, song_id) 
+INSERT INTO "coverart" (id, title, directory, filename, file_type, song_id) 
-VALUES('996122cd-5ae9-4013-9934-60768d3006ed', 'I', 'tests/I', 'Coverart-1.jpg', 'jpeg', 'processed/coverart/Coverart-1.jpg', '44cf7940-34ff-489f-9124-d0ec90a55af9');
+VALUES('996122cd-5ae9-4013-9934-60768d3006ed', 'I', 'tests/I', 'Coverart-1.jpg', 'jpeg', '44cf7940-34ff-489f-9124-d0ec90a55af9');
 
 INSERT INTO "song" (id, title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, date_created, filename, directory, file_key, user_id) 
 VALUES('94cf7940-34ff-489f-9124-d0ec90a55af4', 'It''s Too Late', 'Kuoth', 'Kuoth', 'I', 'Alternative Hip-Hop', 2020, 2, 1, 9, 1, 116, 'flac', '2020-01-01 13:01:00-05', 'track02.flac', 'tests/I', 'processed/song/track02.flac', '47491f9b-725a-4ba4-b9a5-711e1be46670');
-INSERT INTO "coverart" (id, title, directory, filename, file_type, file_key, song_id) 
+INSERT INTO "coverart" (id, title, directory, filename, file_type, song_id) 
-VALUES('d96122cd-5ae9-4013-9934-60768d3006e9', 'I', 'tests/I', 'Coverart-2.jpg', 'jpeg', 'processed/coverart/Coverart-2.jpg', '94cf7940-34ff-489f-9124-d0ec90a55af4');
+VALUES('d96122cd-5ae9-4013-9934-60768d3006e9', 'I', 'tests/I', 'Coverart-2.jpg', 'jpeg', '94cf7940-34ff-489f-9124-d0ec90a55af4');