Compare commits
2 Commits
v0.2.1-dev
...
v0.2.3-dev
Author | SHA1 | Date | |
---|---|---|---|
111d16515f | |||
47bf24180b |
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -1255,7 +1255,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "songparser"
|
name = "songparser"
|
||||||
version = "0.2.1"
|
version = "0.2.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures",
|
"futures",
|
||||||
"icarus_envy",
|
"icarus_envy",
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "songparser"
|
name = "songparser"
|
||||||
version = "0.2.1"
|
version = "0.2.3"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
rust-version = "1.88"
|
rust-version = "1.88"
|
||||||
|
|
||||||
|
54
src/main.rs
54
src/main.rs
@@ -25,13 +25,26 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
// TODO: Do something with the result later
|
// TODO: Do something with the result later
|
||||||
match some_work(&app_base_url, &song_queue_id).await {
|
match some_work(&app_base_url, &song_queue_id).await {
|
||||||
Ok((
|
Ok((
|
||||||
song,
|
_song,
|
||||||
coverart,
|
_coverart,
|
||||||
(song_queue_id, song_queue_path),
|
(song_queue_id, song_queue_path),
|
||||||
(coverart_queue_id, coverart_queue_path),
|
(coverart_queue_id, coverart_queue_path),
|
||||||
)) => {
|
)) => {
|
||||||
// TODO: Wipe data from song and coverart queues
|
// TODO: Wipe data from song and coverart queues
|
||||||
// TODO: Cleanup files in local filesystem
|
match wipe_data_from_queues(
|
||||||
|
&app_base_url,
|
||||||
|
&song_queue_id,
|
||||||
|
&coverart_queue_id,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(_) => {
|
||||||
|
// TODO: Cleanup files in local filesystem
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
eprintln!("Error: {err:?}");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
eprintln!("Error: {err:?}");
|
eprintln!("Error: {err:?}");
|
||||||
@@ -51,6 +64,41 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn wipe_data_from_queues(
|
||||||
|
app_base_url: &String,
|
||||||
|
song_queue_id: &uuid::Uuid,
|
||||||
|
coverart_queue_id: &uuid::Uuid,
|
||||||
|
) -> Result<(), std::io::Error> {
|
||||||
|
match the_rest::wipe_data::song_queue::wipe_data(app_base_url, song_queue_id).await {
|
||||||
|
Ok(response) => match response
|
||||||
|
.json::<the_rest::wipe_data::song_queue::response::Response>()
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(_resp) => match the_rest::wipe_data::coverart_queue::wipe_data(
|
||||||
|
app_base_url,
|
||||||
|
coverart_queue_id,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(inner_response) => match inner_response
|
||||||
|
.json::<the_rest::wipe_data::coverart_queue::response::Response>()
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(_inner_resp) => {
|
||||||
|
println!("Wiped data from CoverArt queue");
|
||||||
|
println!("Resp: {_inner_resp:?}");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||||
|
},
|
||||||
|
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||||
|
},
|
||||||
|
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||||
|
},
|
||||||
|
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async fn is_queue_empty(
|
async fn is_queue_empty(
|
||||||
api_url: &String,
|
api_url: &String,
|
||||||
) -> Result<(bool, responses::fetch_next_queue_item::SongQueueItem), reqwest::Error> {
|
) -> Result<(bool, responses::fetch_next_queue_item::SongQueueItem), reqwest::Error> {
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
// TODO: Refactor this file when this app is functional
|
// TODO: Refactor this file when this app is functional
|
||||||
|
|
||||||
// TODO: Create song
|
|
||||||
pub mod create_song {
|
pub mod create_song {
|
||||||
pub async fn create(
|
pub async fn create(
|
||||||
base_url: &String,
|
base_url: &String,
|
||||||
@@ -44,7 +43,6 @@ pub mod create_song {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Create coverart
|
|
||||||
pub mod create_coverart {
|
pub mod create_coverart {
|
||||||
|
|
||||||
pub async fn create(
|
pub async fn create(
|
||||||
@@ -76,5 +74,52 @@ pub mod create_coverart {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Wipe data from queued song
|
pub mod wipe_data {
|
||||||
// TODO: Wipe data from queued coverart
|
pub mod song_queue {
|
||||||
|
pub async fn wipe_data(
|
||||||
|
base_url: &String,
|
||||||
|
song_queue_id: &uuid::Uuid,
|
||||||
|
) -> Result<reqwest::Response, reqwest::Error> {
|
||||||
|
let client = reqwest::Client::builder().build()?;
|
||||||
|
let url = format!("{base_url}/api/v2/song/queue/data/wipe");
|
||||||
|
let payload = serde_json::json!({
|
||||||
|
"song_queue_id": song_queue_id
|
||||||
|
});
|
||||||
|
let request = client.patch(url).json(&payload);
|
||||||
|
|
||||||
|
request.send().await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub mod response {
|
||||||
|
#[derive(Debug, serde::Deserialize, serde::Serialize)]
|
||||||
|
pub struct Response {
|
||||||
|
pub message: String,
|
||||||
|
pub data: Vec<uuid::Uuid>,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// TODO: Wipe data from queued coverart
|
||||||
|
pub mod coverart_queue {
|
||||||
|
pub async fn wipe_data(
|
||||||
|
base_url: &String,
|
||||||
|
coverart_queue_id: &uuid::Uuid,
|
||||||
|
) -> Result<reqwest::Response, reqwest::Error> {
|
||||||
|
let client = reqwest::Client::builder().build()?;
|
||||||
|
let url = format!("{base_url}/api/v2/coverart/queue/data/wipe");
|
||||||
|
let payload = serde_json::json!({
|
||||||
|
"coverart_queue_id": coverart_queue_id
|
||||||
|
});
|
||||||
|
let request = client.patch(url).json(&payload);
|
||||||
|
|
||||||
|
request.send().await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub mod response {
|
||||||
|
#[derive(Debug, serde::Deserialize, serde::Serialize)]
|
||||||
|
pub struct Response {
|
||||||
|
pub message: String,
|
||||||
|
pub data: Vec<uuid::Uuid>,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user