fix: user interactions in search page with no results resulting in NP…

…E. (#79)
spezifisch · Oct 28, 2024 · 3ea5da2 · 3ea5da2
1 parent 18c3f9b
commit 3ea5da2
Showing 1 changed file with 40 additions and 22 deletions.
diff --git a/page_search.go b/page_search.go
@@ -92,17 +92,23 @@ func (ui *Ui) createSearchPage() *SearchPage {
 			ui.app.SetFocus(searchPage.albumList)
 			return nil
 		case tcell.KeyEnter:
-			idx := searchPage.artistList.GetCurrentItem()
-			searchPage.addArtistToQueue(searchPage.artists[idx])
-			return nil
+			if len(searchPage.artists) != 0 {
+				idx := searchPage.artistList.GetCurrentItem()
+				searchPage.addArtistToQueue(searchPage.artists[idx])
+				return nil
+			}
+			return event
 		}
 
 		switch event.Rune() {
 		case 'a':
-			idx := searchPage.artistList.GetCurrentItem()
-			searchPage.logger.Printf("artistList adding (%d) %s", idx, searchPage.artists[idx].Name)
-			searchPage.addArtistToQueue(searchPage.artists[idx])
-			return nil
+			if len(searchPage.artists) != 0 {
+				idx := searchPage.artistList.GetCurrentItem()
+				searchPage.logger.Printf("artistList adding (%d) %s", idx, searchPage.artists[idx].Name)
+				searchPage.addArtistToQueue(searchPage.artists[idx])
+				return nil
+			}
+			return event
 		case '/':
 			searchPage.ui.app.SetFocus(searchPage.searchField)
 			return nil
@@ -122,17 +128,23 @@ func (ui *Ui) createSearchPage() *SearchPage {
 			ui.app.SetFocus(searchPage.songList)
 			return nil
 		case tcell.KeyEnter:
-			idx := searchPage.albumList.GetCurrentItem()
-			searchPage.addAlbumToQueue(searchPage.albums[idx])
-			return nil
+			if len(searchPage.albums) != 0 {
+				idx := searchPage.albumList.GetCurrentItem()
+				searchPage.addAlbumToQueue(searchPage.albums[idx])
+				return nil
+			}
+			return event
 		}
 
 		switch event.Rune() {
 		case 'a':
-			idx := searchPage.albumList.GetCurrentItem()
-			searchPage.logger.Printf("albumList adding (%d) %s", idx, searchPage.albums[idx].Name)
-			searchPage.addAlbumToQueue(searchPage.albums[idx])
-			return nil
+			if len(searchPage.albums) != 0 {
+				idx := searchPage.albumList.GetCurrentItem()
+				searchPage.logger.Printf("albumList adding (%d) %s", idx, searchPage.albums[idx].Name)
+				searchPage.addAlbumToQueue(searchPage.albums[idx])
+				return nil
+			}
+			return event
 		case '/':
 			searchPage.ui.app.SetFocus(searchPage.searchField)
 			return nil
@@ -152,18 +164,24 @@ func (ui *Ui) createSearchPage() *SearchPage {
 			ui.app.SetFocus(searchPage.artistList)
 			return nil
 		case tcell.KeyEnter:
-			idx := searchPage.songList.GetCurrentItem()
-			ui.addSongToQueue(searchPage.songs[idx])
-			ui.queuePage.UpdateQueue()
-			return nil
+			if len(searchPage.artists) != 0 {
+				idx := searchPage.songList.GetCurrentItem()
+				ui.addSongToQueue(searchPage.songs[idx])
+				ui.queuePage.UpdateQueue()
+				return nil
+			}
+			return event
 		}
 
 		switch event.Rune() {
 		case 'a':
-			idx := searchPage.songList.GetCurrentItem()
-			ui.addSongToQueue(searchPage.songs[idx])
-			ui.queuePage.updateQueue()
-			return nil
+			if len(searchPage.artists) != 0 {
+				idx := searchPage.songList.GetCurrentItem()
+				ui.addSongToQueue(searchPage.songs[idx])
+				ui.queuePage.updateQueue()
+				return nil
+			}
+			return event
 		case '/':
 			searchPage.ui.app.SetFocus(searchPage.searchField)
 			return nil