Remove duplicate album query

This commit is contained in:
Henrik Friedrichsen
2023-07-23 14:41:46 +02:00
parent 924296ac52
commit bef4742cec
2 changed files with 3 additions and 5 deletions

View File

@@ -38,7 +38,7 @@ impl Album {
if let Some(ref album_id) = self.id {
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());
while let Some(ref tracks) = tracks_result {
for t in &tracks.items {

View File

@@ -267,6 +267,7 @@ impl WebApi {
}
pub fn album(&self, album_id: &str) -> Option<FullAlbum> {
debug!("fetching album {}", album_id);
let aid = AlbumId::from_id(album_id).ok()?;
self.api_with_retry(|api| api.album(aid.clone()))
}
@@ -407,16 +408,13 @@ impl WebApi {
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(
&self,
album_id: &str,
limit: u32,
offset: u32,
) -> Option<Page<SimplifiedTrack>> {
debug!("fetching album tracks {}", album_id);
self.api_with_retry(|api| {
api.album_track_manual(
AlbumId::from_id(album_id).unwrap(),