Fix save in album view

CHANGELOG.md

@@ -2,10 +2,18 @@
 
 ## [Unreleased]
 
+### Added
+
 - Improve onboarding: auto fill the redirect url [#98](https://github.com/Rigellute/spotify-tui/pull/98)
 - Indicate if a track is "liked" in Recently Played, Album tracks and song list views using "♥" - [#103](https://github.com/Rigellute/spotify-tui/pull/103)
-- Fix app crash when pressing `enter`, `q` and then `down`. [#109](https://github.com/Rigellute/spotify-tui/pull/109)
 - Add ability to toggle the saved state of a track: pressing `s` on an already saved track will unsave it. [#104](https://github.com/Rigellute/spotify-tui/pull/104)
+- Add collaborative playlists scope. You'll need to reauthenticate due to this change. [#115](https://github.com/Rigellute/spotify-tui/pull/115)
+
+### Fixed
+
+- Fix app crash when pressing `enter`, `q` and then `down`. [#109](https://github.com/Rigellute/spotify-tui/pull/109)
+- Fix trying to save a track in the album view [#119](https://github.com/Rigellute/spotify-tui/pull/119)
+- Fix UI toggling saved track [#119](https://github.com/Rigellute/spotify-tui/pull/119)
 
 ## [0.7.0] - 2019-10-20
 

src/app.rs

@@ -176,7 +176,7 @@ pub struct TrackTable {
 pub struct SelectedAlbum {
     pub album: SimplifiedAlbum,
     pub tracks: Page<SimplifiedTrack>,
-    pub selected_index: Option<usize>,
+    pub selected_index: usize,
 }
 
 #[derive(Clone)]
@@ -717,7 +717,7 @@ impl App {
                         self.selected_album = Some(SelectedAlbum {
                             album,
                             tracks: tracks.clone(),
-                            selected_index: Some(0),
+                            selected_index: 0,
                         });
 
                         self.current_user_saved_tracks_contains(
@@ -744,15 +744,20 @@ impl App {
             match spotify.current_user_saved_tracks_contains(&[track_id.clone()]) {
                 Ok(saved) => {
                     if saved.first() == Some(&true) {
-                        match spotify.current_user_saved_tracks_delete(&[track_id]) {
-                            Ok(()) => {}
+                        match spotify.current_user_saved_tracks_delete(&[track_id.clone()]) {
+                            Ok(()) => {
+                                self.liked_song_ids_set.remove(&track_id);
+                            }
                             Err(e) => {
                                 self.handle_error(e);
                             }
                         }
                     } else {
-                        match spotify.current_user_saved_tracks_add(&[track_id]) {
-                            Ok(()) => {}
+                        match spotify.current_user_saved_tracks_add(&[track_id.clone()]) {
+                            Ok(()) => {
+                                // TODO: This should ideally use the same logic as `self.current_user_saved_tracks_contains`
+                                self.liked_song_ids_set.insert(track_id);
+                            }
                             Err(e) => {
                                 self.handle_error(e);
                             }

src/handlers/album_tracks.rs

@@ -22,9 +22,9 @@ pub fn handler(key: Key, app: &mut App) {
                 if let Some(selected_album) = &mut app.selected_album {
                     let next_index = common_key_events::on_down_press_handler(
                         &selected_album.tracks.items,
-                        selected_album.selected_index,
+                        Some(selected_album.selected_index),
                     );
-                    selected_album.selected_index = Some(next_index);
+                    selected_album.selected_index = next_index;
                 }
             }
         },
@@ -45,9 +45,9 @@ pub fn handler(key: Key, app: &mut App) {
                 if let Some(selected_album) = &mut app.selected_album {
                     let next_index = common_key_events::on_up_press_handler(
                         &selected_album.tracks.items,
-                        selected_album.selected_index,
+                        Some(selected_album.selected_index),
                     );
-                    selected_album.selected_index = Some(next_index);
+                    selected_album.selected_index = next_index;
                 }
             }
         },
@@ -68,7 +68,19 @@ pub fn handler(key: Key, app: &mut App) {
                     }
                 };
             }
-            AlbumTableContext::Simplified => {}
+            AlbumTableContext::Simplified => {
+                if let Some(selected_album) = app.selected_album.clone() {
+                    if let Some(selected_track) = selected_album
+                        .tracks
+                        .items
+                        .get(selected_album.selected_index)
+                    {
+                        if let Some(track_id) = &selected_track.id {
+                            app.toggle_save_track(track_id.clone());
+                        };
+                    };
+                };
+            }
         },
         Key::Char('\n') => match app.album_table_context {
             AlbumTableContext::Full => {
@@ -87,7 +99,7 @@ pub fn handler(key: Key, app: &mut App) {
                     app.start_playback(
                         selected_album.album.uri.clone(),
                         None,
-                        selected_album.selected_index,
+                        Some(selected_album.selected_index),
                     );
                 };
             }

src/main.rs

@@ -32,8 +32,8 @@ use redirect_uri::redirect_uri_web_server;
 use util::{Event, Events};
 
 const SCOPES: [&str; 10] = [
-    "playlist-read-private",
     "playlist-read-collaborative",
+    "playlist-read-private",
     "user-follow-read",
     "user-library-modify",
     "user-library-read",

src/ui/mod.rs

@@ -476,7 +476,7 @@ where
                     selected_album.album.name,
                     create_artist_string(&selected_album.album.artists)
                 ),
-                selected_index: selected_album.selected_index.unwrap_or(0),
+                selected_index: selected_album.selected_index,
             }),
             None => None,
         },