Skip to content
Open
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
6 changes: 3 additions & 3 deletions src/api/api_models.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ trait WithImages {
.map(|image| (criterion(image), image))
.collect::<Vec<(T, &Image)>>();

ords.sort_by(|a, b| (a.0).partial_cmp(&b.0).unwrap());
ords.sort_by(|a, b| (a.0).partial_cmp(&b.0).unwrap_or(std::cmp::Ordering::Equal));
Some(ords.first()?.1)
}

Expand All @@ -186,7 +186,7 @@ trait WithImages {
pub struct Playlist {
pub id: String,
pub name: String,
pub images: Vec<Image>,
pub images: Option<Vec<Image>>,
pub tracks: Page<PlaylistTrack>,
pub owner: PlaylistOwner,
}
Expand All @@ -199,7 +199,7 @@ pub struct PlaylistOwner {

impl WithImages for Playlist {
fn images(&self) -> &[Image] {
&self.images
self.images.as_deref().unwrap_or_default()
}
}

Expand Down
17 changes: 13 additions & 4 deletions src/app/components/playlist_details/playlist_details.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ impl PlaylistDetailsWidget {
self.imp().header_widget.set_playing(is_playing);
}

fn set_fallback_artwork(&self) {
self.imp().header_widget.imp().playlist_art.set_icon_name(Some("audio-x-generic-symbolic"));
}

fn set_artwork(&self, art: &gdk_pixbuf::Pixbuf) {
self.imp().header_widget.set_artwork(art);
}
Expand Down Expand Up @@ -270,7 +274,7 @@ impl PlaylistDetails {
}
}

fn update_details(&self) {
fn update_details(&mut self) {
if let Some(info) = self.model.get_playlist_info() {
let title = &info.title[..];
let owner = &info.owner.display_name[..];
Expand All @@ -279,17 +283,22 @@ impl PlaylistDetails {
self.widget.set_info(title, owner);

if let Some(art_url) = art_url.cloned() {
let widget = self.widget.downgrade();
let widget_clone = self.widget.downgrade();
self.worker.send_local_task(async move {
let pixbuf = ImageLoader::new()
.load_remote(&art_url[..], "jpg", 320, 320)
.await;
if let (Some(widget), Some(ref pixbuf)) = (widget.upgrade(), pixbuf) {
widget.set_artwork(pixbuf);
if let Some(widget) = widget_clone.upgrade() {
if let Some(ref pixbuf) = pixbuf {
widget.set_artwork(pixbuf);
} else {
widget.set_fallback_artwork();
}
widget.set_loaded();
}
});
} else {
self.widget.set_fallback_artwork();
self.widget.set_loaded();
}
}
Expand Down
Loading