Unify pagination setup for ApiResult values

Also:
- Fix duplicate results
- Rename `album.load_tracks` to `album.load_all_tracks`

src/album.rs

@@ -27,7 +27,7 @@ pub struct Album {
 }
 
 impl Album {
-    pub fn load_tracks(&mut self, spotify: Spotify) {
+    pub fn load_all_tracks(&mut self, spotify: Spotify) {
         if self.tracks.is_some() {
             return;
         }
@@ -176,7 +176,7 @@ impl ListItem for Album {
     }
 
     fn play(&mut self, queue: Arc<Queue>) {
-        self.load_tracks(queue.get_spotify());
+        self.load_all_tracks(queue.get_spotify());
 
         if let Some(tracks) = self.tracks.as_ref() {
             let tracks: Vec<Playable> = tracks
@@ -189,7 +189,7 @@ impl ListItem for Album {
     }
 
     fn play_next(&mut self, queue: Arc<Queue>) {
-        self.load_tracks(queue.get_spotify());
+        self.load_all_tracks(queue.get_spotify());
 
         if let Some(tracks) = self.tracks.as_ref() {
             for t in tracks.iter().rev() {
@@ -199,7 +199,7 @@ impl ListItem for Album {
     }
 
     fn queue(&mut self, queue: Arc<Queue>) {
-        self.load_tracks(queue.get_spotify());
+        self.load_all_tracks(queue.get_spotify());
 
         if let Some(tracks) = self.tracks.as_ref() {
             for t in tracks {

src/library.rs

@@ -618,7 +618,7 @@ impl Library {
             }
         }
 
-        album.load_tracks(self.spotify.clone());
+        album.load_all_tracks(self.spotify.clone());
 
         {
             let mut store = self.albums.write().unwrap();
@@ -649,7 +649,7 @@ impl Library {
             }
         }
 
-        album.load_tracks(self.spotify.clone());
+        album.load_all_tracks(self.spotify.clone());
 
         {
             let mut store = self.albums.write().unwrap();

src/ui/album.rs

@@ -22,7 +22,7 @@ impl AlbumView {
     pub fn new(queue: Arc<Queue>, library: Arc<Library>, album: &Album) -> Self {
         let mut album = album.clone();
 
-        album.load_tracks(queue.get_spotify());
+        album.load_all_tracks(queue.get_spotify());
 
         let tracks = if let Some(t) = album.tracks.as_ref() {
             t.clone()

src/ui/artist.rs

@@ -107,20 +107,9 @@ impl ArtistView {
         if let Some(artist_id) = &artist.id {
             let spotify = queue.get_spotify();
             let albums_page = spotify.artist_albums(artist_id, Some(album_type));
-            let view = ListView::new(albums_page.items.clone(), queue, library.clone());
+            let view = ListView::new(albums_page.items.clone(), queue, library);
-            let pagination = view.get_pagination().clone();
+            albums_page.apply_pagination(view.get_pagination());
 
-            pagination.set(
-                albums_page.total as usize,
-                Box::new(move |items| {
-                    if let Some(next_page) = albums_page.next() {
-                        let mut w = items.write().unwrap();
-                        w.extend(next_page);
-                        w.sort_by(|a, b| b.year.cmp(&a.year));
-                        library.trigger_redraw();
-                    }
-                }),
-            );
             view
         } else {
             ListView::new(Arc::new(RwLock::new(Vec::new())), queue, library)

src/ui/listview.rs

@@ -458,7 +458,7 @@ impl<I: ListItem + Clone> ViewExt for ListView<I> {
                         return Ok(CommandResult::Consumed(None));
                     }
                     MoveMode::Down if self.selected == last_idx && self.can_paginate() => {
-                        self.pagination.call(&self.content);
+                        self.pagination.call(&self.content, self.library.clone());
                     }
                     _ => {}
                 }

src/ui/pagination.rs

@@ -1,5 +1,6 @@
 use std::sync::{Arc, RwLock};
 
+use crate::library::Library;
 use crate::traits::ListItem;
 
 pub struct ApiPage<I> {
@@ -16,7 +17,7 @@ pub struct ApiResult<I> {
     fetch_page: Arc<FetchPageFn<I>>,
 }
 
-impl<I: Clone> ApiResult<I> {
+impl<I: ListItem + Clone> ApiResult<I> {
     pub fn new(limit: u32, fetch_page: Arc<FetchPageFn<I>>) -> ApiResult<I> {
         let items = Arc::new(RwLock::new(Vec::new()));
         if let Some(first_page) = fetch_page(0) {
@@ -47,6 +48,16 @@ impl<I: Clone> ApiResult<I> {
         (self.offset() + self.limit as u32) >= self.total
     }
 
+    pub fn apply_pagination(self, pagination: &Pagination<I>) {
+        let total = self.total as usize;
+        pagination.set(
+            total,
+            Box::new(move |_| {
+                self.next();
+            }),
+        )
+    }
+
     pub fn next(&self) -> Option<Vec<I>> {
         let offset = self.offset() + self.limit as u32;
         debug!("fetching next page at offset {}", offset);
@@ -112,7 +123,7 @@ impl<I: ListItem> Pagination<I> {
         *self.busy.read().unwrap()
     }
 
-    pub fn call(&self, content: &Arc<RwLock<Vec<I>>>) {
+    pub fn call(&self, content: &Arc<RwLock<Vec<I>>>, library: Arc<Library>) {
         let pagination = self.clone();
         let content = content.clone();
         if !self.is_busy() {
@@ -123,6 +134,7 @@ impl<I: ListItem> Pagination<I> {
                     debug!("calling paginator!");
                     cb(content);
                     *pagination.busy.write().unwrap() = false;
+                    library.trigger_redraw();
                 }
             });
         }

src/ui/show.rs

@@ -24,17 +24,8 @@ impl ShowView {
 
         let list = {
             let results = spotify.show_episodes(&show.id);
-            let view = ListView::new(results.items.clone(), queue, library.clone());
+            let view = ListView::new(results.items.clone(), queue, library);
-            let pagination = view.get_pagination();
+            results.apply_pagination(view.get_pagination());
-
-            pagination.set(
-                results.total as usize,
-                Box::new(move |_| {
-                    if results.next().is_some() {
-                        library.trigger_redraw();
-                    }
-                }),
-            );
 
             view
         };