Remove duplicate album query
This commit is contained in:
@@ -38,7 +38,7 @@ impl Album {
|
|||||||
|
|
||||||
if let Some(ref album_id) = self.id {
|
if let Some(ref album_id) = self.id {
|
||||||
let mut collected_tracks = Vec::new();
|
let mut collected_tracks = Vec::new();
|
||||||
if let Some(full_album) = spotify.api.full_album(album_id) {
|
if let Some(full_album) = spotify.api.album(album_id) {
|
||||||
let mut tracks_result = Some(full_album.tracks.clone());
|
let mut tracks_result = Some(full_album.tracks.clone());
|
||||||
while let Some(ref tracks) = tracks_result {
|
while let Some(ref tracks) = tracks_result {
|
||||||
for t in &tracks.items {
|
for t in &tracks.items {
|
||||||
|
|||||||
@@ -267,6 +267,7 @@ impl WebApi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn album(&self, album_id: &str) -> Option<FullAlbum> {
|
pub fn album(&self, album_id: &str) -> Option<FullAlbum> {
|
||||||
|
debug!("fetching album {}", album_id);
|
||||||
let aid = AlbumId::from_id(album_id).ok()?;
|
let aid = AlbumId::from_id(album_id).ok()?;
|
||||||
self.api_with_retry(|api| api.album(aid.clone()))
|
self.api_with_retry(|api| api.album(aid.clone()))
|
||||||
}
|
}
|
||||||
@@ -407,16 +408,13 @@ impl WebApi {
|
|||||||
ApiResult::new(MAX_LIMIT, Arc::new(fetch_page))
|
ApiResult::new(MAX_LIMIT, Arc::new(fetch_page))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn full_album(&self, album_id: &str) -> Option<FullAlbum> {
|
|
||||||
self.api_with_retry(|api| api.album(AlbumId::from_id(album_id).unwrap()))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn album_tracks(
|
pub fn album_tracks(
|
||||||
&self,
|
&self,
|
||||||
album_id: &str,
|
album_id: &str,
|
||||||
limit: u32,
|
limit: u32,
|
||||||
offset: u32,
|
offset: u32,
|
||||||
) -> Option<Page<SimplifiedTrack>> {
|
) -> Option<Page<SimplifiedTrack>> {
|
||||||
|
debug!("fetching album tracks {}", album_id);
|
||||||
self.api_with_retry(|api| {
|
self.api_with_retry(|api| {
|
||||||
api.album_track_manual(
|
api.album_track_manual(
|
||||||
AlbumId::from_id(album_id).unwrap(),
|
AlbumId::from_id(album_id).unwrap(),
|
||||||
|
|||||||
Reference in New Issue
Block a user