Coverart queue (#259)
pr CI / Test Suite (pull_request) Failing after 2m42s
soaricarus_api CI / Check (push) Successful in 7m15s
soaricarus_api CI / Rustfmt (push) Successful in 5m25s
soaricarus_api CI / Clippy (push) Failing after 7m1s
soaricarus_api CI / build (push) Successful in 7m47s
soaricarus_api CI / Test Suite (push) Failing after 2m24s
pr CI / Test Suite (pull_request) Failing after 2m42s
soaricarus_api CI / Check (push) Successful in 7m15s
soaricarus_api CI / Rustfmt (push) Successful in 5m25s
soaricarus_api CI / Clippy (push) Failing after 7m1s
soaricarus_api CI / build (push) Successful in 7m47s
soaricarus_api CI / Test Suite (push) Failing after 2m24s
Reviewed-on: #259
This commit was merged in pull request #259.
This commit is contained in:
@@ -1,16 +1,11 @@
|
||||
use sqlx::Row;
|
||||
|
||||
pub async fn insert(
|
||||
pool: &sqlx::PgPool,
|
||||
data: &Vec<u8>,
|
||||
file_type: &str,
|
||||
) -> Result<uuid::Uuid, sqlx::Error> {
|
||||
pub async fn insert(pool: &sqlx::PgPool, file_type: &str) -> Result<uuid::Uuid, sqlx::Error> {
|
||||
let result = sqlx::query(
|
||||
r#"
|
||||
INSERT INTO "coverartQueue" (data, file_type) VALUES($1, $2) RETURNING id;
|
||||
INSERT INTO "coverartQueue" (file_type) VALUES($1) RETURNING id;
|
||||
"#,
|
||||
)
|
||||
.bind(data)
|
||||
.bind(file_type)
|
||||
.fetch_one(pool)
|
||||
.await
|
||||
@@ -120,78 +115,3 @@ pub async fn get_coverart_queue_with_song_queue_id(
|
||||
Err(_) => Err(sqlx::Error::RowNotFound),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get_coverart_queue_data_with_id(
|
||||
pool: &sqlx::PgPool,
|
||||
id: &uuid::Uuid,
|
||||
) -> Result<Vec<u8>, sqlx::Error> {
|
||||
let result = sqlx::query(
|
||||
r#"
|
||||
SELECT data FROM "coverartQueue" WHERE id = $1;
|
||||
"#,
|
||||
)
|
||||
.bind(id)
|
||||
.fetch_one(pool)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
eprintln!("Error querying data: {e:?}");
|
||||
});
|
||||
|
||||
match result {
|
||||
Ok(row) => Ok(row
|
||||
.try_get("data")
|
||||
.map_err(|_e| sqlx::Error::RowNotFound)
|
||||
.unwrap()),
|
||||
Err(_) => Err(sqlx::Error::RowNotFound),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get_coverart_queue_data_with_song_queue_id(
|
||||
pool: &sqlx::PgPool,
|
||||
song_queue_id: &uuid::Uuid,
|
||||
) -> Result<Vec<u8>, sqlx::Error> {
|
||||
let result = sqlx::query(
|
||||
r#"
|
||||
SELECT data FROM "coverartQueue" WHERE song_queue_id = $1;
|
||||
"#,
|
||||
)
|
||||
.bind(song_queue_id)
|
||||
.fetch_one(pool)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
eprintln!("Error querying data: {e}");
|
||||
});
|
||||
|
||||
match result {
|
||||
Ok(row) => Ok(row
|
||||
.try_get("data")
|
||||
.map_err(|_e| sqlx::Error::RowNotFound)
|
||||
.unwrap()),
|
||||
Err(_) => Err(sqlx::Error::RowNotFound),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn wipe_data(
|
||||
pool: &sqlx::PgPool,
|
||||
coverart_queue_id: &uuid::Uuid,
|
||||
) -> Result<uuid::Uuid, sqlx::Error> {
|
||||
let result = sqlx::query(
|
||||
r#"
|
||||
UPDATE "coverartQueue" SET data = NULL WHERE id = $1 RETURNING id;
|
||||
"#,
|
||||
)
|
||||
.bind(coverart_queue_id)
|
||||
.fetch_one(pool)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
eprintln!("Error updating query: {e}");
|
||||
});
|
||||
|
||||
match result {
|
||||
Ok(row) => Ok(row
|
||||
.try_get("id")
|
||||
.map_err(|_e| sqlx::Error::RowNotFound)
|
||||
.unwrap()),
|
||||
Err(_) => Err(sqlx::Error::RowNotFound),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,3 +96,109 @@ pub async fn get_with_song_queue_id(
|
||||
Err(err) => Err(err),
|
||||
}
|
||||
}
|
||||
|
||||
pub mod queue {
|
||||
pub mod coverart {
|
||||
use sqlx::Row;
|
||||
|
||||
pub async fn insert(
|
||||
pool: &sqlx::PgPool,
|
||||
file_key: &str,
|
||||
bucket: &str,
|
||||
region: &str,
|
||||
coverart_queue_id: &uuid::Uuid,
|
||||
) -> Result<uuid::Uuid, sqlx::Error> {
|
||||
match sqlx::query(
|
||||
r#"
|
||||
INSERT INTO "coverartQueueData" (file_key, bucket, region, coverart_queue_id)
|
||||
VALUES($1, $2, $3, $4) RETURNING id;
|
||||
"#,
|
||||
)
|
||||
.bind(file_key)
|
||||
.bind(bucket)
|
||||
.bind(region)
|
||||
.bind(coverart_queue_id)
|
||||
.fetch_one(pool)
|
||||
.await
|
||||
{
|
||||
Ok(row) => {
|
||||
let id: uuid::Uuid = row.try_get("id")?;
|
||||
Ok(id)
|
||||
}
|
||||
Err(_err) => Err(sqlx::Error::RowNotFound),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn update_file_key(
|
||||
pool: &sqlx::PgPool,
|
||||
id: &uuid::Uuid,
|
||||
file_key: &str,
|
||||
) -> Result<(), sqlx::Error> {
|
||||
match sqlx::query(
|
||||
r#"
|
||||
UPDATE "coverartQueueData" SET file_key = $1 WHERE id = $2;
|
||||
"#,
|
||||
)
|
||||
.bind(file_key)
|
||||
.bind(id)
|
||||
.execute(pool)
|
||||
.await
|
||||
{
|
||||
Ok(_row) => Ok(()),
|
||||
Err(_) => Err(sqlx::Error::RowNotFound),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get(
|
||||
pool: &sqlx::PgPool,
|
||||
id: &uuid::Uuid,
|
||||
) -> Result<(uuid::Uuid, String, String, String, uuid::Uuid), sqlx::Error> {
|
||||
match sqlx::query(
|
||||
r#"
|
||||
SELECT id, file_key, bucket, region, coverart_queue_id FROM "coverartQueueData"
|
||||
WHERE id = $1
|
||||
"#,
|
||||
)
|
||||
.bind(id)
|
||||
.fetch_one(pool)
|
||||
.await
|
||||
{
|
||||
Ok(row) => {
|
||||
let file_key: String = row.try_get("file_key")?;
|
||||
let bucket: String = row.try_get("bucket")?;
|
||||
let region: String = row.try_get("region")?;
|
||||
let coverart_queue_id: uuid::Uuid = row.try_get("coverart_queue_id")?;
|
||||
|
||||
Ok((*id, file_key, bucket, region, coverart_queue_id))
|
||||
}
|
||||
Err(err) => Err(err),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get_with_coverart_queue_id(
|
||||
pool: &sqlx::PgPool,
|
||||
coverart_queue_id: &uuid::Uuid,
|
||||
) -> Result<(uuid::Uuid, String, String, String, uuid::Uuid), sqlx::Error> {
|
||||
match sqlx::query(
|
||||
r#"
|
||||
SELECT id, file_key, bucket, region, coverart_queue_id FROM "coverartQueueData"
|
||||
WHERE coverart_queue_id = $1
|
||||
"#,
|
||||
)
|
||||
.bind(coverart_queue_id)
|
||||
.fetch_one(pool)
|
||||
.await
|
||||
{
|
||||
Ok(row) => {
|
||||
let id: uuid::Uuid = row.try_get("id")?;
|
||||
let file_key: String = row.try_get("file_key")?;
|
||||
let bucket: String = row.try_get("bucket")?;
|
||||
let region: String = row.try_get("region")?;
|
||||
|
||||
Ok((id, file_key, bucket, region, *coverart_queue_id))
|
||||
}
|
||||
Err(err) => Err(err),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user