S3 coverart (#261)
soaricarus_api CI / Check (push) Successful in 6m37s
soaricarus_api CI / Rustfmt (push) Successful in 4m19s
soaricarus_api CI / Clippy (push) Successful in 6m57s
soaricarus_api CI / build (push) Successful in 6m58s
soaricarus_api CI / Test Suite (push) Successful in 3m37s
pr CI / Test Suite (pull_request) Successful in 6m27s

Reviewed-on: http://git.kundeng.us/phoenix/soaricarus_api/pulls/261
This commit was merged in pull request #261.
This commit is contained in:
phoenix committed 2026-08-15 12:30:44 -04:00
1 parent ff3567f8ef
commit 718cdb617d
8 files changed
+340 -284

No files matched your search

+50 -31
View File
@@ -7,13 +7,14 @@ pub async fn create(
) -> Result<uuid::Uuid, sqlx::Error> {
let result = sqlx::query(
r#"
INSERT INTO "coverart" (title, directory, filename, file_type, song_id) VALUES($1, $2, $3, $4, $5) RETURNING id;
INSERT INTO "coverart" (title, directory, filename, file_type, file_key, song_id) VALUES($1, $2, $3, $4, $5, $6) 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
@@ -39,7 +40,7 @@ pub async fn get_coverart(
) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
let result = sqlx::query(
r#"
SELECT id, title, directory, filename, file_type, song_id FROM "coverart" WHERE id = $1;
SELECT id, title, directory, filename, file_type, file_key, song_id FROM "coverart" WHERE id = $1;
"#,
)
.bind(id)
@@ -71,6 +72,10 @@ 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)
@@ -87,7 +92,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, song_id FROM "coverart" WHERE song_id = $1;
SELECT id, title, directory, filename, file_type, file_key, song_id FROM "coverart" WHERE song_id = $1;
"#,
)
.bind(song_id)
@@ -119,6 +124,10 @@ 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")
@@ -137,7 +146,7 @@ pub async fn delete_coverart(
r#"
DELETE FROM "coverart"
WHERE id = $1
RETURNING id, title, directory, filename, file_type, song_id
RETURNING id, title, directory, filename, file_type, file_key, song_id
"#,
)
.bind(id)
@@ -148,33 +157,43 @@ pub async fn delete_coverart(
});
match result {
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(),
}),
Ok(row) => parse_row(&row).await,
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(),
})
}