Compare commits

...

3 Commits

Author SHA1 Message Date
29b806fd02 Get queued coverart data (#26)
All checks were successful
Release Tagging / release (push) Successful in 28s
Rust Build / Check (push) Successful in 31s
Rust Build / Test Suite (push) Successful in 33s
Rust Build / Rustfmt (push) Successful in 24s
Rust Build / Clippy (push) Successful in 31s
Rust Build / build (push) Successful in 37s
Rust Build / Check (pull_request) Successful in 32s
Rust Build / Test Suite (pull_request) Successful in 32s
Rust Build / Rustfmt (pull_request) Successful in 23s
Rust Build / Clippy (pull_request) Successful in 31s
Rust Build / build (pull_request) Successful in 37s
Reviewed-on: #26
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-19 00:54:13 +00:00
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
3 changed files with 200 additions and 81 deletions

1
Cargo.lock generated
View File

@@ -1172,6 +1172,7 @@ dependencies = [
"futures", "futures",
"icarus_envy", "icarus_envy",
"icarus_models", "icarus_models",
"rand",
"reqwest", "reqwest",
"serde", "serde",
"serde_json", "serde_json",

View File

@@ -12,5 +12,6 @@ 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"] } time = { version = "0.3.41", features = ["macros", "serde"] }
uuid = { version = "1.16.0", features = ["v4", "serde"] } uuid = { version = "1.16.0", features = ["v4", "serde"] }
rand = { version = "0.9" }
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,62 +9,109 @@ 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(response) => { Ok((empty, song_queue_item)) => {
match response if !empty {
.json::<responses::fetch_next_queue_item::SongQueueItem>() println!("Queue is not empty");
.await println!("SongQueueItem: {:?}", song_queue_item);
{ let song_queue_id = song_queue_item.data[0].id;
Ok(song_queue_item) => {
if !song_queue_item.data.is_empty() {
println!("Song queue item: {:?}", song_queue_item);
let song_queue_id = song_queue_item.data[0].id;
println!("Fetching song queue data"); // TODO: Do something with the result later
match api::fetch_song_queue_data::get_data( let _ = process_song(&app_base_url, &song_queue_id).await;
&app_base_url, } else {
&song_queue_id, println!("Queue is empty");
) }
.await }
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) => {
match response
.json::<responses::fetch_next_queue_item::SongQueueItem>()
.await
{
Ok(response) => {
if response.data.is_empty() {
Ok((true, response))
} else {
Ok((false, response))
}
}
Err(err) => Err(err),
}
}
Err(err) => Err(err),
}
}
async fn process_song(api_url: &String, song_queue_id: &uuid::Uuid) -> Result<(), reqwest::Error> {
match api::fetch_song_queue_data::get_data(api_url, song_queue_id).await {
Ok(response) => {
// Process data here...
match api::parsing::parse_response_into_bytes(response).await {
Ok(song_bytes) => {
let (directory, filename) = generate_song_queue_dir_and_filename().await;
let save_path = save_file_to_fs(&directory, &filename, &song_bytes).await;
println!("Saved at: {:?}", save_path);
match api::get_metadata_queue::get(api_url, song_queue_id).await {
Ok(response) => {
match response
.json::<api::get_metadata_queue::response::Response>()
.await
{ {
Ok(response) => { Ok(response) => {
// Process data here... let id = &response.data[0].id;
let all_bytes = let metadata = &response.data[0].metadata;
api::fetch_song_queue_data::response::parse_response( let created_at = &response.data[0].created_at;
response, println!("Id: {:?}", id);
) println!("Metadata: {:?}", metadata);
.await?; println!("Created at: {:?}", created_at);
let (directory, filename) = println!("Getting coverart queue");
generate_song_queue_dir_and_filename().await; match api::get_coverart_queue::get(api_url, song_queue_id).await
let save_path =
save_song_to_fs(&directory, &filename, &all_bytes).await;
println!("Saved at: {:?}", save_path);
match api::get_metadata_queue::get(
&app_base_url,
&song_queue_id,
)
.await
{ {
Ok(response) => { Ok(response) => {
match response.json::<api::get_metadata_queue::response::Response>().await { match response.json::<api::get_coverart_queue::response::Response>().await {
Ok(response) => { Ok(response) => {
let id = &response.data[0].id; let coverart_queue_id = &response.data[0].id;
let metadata = &response.data[0].metadata; println!("Coverart queue Id: {:?}", coverart_queue_id);
let created_at = &response.data[0].created_at;
println!("Id: {:?}", id); match api::get_coverart_queue::get_data(api_url, coverart_queue_id).await {
println!("Metadata: {:?}", metadata); Ok(response) => match api::parsing::parse_response_into_bytes(response).await {
println!("Created at: {:?}", created_at); Ok(coverart_queue_bytes) => {
// TODO: Get queued coverart let (directory, filename) = generate_coverart_queue_dir_and_filename().await;
// TODO: Get queued coverart's data let save_path = save_file_to_fs(&directory, &filename, &coverart_queue_bytes).await;
// TODO: Apply metadata to the queued song (modifying file)
// TODO: Update the queued song with the updated queued song println!("Saved coverart queue file at: {:?}", save_path);
// TODO: Create song
// TODO: Create coverart // TODO: Apply metadata to the queued song (modifying file)
// TODO: Wipe data from queued song // TODO: Update the queued song with the updated queued song
// TODO: Wipe data from queued coverart // TODO: Create song
// TODO: Create coverart
// TODO: Wipe data from queued song
// TODO: Wipe data from queued coverart
}
Err(err) => {
eprintln!("Error: {:?}", err);
}
}
Err(err) => {
eprintln!("Error: {:?}", err);
}
}
} }
Err(err) => { Err(err) => {
eprintln!("Error: {:?}", err); eprintln!("Error: {:?}", err);
@@ -75,25 +122,24 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
eprintln!("Error: {:?}", err); eprintln!("Error: {:?}", err);
} }
} }
Ok(())
} }
Err(err) => { Err(err) => {
eprintln!("Error fetching song queue data: {:?}", err); eprintln!("Error: {:?}", err);
Err(err)
} }
} }
} else { }
println!("No data to fetch"); Err(err) => {
eprintln!("Error: {:?}", err);
Err(err)
} }
} }
Err(err) => {
eprintln!("Error: {:?}", err);
}
} }
Err(err) => Err(err),
} }
Err(e) => eprintln!("API call failed: {}", e),
} }
Err(err) => Err(err),
println!("Sleeping");
tokio::time::sleep(tokio::time::Duration::from_secs(SECONDS_TO_SLEEP)).await;
} }
} }
@@ -107,8 +153,37 @@ pub async fn generate_song_queue_dir_and_filename() -> (String, String) {
(song.directory, song.filename) (song.directory, song.filename)
} }
// TODO: Consider having something like this in icarus_models
pub async fn generate_coverart_queue_dir_and_filename() -> (String, String) {
use rand::Rng;
let mut filename: String = String::new();
let filename_len = 10;
let some_chars: String = String::from("abcdefghij0123456789");
let mut rng = rand::rng();
for _i in 0..filename_len {
let random_number: i32 = rng.random_range(0..=19);
let index = random_number as usize;
let rando_char = some_chars.chars().nth(index);
if let Some(c) = rando_char {
filename.push(c);
}
}
// TODO: Do not hard code the file extension
filename += ".jpeg";
// TODO: Consider separating song and coverart when saving to the filesystem
let directory = icarus_envy::environment::get_root_directory().await;
(directory, filename)
}
// TODO: Check to see if this is available in icarus_models // TODO: Check to see if this is available in icarus_models
pub async fn save_song_to_fs( pub async fn save_file_to_fs(
directory: &String, directory: &String,
filename: &String, filename: &String,
data: &[u8], data: &[u8],
@@ -153,6 +228,26 @@ mod api {
client.get(api_url).send().await client.get(api_url).send().await
} }
pub mod parsing {
use futures::StreamExt;
pub async fn parse_response_into_bytes(
response: reqwest::Response,
) -> Result<Vec<u8>, reqwest::Error> {
// TODO: At some point, handle the flow if the size is small or
// large
let mut byte_stream = response.bytes_stream();
let mut all_bytes = Vec::new();
while let Some(chunk) = byte_stream.next().await {
let chunk = chunk?;
all_bytes.extend_from_slice(&chunk);
}
Ok(all_bytes)
}
}
pub mod fetch_song_queue_data { pub mod fetch_song_queue_data {
pub async fn get_data( pub async fn get_data(
base_url: &String, base_url: &String,
@@ -163,26 +258,6 @@ mod api {
let api_url = format!("{}/{}/{}", base_url, endpoint, id); let api_url = format!("{}/{}/{}", base_url, endpoint, id);
client.get(api_url).send().await client.get(api_url).send().await
} }
pub mod response {
use futures::StreamExt;
pub async fn parse_response(
response: reqwest::Response,
) -> Result<Vec<u8>, reqwest::Error> {
// TODO: At some point, handle the flow if the size is small or
// large
let mut byte_stream = response.bytes_stream();
let mut all_bytes = Vec::new();
while let Some(chunk) = byte_stream.next().await {
let chunk = chunk?;
all_bytes.extend_from_slice(&chunk);
}
Ok(all_bytes)
}
}
} }
pub mod get_metadata_queue { pub mod get_metadata_queue {
@@ -205,7 +280,7 @@ mod api {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
pub struct Metadata { pub struct Metadata {
pub id: uuid::Uuid, pub song_queue_id: uuid::Uuid,
pub album: String, pub album: String,
pub album_artist: String, pub album_artist: String,
pub artist: String, pub artist: String,
@@ -235,4 +310,46 @@ mod api {
} }
} }
} }
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 async fn get_data(
base_url: &String,
coverart_queue_id: &uuid::Uuid,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/coverart/queue/data");
let api_url = format!("{}/{}/{}", base_url, endpoint, coverart_queue_id);
client.get(api_url).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>,
}
}
}
} }