diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs index 0c68afe..89f7f7e 100644 --- a/src/callers/coverart.rs +++ b/src/callers/coverart.rs @@ -764,7 +764,7 @@ pub mod endpoint { match super::db::get_coverart_queue_data_with_id(&pool, &id).await { Ok(data) => { let song_id = payload.song_id; - match crate::callers::song::song_db::get_song(&pool, &song_id).await { + match crate::repo::song::get_song(&pool, &song_id).await { Ok(song) => { let directory = icarus_envy::environment::get_root_directory().await.value; // TODO: Make this random and the file extension should not be hard coded diff --git a/src/callers/song.rs b/src/callers/song.rs index 2301517..68e3b55 100644 --- a/src/callers/song.rs +++ b/src/callers/song.rs @@ -213,357 +213,6 @@ pub mod status { } } -pub mod song_db { - use sqlx::Row; - - // TODO: Change first parameter of return value from string to a time type - pub async fn insert( - pool: &sqlx::PgPool, - song: &icarus_models::song::Song, - ) -> Result<(time::OffsetDateTime, uuid::Uuid), sqlx::Error> { - let result = sqlx::query( - r#" - INSERT INTO "song" (title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, filename, directory, user_id) - VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15) RETURNING date_created, id; - "# - ) - .bind(&song.title) - .bind(&song.artist) - .bind(&song.album_artist) - .bind(&song.album) - .bind(&song.genre) - .bind(song.year) - .bind(song.track) - .bind(song.disc) - .bind(song.track_count) - .bind(song.disc_count) - .bind(song.duration) - .bind(&song.audio_type) - .bind(&song.filename) - .bind(&song.directory) - .bind(song.user_id) - .fetch_one(pool) - .await - .map_err(|e| { - eprintln!("Error inserting query: {e}"); - }); - - match result { - Ok(row) => { - let id: uuid::Uuid = row - .try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(); - let date_created_time: time::OffsetDateTime = row - .try_get("date_created") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(); - let date_created = date_created_time; - - Ok((date_created, id)) - } - Err(_) => Err(sqlx::Error::RowNotFound), - } - } - - pub async fn get_song( - pool: &sqlx::PgPool, - id: &uuid::Uuid, - ) -> Result { - let result = sqlx::query( - r#" - SELECT * FROM "song" WHERE id = $1 - "#, - ) - .bind(id) - .fetch_one(pool) - .await - .map_err(|e| { - eprintln!("Error querying data: {e}"); - }); - - match result { - Ok(row) => { - let date_created_time: time::OffsetDateTime = row - .try_get("date_created") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(); - - Ok(icarus_models::song::Song { - id: row - .try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - title: row - .try_get("title") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - artist: row - .try_get("artist") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - album_artist: row - .try_get("album_artist") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - album: row - .try_get("album") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - genre: row - .try_get("genre") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - year: row - .try_get("year") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - track: row - .try_get("track") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - disc: row - .try_get("disc") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - track_count: row - .try_get("track_count") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - disc_count: row - .try_get("disc_count") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - duration: row - .try_get("duration") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - audio_type: row - .try_get("audio_type") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - filename: row - .try_get("filename") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - directory: row - .try_get("directory") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - date_created: Some(date_created_time), - user_id: row - .try_get("user_id") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - data: Vec::new(), - }) - } - Err(_) => Err(sqlx::Error::RowNotFound), - } - } - - pub async fn get_all_songs( - pool: &sqlx::PgPool, - ) -> Result, sqlx::Error> { - let result = sqlx::query( - r#" - SELECT * FROM "song"; - "#, - ) - .fetch_all(pool) - .await - .map_err(|e| { - eprintln!("Error querying data: {e:?}"); - }); - - match result { - Ok(rows) => { - let mut songs: Vec = Vec::new(); - - for row in rows { - let date_created_time: time::OffsetDateTime = row - .try_get("date_created") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(); - - let song = icarus_models::song::Song { - id: row - .try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - title: row - .try_get("title") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - artist: row - .try_get("artist") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - album_artist: row - .try_get("album_artist") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - album: row - .try_get("album") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - genre: row - .try_get("genre") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - year: row - .try_get("year") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - track: row - .try_get("track") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - disc: row - .try_get("disc") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - track_count: row - .try_get("track_count") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - disc_count: row - .try_get("disc_count") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - duration: row - .try_get("duration") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - audio_type: row - .try_get("audio_type") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - filename: row - .try_get("filename") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - directory: row - .try_get("directory") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - date_created: Some(date_created_time), - user_id: row - .try_get("user_id") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - data: Vec::new(), - }; - - songs.push(song); - } - - Ok(songs) - } - Err(_err) => Err(sqlx::Error::RowNotFound), - } - } - - pub async fn delete_song( - pool: &sqlx::PgPool, - id: &uuid::Uuid, - ) -> Result { - let result = sqlx::query( - // icarus_models::song::Song, - r#" - DELETE FROM "song" - WHERE id = $1 - RETURNING id, title, artist, album, album_artist, genre, year, disc, track, track_count, disc_count, duration, audio_type, date_created, filename, directory, user_id - "#, - ) - .bind(id) - .fetch_one(pool) - .await - .map_err(|e| { - eprintln!("Error deleting data: {e:?}") - }); - - match result { - Ok(row) => { - let date_created_time: time::OffsetDateTime = row - .try_get("date_created") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(); - - Ok(icarus_models::song::Song { - id: row - .try_get("id") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - title: row - .try_get("title") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - artist: row - .try_get("artist") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - album_artist: row - .try_get("album_artist") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - album: row - .try_get("album") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - genre: row - .try_get("genre") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - year: row - .try_get("year") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - track: row - .try_get("track") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - disc: row - .try_get("disc") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - track_count: row - .try_get("track_count") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - disc_count: row - .try_get("disc_count") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - duration: row - .try_get("duration") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - audio_type: row - .try_get("audio_type") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - filename: row - .try_get("filename") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - directory: row - .try_get("directory") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - date_created: Some(date_created_time), - user_id: row - .try_get("user_id") - .map_err(|_e| sqlx::Error::RowNotFound) - .unwrap(), - data: Vec::new(), - }) - } - Err(_) => Err(sqlx::Error::RowNotFound), - } - } -} - mod song_queue { use sqlx::Row; @@ -866,6 +515,7 @@ pub mod endpoint { use axum::{Json, http::StatusCode, response::IntoResponse}; use crate::callers::song::song_queue; + use crate::repo; /// Endpoint to queue a song. Starts the process and places the song in a queue #[utoipa::path( @@ -1214,7 +864,7 @@ pub mod endpoint { } match song.save_to_filesystem() { - Ok(_) => match super::song_db::insert(&pool, &song).await { + Ok(_) => match repo::song::insert(&pool, &song).await { Ok((date_created, id)) => { song.id = id; song.date_created = Some(date_created); @@ -1314,7 +964,7 @@ pub mod endpoint { let mut response = super::response::get_songs::Response::default(); match params.id { - Some(id) => match super::song_db::get_song(&pool, &id).await { + Some(id) => match repo::song::get_song(&pool, &id).await { Ok(song) => { response.message = String::from(super::super::response::SUCCESSFUL); response.data.push(song); @@ -1349,7 +999,7 @@ pub mod endpoint { ) { let mut response = super::response::get_songs::Response::default(); - match super::song_db::get_all_songs(&pool).await { + match repo::song::get_all_songs(&pool).await { Ok(songs) => { response.message = String::from(super::super::response::SUCCESSFUL); response.data = songs; @@ -1376,7 +1026,7 @@ pub mod endpoint { axum::Extension(pool): axum::Extension, axum::extract::Path(id): axum::extract::Path, ) -> impl IntoResponse { - match super::song_db::get_song(&pool, &id).await { + match repo::song::get_song(&pool, &id).await { Ok(song) => { let song_path = song.song_path().unwrap(); let path = std::path::Path::new(&song_path); @@ -1434,7 +1084,7 @@ pub mod endpoint { axum::Extension(pool): axum::Extension, axum::extract::Path(id): axum::extract::Path, ) -> (axum::http::StatusCode, axum::response::Response) { - match super::song_db::get_song(&pool, &id).await { + match repo::song::get_song(&pool, &id).await { Ok(song) => match icarus_models::song::io::to_data(&song) { Ok(data) => { let bytes = axum::body::Bytes::from(data); @@ -1485,7 +1135,7 @@ pub mod endpoint { ) { let mut response = super::response::delete_song::Response::default(); - match super::song_db::get_song(&pool, &id).await { + match repo::song::get_song(&pool, &id).await { Ok(song) => { match super::super::coverart::cov_db::get_coverart_with_song_id(&pool, &song.id) .await @@ -1504,7 +1154,7 @@ pub mod endpoint { let coverart_path = std::path::Path::new(&coverart_path_str); if coverart_path.exists() { - match super::song_db::delete_song(&pool, &song.id).await { + match repo::song::delete_song(&pool, &song.id).await { Ok(deleted_song) => { match super::super::coverart::cov_db::delete_coverart( &pool, diff --git a/src/repo/mod.rs b/src/repo/mod.rs new file mode 100644 index 0000000..76ff890 --- /dev/null +++ b/src/repo/mod.rs @@ -0,0 +1 @@ +pub mod song; diff --git a/src/repo/song.rs b/src/repo/song.rs new file mode 100644 index 0000000..77d9561 --- /dev/null +++ b/src/repo/song.rs @@ -0,0 +1,347 @@ +use sqlx::Row; + +pub async fn insert( + pool: &sqlx::PgPool, + song: &icarus_models::song::Song, +) -> Result<(time::OffsetDateTime, uuid::Uuid), sqlx::Error> { + let result = sqlx::query( + r#" + INSERT INTO "song" (title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, filename, directory, user_id) + VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15) RETURNING date_created, id; + "# + ) + .bind(&song.title) + .bind(&song.artist) + .bind(&song.album_artist) + .bind(&song.album) + .bind(&song.genre) + .bind(song.year) + .bind(song.track) + .bind(song.disc) + .bind(song.track_count) + .bind(song.disc_count) + .bind(song.duration) + .bind(&song.audio_type) + .bind(&song.filename) + .bind(&song.directory) + .bind(song.user_id) + .fetch_one(pool) + .await + .map_err(|e| { + eprintln!("Error inserting query: {e}"); + }); + + match result { + Ok(row) => { + let id: uuid::Uuid = row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(); + let date_created_time: time::OffsetDateTime = row + .try_get("date_created") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(); + let date_created = date_created_time; + + Ok((date_created, id)) + } + Err(_) => Err(sqlx::Error::RowNotFound), + } +} + +pub async fn get_song( + pool: &sqlx::PgPool, + id: &uuid::Uuid, +) -> Result { + let result = sqlx::query( + r#" + SELECT * FROM "song" WHERE id = $1 + "#, + ) + .bind(id) + .fetch_one(pool) + .await + .map_err(|e| { + eprintln!("Error querying data: {e}"); + }); + + match result { + Ok(row) => { + let date_created_time: time::OffsetDateTime = row + .try_get("date_created") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(); + + Ok(icarus_models::song::Song { + id: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + title: row + .try_get("title") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + artist: row + .try_get("artist") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + album_artist: row + .try_get("album_artist") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + album: row + .try_get("album") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + genre: row + .try_get("genre") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + year: row + .try_get("year") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + track: row + .try_get("track") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + disc: row + .try_get("disc") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + track_count: row + .try_get("track_count") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + disc_count: row + .try_get("disc_count") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + duration: row + .try_get("duration") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + audio_type: row + .try_get("audio_type") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + filename: row + .try_get("filename") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + directory: row + .try_get("directory") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + date_created: Some(date_created_time), + user_id: row + .try_get("user_id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + data: Vec::new(), + }) + } + Err(_) => Err(sqlx::Error::RowNotFound), + } +} + +pub async fn get_all_songs( + pool: &sqlx::PgPool, +) -> Result, sqlx::Error> { + let result = sqlx::query( + r#" + SELECT * FROM "song"; + "#, + ) + .fetch_all(pool) + .await + .map_err(|e| { + eprintln!("Error querying data: {e:?}"); + }); + + match result { + Ok(rows) => { + let mut songs: Vec = Vec::new(); + + for row in rows { + let date_created_time: time::OffsetDateTime = row + .try_get("date_created") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(); + + let song = icarus_models::song::Song { + id: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + title: row + .try_get("title") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + artist: row + .try_get("artist") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + album_artist: row + .try_get("album_artist") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + album: row + .try_get("album") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + genre: row + .try_get("genre") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + year: row + .try_get("year") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + track: row + .try_get("track") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + disc: row + .try_get("disc") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + track_count: row + .try_get("track_count") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + disc_count: row + .try_get("disc_count") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + duration: row + .try_get("duration") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + audio_type: row + .try_get("audio_type") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + filename: row + .try_get("filename") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + directory: row + .try_get("directory") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + date_created: Some(date_created_time), + user_id: row + .try_get("user_id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + data: Vec::new(), + }; + + songs.push(song); + } + + Ok(songs) + } + Err(_err) => Err(sqlx::Error::RowNotFound), + } +} + +pub async fn delete_song( + pool: &sqlx::PgPool, + id: &uuid::Uuid, +) -> Result { + let result = sqlx::query( + // icarus_models::song::Song, + r#" + DELETE FROM "song" + WHERE id = $1 + RETURNING id, title, artist, album, album_artist, genre, year, disc, track, track_count, disc_count, duration, audio_type, date_created, filename, directory, user_id + "#, + ) + .bind(id) + .fetch_one(pool) + .await + .map_err(|e| { + eprintln!("Error deleting data: {e:?}") + }); + + match result { + Ok(row) => { + let date_created_time: time::OffsetDateTime = row + .try_get("date_created") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(); + + Ok(icarus_models::song::Song { + id: row + .try_get("id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + title: row + .try_get("title") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + artist: row + .try_get("artist") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + album_artist: row + .try_get("album_artist") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + album: row + .try_get("album") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + genre: row + .try_get("genre") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + year: row + .try_get("year") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + track: row + .try_get("track") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + disc: row + .try_get("disc") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + track_count: row + .try_get("track_count") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + disc_count: row + .try_get("disc_count") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + duration: row + .try_get("duration") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + audio_type: row + .try_get("audio_type") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + filename: row + .try_get("filename") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + directory: row + .try_get("directory") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + date_created: Some(date_created_time), + user_id: row + .try_get("user_id") + .map_err(|_e| sqlx::Error::RowNotFound) + .unwrap(), + data: Vec::new(), + }) + } + Err(_) => Err(sqlx::Error::RowNotFound), + } +}