diff options
Diffstat (limited to 'src/routes/song.rs')
| -rw-r--r-- | src/routes/song.rs | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/routes/song.rs b/src/routes/song.rs index 4cc20e9..8cb34bf 100644 --- a/src/routes/song.rs +++ b/src/routes/song.rs @@ -16,30 +16,23 @@ pub async fn song( app_state: web::Data<AppState>, get_args: web::Query<SongQueryOptions>, ) -> HttpResponse { + let default: String = String::from(""); let search_attempt: sqlx::Result<Vec<Song>> = match true { _ if check_if_exists(&get_args.id) => { - app_state - .database - .select_song_by_id(&get_args.id.clone().unwrap()) - .await + let id: &str = &get_args.id.as_ref().unwrap_or(&default); + app_state.database.select_song_by_id(id).await } _ if check_if_exists(&get_args.name) => { - app_state - .database - .select_songs_by_name(&get_args.name.clone().unwrap()) - .await + let name: &str = &get_args.name.as_ref().unwrap_or(&default); + app_state.database.select_songs_by_name(name).await } _ if check_if_exists(&get_args.album) => { - app_state - .database - .select_songs_by_album(&get_args.album.clone().unwrap()) - .await + let album: &str = &get_args.album.as_ref().unwrap_or(&default); + app_state.database.select_songs_by_album(album).await } _ if check_if_exists(&get_args.artist) => { - app_state - .database - .select_songs_by_artist(&get_args.artist.clone().unwrap()) - .await + let artist: &str = &get_args.artist.as_ref().unwrap_or(&default); + app_state.database.select_songs_by_artist(artist).await } _ => app_state.database.select_songs().await, }; |