phoenix/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

tsk-194: Moving metadata module

Browse Source
This commit is contained in:
kdeng00
2025-10-27 13:03:42 -04:00
parent 8b36bc8c49
commit e9193c0375
3 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/callers/mod.rs
-3
View File
@@ -1,11 +1,8 @@
pub mod coverart;
pub mod metadata;
pub mod queue;
pub mod song;
pub mod endpoints {
pub const QUEUEMETADATA: &str = "/api/v2/song/metadata/queue";
pub const CREATESONG: &str = "/api/v2/song";
pub const GETSONGS: &str = "/api/v2/song";
pub const GETALLSONGS: &str = "/api/v2/song/all";
src/callers/metadata.rs → src/callers/queue/metadata.rs
+14 -23
View File
@@ -1,9 +1,6 @@
// TODO: Explicitly make this module target queueing a song's metadata
pub mod request {
pub mod queue_metadata {
use serde::{Deserialize, Serialize};
#[derive(Debug, Default, Deserialize, Serialize, sqlx::FromRow, utoipa::ToSchema)]
#[derive(Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema)]
pub struct Request {
pub song_queue_id: uuid::Uuid,
pub album: String,
@@ -59,9 +56,7 @@ pub mod request {
pub mod response {
pub mod queue_metadata {
use serde::{Deserialize, Serialize};
#[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
#[derive(Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
pub struct Response {
pub message: String,
pub data: Vec<uuid::Uuid>,
@@ -69,9 +64,7 @@ pub mod response {
}
pub mod fetch_metadata {
use serde::{Deserialize, Serialize};
#[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
#[derive(Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
pub struct Response {
pub message: String,
pub data: Vec<crate::repo::queue::metadata::MetadataQueue>,
@@ -81,8 +74,6 @@ pub mod response {
/// Module for metadata related endpoints
pub mod endpoint {
use axum::{Json, http::StatusCode};
use crate::repo::queue as repo_queue;
/// Endpoint to create queued metadata
@@ -101,8 +92,8 @@ pub mod endpoint {
)]
pub async fn queue_metadata(
axum::Extension(pool): axum::Extension<sqlx::PgPool>,
Json(payload): Json<super::request::queue_metadata::Request>,
) -> (StatusCode, Json<super::response::queue_metadata::Response>) {
axum::Json(payload): axum::Json<super::request::queue_metadata::Request>,
) -> (axum::http::StatusCode, axum::Json<super::response::queue_metadata::Response>) {
let mut results: Vec<uuid::Uuid> = Vec::new();
let mut response = super::response::queue_metadata::Response::default();
let meta = payload.to_json_value().await;
@@ -113,14 +104,14 @@ pub mod endpoint {
response.message = if response.data.is_empty() {
String::from("Error")
} else {
String::from(super::super::response::SUCCESSFUL)
String::from(super::super::super::response::SUCCESSFUL)
};
(StatusCode::OK, Json(response))
(axum::http::StatusCode::OK, axum::Json(response))
}
Err(err) => {
response.message = err.to_string();
(StatusCode::BAD_REQUEST, Json(response))
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
}
}
}
@@ -141,7 +132,7 @@ pub mod endpoint {
pub async fn fetch_metadata(
axum::Extension(pool): axum::Extension<sqlx::PgPool>,
axum::extract::Query(params): axum::extract::Query<super::request::fetch_metadata::Params>,
) -> (StatusCode, Json<super::response::fetch_metadata::Response>) {
) -> (axum::http::StatusCode, axum::Json<super::response::fetch_metadata::Response>) {
let mut response = super::response::fetch_metadata::Response::default();
match params.id {
@@ -152,11 +143,11 @@ pub mod endpoint {
Ok(item) => {
response.message = String::from("Successful");
response.data.push(item);
(StatusCode::OK, Json(response))
(axum::http::StatusCode::OK, axum::Json(response))
}
Err(err) => {
response.message = err.to_string();
(StatusCode::BAD_REQUEST, Json(response))
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
}
}
}
@@ -168,17 +159,17 @@ pub mod endpoint {
Ok(item) => {
response.message = String::from("Successful");
response.data.push(item);
(StatusCode::OK, Json(response))
(axum::http::StatusCode::OK, axum::Json(response))
}
Err(err) => {
response.message = err.to_string();
(StatusCode::BAD_REQUEST, Json(response))
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
}
}
}
None => {
println!("What is going on?");
(StatusCode::BAD_REQUEST, Json(response))
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
}
},
}
src/callers/queue/mod.rs
+2
View File
@@ -1,4 +1,5 @@
pub mod coverart;
pub mod metadata;
pub mod song;
pub mod endpoints {
@@ -7,6 +8,7 @@ pub mod endpoints {
pub const QUEUESONGDATA: &str = "/api/v2/song/queue/{id}";
pub const QUEUESONGUPDATE: &str = "/api/v2/song/queue/{id}";
pub const NEXTQUEUESONG: &str = "/api/v2/song/queue/next";
pub const QUEUEMETADATA: &str = "/api/v2/song/metadata/queue";
pub const QUEUECOVERART: &str = "/api/v2/coverart/queue";
pub const QUEUECOVERARTDATA: &str = "/api/v2/coverart/queue/data/{id}";
pub const QUEUECOVERARTLINK: &str = "/api/v2/coverart/queue/link";