phoenix/songparser
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 38 Wiki Activity

tsk-41: Refactored code to prepare for auth implementation

Browse Source
This commit is contained in:
phoenix
2025-08-12 18:40:11 -04:00
parent ce2e4feb02
commit 3ea008868a
5 changed files with 93 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/api.rs
View File

@@ -1,7 +1,7 @@
pub async fn fetch_next_queue_item(base_url: &String) -> Result<reqwest::Response, reqwest::Error> {
pub async fn fetch_next_queue_item(app: &crate::config::App) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::new();
let fetch_endpoint = String::from("api/v2/song/queue/next");
let api_url = format!("{base_url}/{fetch_endpoint}");
let api_url = format!("{}/{fetch_endpoint}", app.uri);
client.get(api_url).send().await
}
@@ -27,24 +27,26 @@ pub mod parsing {
pub mod fetch_song_queue_data {
pub async fn get_data(
base_url: &String,
// base_url: &String,
app: &crate::config::App,
id: &uuid::Uuid,
) -> Result<reqwest::Response, reqwest::Error> {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/song/queue");
let api_url = format!("{base_url}/{endpoint}/{id}");
let api_url = format!("{}/{endpoint}/{id}", app.uri);
client.get(api_url).send().await
}
}
pub mod get_metadata_queue {
pub async fn get(
base_url: &String,
// base_url: &String,
app: &crate::config::App,
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}");
let api_url = format!("{}/{endpoint}", app.uri);
client
.get(api_url)
.query(&[("song_queue_id", song_queue_id)])
@@ -90,12 +92,13 @@ pub mod get_metadata_queue {
pub mod get_coverart_queue {
pub async fn get(
base_url: &String,
// base_url: &String,
app: &crate::config::App,
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}");
let api_url = format!("{}/{endpoint}", app.uri);
client
.get(api_url)
.query(&[("song_queue_id", song_queue_id)])
@@ -104,12 +107,13 @@ pub mod get_coverart_queue {
}
pub async fn get_data(
base_url: &String,
// base_url: &String,
app: &crate::config::App,
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}");
let api_url = format!("{}/{endpoint}/{coverart_queue_id}", app.uri);
client.get(api_url).send().await
}