Compare commits

...

3 Commits

Author SHA1 Message Date
557264482f Get queued coverart (#25)
All checks were successful
Rust Build / Check (push) Successful in 31s
Rust Build / Test Suite (push) Successful in 35s
Rust Build / Rustfmt (push) Successful in 24s
Rust Build / Clippy (push) Successful in 31s
Rust Build / build (push) Successful in 39s
Release Tagging / release (push) Successful in 43s
Rust Build / Check (pull_request) Successful in 32s
Rust Build / Test Suite (pull_request) Successful in 46s
Rust Build / Rustfmt (pull_request) Successful in 25s
Rust Build / Clippy (pull_request) Successful in 36s
Rust Build / build (pull_request) Successful in 37s
Reviewed-on: #25
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-18 01:07:03 +00:00
4e07ee5d0f Refactoring (#24)
All checks were successful
Release Tagging / release (push) Successful in 30s
Rust Build / Check (push) Successful in 32s
Rust Build / Test Suite (push) Successful in 37s
Rust Build / Rustfmt (push) Successful in 40s
Rust Build / Clippy (push) Successful in 36s
Rust Build / build (push) Successful in 43s
Rust Build / Check (pull_request) Successful in 43s
Rust Build / Test Suite (pull_request) Successful in 35s
Rust Build / Rustfmt (pull_request) Successful in 23s
Rust Build / Clippy (pull_request) Successful in 46s
Rust Build / build (pull_request) Successful in 56s
Reviewed-on: #24
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-14 01:30:49 +00:00
eaa3c6f40e Get Metadata queue (#23)
All checks were successful
Release Tagging / release (push) Successful in 31s
Rust Build / Check (push) Successful in 32s
Rust Build / Test Suite (push) Successful in 35s
Rust Build / Rustfmt (push) Successful in 24s
Rust Build / Clippy (push) Successful in 33s
Rust Build / build (push) Successful in 38s
Rust Build / Check (pull_request) Successful in 32s
Rust Build / Test Suite (pull_request) Successful in 37s
Rust Build / Rustfmt (pull_request) Successful in 25s
Rust Build / Clippy (pull_request) Successful in 34s
Rust Build / build (pull_request) Successful in 39s
Reviewed-on: #23
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-14 00:30:25 +00:00
3 changed files with 192 additions and 53 deletions

1
Cargo.lock generated
View File

@@ -1175,6 +1175,7 @@ dependencies = [
"reqwest", "reqwest",
"serde", "serde",
"serde_json", "serde_json",
"time",
"tokio", "tokio",
"uuid", "uuid",
] ]

View File

@@ -10,6 +10,7 @@ futures = { version = "0.3.31" }
reqwest = { version = "0.12.19", features = ["json", "stream"] } reqwest = { version = "0.12.19", features = ["json", "stream"] }
serde = { version = "1.0.218", features = ["derive"] } serde = { version = "1.0.218", features = ["derive"] }
serde_json = { version = "1.0.139" } serde_json = { version = "1.0.139" }
time = { version = "0.3.41", features = ["macros", "serde"] }
uuid = { version = "1.16.0", features = ["v4", "serde"] } uuid = { version = "1.16.0", features = ["v4", "serde"] }
icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.3" } icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.3" }
icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.2.2-devel-84ea6e4c22-006" } icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.2.2-devel-84ea6e4c22-006" }

View File

@@ -9,42 +9,87 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
loop { loop {
println!("Base URL: {}", app_base_url); println!("Base URL: {}", app_base_url);
match api::fetch_next_queue_item(&app_base_url).await { match is_queue_empty(&app_base_url).await {
Ok((empty, song_queue_item)) => {
if !empty {
println!("Queue is not empty");
println!("SongQueueItem: {:?}", song_queue_item);
let song_queue_id = song_queue_item.data[0].id;
// TODO: Do something with the result later
let _ = process_song(&app_base_url, &song_queue_id).await;
} else {
println!("Queue is empty");
}
}
Err(err) => {
eprintln!("Error checking if queue is empty: {:?}", err);
}
}
println!("Sleeping");
tokio::time::sleep(tokio::time::Duration::from_secs(SECONDS_TO_SLEEP)).await;
}
}
async fn is_queue_empty(
api_url: &String,
) -> Result<(bool, responses::fetch_next_queue_item::SongQueueItem), reqwest::Error> {
match api::fetch_next_queue_item(api_url).await {
Ok(response) => { Ok(response) => {
match response match response
.json::<responses::fetch_next_queue_item::SongQueueItem>() .json::<responses::fetch_next_queue_item::SongQueueItem>()
.await .await
{ {
Ok(song_queue_item) => { Ok(response) => {
if !song_queue_item.data.is_empty() { if response.data.is_empty() {
println!("Song queue item: {:?}", song_queue_item); Ok((true, response))
} else {
Ok((false, response))
}
}
Err(err) => Err(err),
}
}
Err(err) => Err(err),
}
}
println!("Fetching song queue data"); async fn process_song(api_url: &String, song_queue_id: &uuid::Uuid) -> Result<(), reqwest::Error> {
match api::fetch_song_queue_data::get_data( match api::fetch_song_queue_data::get_data(api_url, song_queue_id).await {
&app_base_url,
&song_queue_item.data[0].id,
)
.await
{
Ok(response) => { Ok(response) => {
// Process data here... // Process data here...
let all_bytes = match api::fetch_song_queue_data::response::parse_response(response).await {
api::fetch_song_queue_data::response::parse_response( Ok(all_bytes) => {
response, let (directory, filename) = generate_song_queue_dir_and_filename().await;
) let save_path = save_song_to_fs(&directory, &filename, &all_bytes).await;
.await?;
let (directory, filename) =
generate_song_queue_dir_and_filename().await;
let save_path =
save_song_to_fs(&directory, &filename, &all_bytes).await;
println!("Saved at: {:?}", save_path); println!("Saved at: {:?}", save_path);
// TODO: Get queued song's metadata match api::get_metadata_queue::get(api_url, song_queue_id).await {
// TODO: Get queued coverart Ok(response) => {
match response
.json::<api::get_metadata_queue::response::Response>()
.await
{
Ok(response) => {
let id = &response.data[0].id;
let metadata = &response.data[0].metadata;
let created_at = &response.data[0].created_at;
println!("Id: {:?}", id);
println!("Metadata: {:?}", metadata);
println!("Created at: {:?}", created_at);
println!("Getting coverart queue");
match api::get_coverart_queue::get(api_url, song_queue_id).await
{
Ok(response) => {
match response.json::<api::get_coverart_queue::response::Response>().await {
Ok(response) => {
let coverart_queue_id = &response.data[0].id;
println!("Coverart queue Id: {:?}", coverart_queue_id);
// TODO: Get queued coverart's data // TODO: Get queued coverart's data
// TODO: Apply metadata to the queued song // TODO: Apply metadata to the queued song (modifying file)
// TODO: Update the queued song with the updated queued song // TODO: Update the queued song with the updated queued song
// TODO: Create song // TODO: Create song
// TODO: Create coverart // TODO: Create coverart
@@ -52,23 +97,32 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
// TODO: Wipe data from queued coverart // TODO: Wipe data from queued coverart
} }
Err(err) => { Err(err) => {
eprintln!("Error fetching song queue data: {:?}", err); eprintln!("Error: {:?}", err);
} }
} }
} else {
println!("No data to fetch");
}
} }
Err(err) => { Err(err) => {
eprintln!("Error: {:?}", err); eprintln!("Error: {:?}", err);
} }
} }
Ok(())
} }
Err(e) => eprintln!("API call failed: {}", e), Err(err) => {
eprintln!("Error: {:?}", err);
Err(err)
} }
}
println!("Sleeping"); }
tokio::time::sleep(tokio::time::Duration::from_secs(SECONDS_TO_SLEEP)).await; Err(err) => {
eprintln!("Error: {:?}", err);
Err(err)
}
}
}
Err(err) => Err(err),
}
}
Err(err) => Err(err),
} }
} }
@@ -159,4 +213,87 @@ mod api {
} }
} }
} }
pub mod get_metadata_queue {
pub async fn get(
base_url: &String,
song_queue_id: &uuid::Uuid,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/song/metadata/queue");
let api_url = format!("{}/{}", base_url, endpoint);
client
.get(api_url)
.query(&[("song_queue_id", song_queue_id)])
.send()
.await
}
pub mod response {
use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize)]
pub struct Metadata {
pub id: uuid::Uuid,
pub album: String,
pub album_artist: String,
pub artist: String,
pub disc: i32,
pub disc_count: i32,
pub duration: i64,
pub genre: String,
pub title: String,
pub track: i32,
pub track_count: i32,
pub year: i32,
}
#[derive(Debug, Deserialize, Serialize)]
pub struct QueueItem {
pub id: uuid::Uuid,
pub metadata: Metadata,
#[serde(with = "time::serde::rfc3339")]
pub created_at: time::OffsetDateTime,
pub song_queue_id: uuid::Uuid,
}
#[derive(Debug, Deserialize, Serialize)]
pub struct Response {
pub message: String,
pub data: Vec<QueueItem>,
}
}
}
pub mod get_coverart_queue {
pub async fn get(
base_url: &String,
song_queue_id: &uuid::Uuid,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/coverart/queue");
let api_url = format!("{}/{}", base_url, endpoint);
client
.get(api_url)
.query(&[("song_queue_id", song_queue_id)])
.send()
.await
}
pub mod response {
use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize)]
pub struct CoverArtQueue {
pub id: uuid::Uuid,
pub song_queue_id: uuid::Uuid,
}
#[derive(Debug, Deserialize, Serialize)]
pub struct Response {
pub message: String,
pub data: Vec<CoverArtQueue>,
}
}
}
} }