Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 42 additions & 14 deletions src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -570,12 +570,7 @@ impl App {
None,
None,
) {
self.track_table.tracks = playlist_tracks
.items
.clone()
.into_iter()
.map(|item| item.track)
.collect::<Vec<FullTrack>>();
self.set_playlist_tracks_to_table(&playlist_tracks);

self.playlist_tracks = playlist_tracks.items;
self.push_navigation_stack(RouteId::TrackTable, ActiveBlock::TrackTable);
Expand Down Expand Up @@ -628,13 +623,38 @@ impl App {
}
}

fn set_saved_tracks_to_table(&mut self, saved_tracks: &Page<SavedTrack>) {
self.track_table.tracks = saved_tracks
.items
.clone()
.into_iter()
.map(|item| item.track)
.collect::<Vec<FullTrack>>();
fn set_saved_tracks_to_table(&mut self, saved_track_page: &Page<SavedTrack>) {
self.set_tracks_to_table(
saved_track_page
.items
.clone()
.into_iter()
.map(|item| item.track)
.collect::<Vec<FullTrack>>(),
);
}

fn set_playlist_tracks_to_table(&mut self, playlist_track_page: &Page<PlaylistTrack>) {
self.set_tracks_to_table(
playlist_track_page
.items
.clone()
.into_iter()
.map(|item| item.track)
.collect::<Vec<FullTrack>>(),
);
}

pub fn set_tracks_to_table(&mut self, tracks: Vec<FullTrack>) {
self.track_table.tracks = tracks.clone();

self.current_user_saved_tracks_contains(
tracks
.clone()
.into_iter()
.filter_map(|item| item.id)
.collect::<Vec<String>>(),
);
}

pub fn get_current_user_saved_tracks(&mut self, offset: Option<u32>) {
Expand Down Expand Up @@ -692,10 +712,18 @@ impl App {
Ok(tracks) => {
self.selected_album = Some(SelectedAlbum {
album,
tracks,
tracks: tracks.clone(),
selected_index: Some(0),
});

self.current_user_saved_tracks_contains(
tracks
.items
.into_iter()
.filter_map(|item| item.id)
.collect::<Vec<String>>(),
);

self.album_table_context = AlbumTableContext::Simplified;
self.push_navigation_stack(RouteId::AlbumTracks, ActiveBlock::AlbumTracks);
}
Expand Down
2 changes: 1 addition & 1 deletion src/handlers/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ pub fn handler(key: Key, app: &mut App) {
country.to_owned(),
) {
Ok(result) => {
app.track_table.tracks = result.tracks.items.clone();
app.set_tracks_to_table(result.tracks.items.clone());
app.search_results.tracks = Some(result);
}
Err(e) => {
Expand Down
11 changes: 10 additions & 1 deletion src/handlers/library.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,16 @@ pub fn handler(key: Key, app: &mut App) {
.current_user_recently_played(app.large_search_limit)
{
Ok(result) => {
app.recently_played.result = Some(result);
app.recently_played.result = Some(result.clone());

app.current_user_saved_tracks_contains(
result
.items
.iter()
.filter_map(|item| item.track.id.clone())
.collect::<Vec<String>>(),
);

app.push_navigation_stack(
RouteId::RecentlyPlayed,
ActiveBlock::RecentlyPlayed,
Expand Down
Loading