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
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:
1 parent
ff3567f8ef
commit
718cdb617d
8 files changed
+340
-284
No files matched your search
+17
-31
@@ -99,7 +99,7 @@ pub mod endpoint {
|
||||
raw_data: data,
|
||||
..Default::default()
|
||||
};
|
||||
let new_file_key = format!("processed/song/{filename}");
|
||||
let new_file_key = format!("processed/coverart/{filename}");
|
||||
|
||||
match lr.upload(&new_file_key, &data).await {
|
||||
Ok(_resp) => {
|
||||
@@ -127,41 +127,24 @@ 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 coverart.save_to_filesystem() {
|
||||
Ok(_) => {
|
||||
match repo::coverart::create(
|
||||
&pool,
|
||||
&coverart,
|
||||
&payload.song_id,
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(id) => {
|
||||
coverart.song_id = payload.song_id;
|
||||
coverart.id = id;
|
||||
println!("Cover Art created");
|
||||
match repo::coverart::create(&pool, &coverart, &payload.song_id)
|
||||
.await
|
||||
{
|
||||
Ok(id) => {
|
||||
coverart.song_id = payload.song_id;
|
||||
coverart.id = id;
|
||||
println!("Cover Art created");
|
||||
|
||||
response.message = String::from("Successful");
|
||||
response.data.push(coverart);
|
||||
response.message = String::from("Successful");
|
||||
response.data.push(coverart);
|
||||
|
||||
(axum::http::StatusCode::OK, axum::Json(response))
|
||||
}
|
||||
Err(err) => {
|
||||
response.message = err.to_string();
|
||||
(
|
||||
axum::http::StatusCode::BAD_REQUEST,
|
||||
axum::Json(response),
|
||||
)
|
||||
}
|
||||
}
|
||||
(axum::http::StatusCode::OK, axum::Json(response))
|
||||
}
|
||||
Err(err) => {
|
||||
response.message = err.to_string();
|
||||
(
|
||||
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
|
||||
axum::Json(response),
|
||||
)
|
||||
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -249,8 +232,11 @@ 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 simodels::coverart::io::to_data(&coverart) {
|
||||
Ok(coverart) => match lr.download(&coverart.file_key).await {
|
||||
Ok(data) => {
|
||||
let (file_type, img_type) =
|
||||
match simeta::detection::coverart::file_type_from_data(&data) {
|
||||
|
||||
Reference in new issue
Block a user