Some fixes

psst-gui/src/cmd.rs

@@ -5,7 +5,6 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use crate::{
-    data::Alert,
     data::{Nav, PlaybackPayload, QueueBehavior, QueueEntry},
     ui::find::Find,
 };

psst-gui/src/data/mod.rs

@@ -1,4 +1,4 @@
-pub mod album;
+mod album;
 mod artist;
 pub mod config;
 mod ctx;
@@ -311,7 +311,7 @@ impl AppState {
 impl AppState {
     pub fn add_alert(&mut self, message: impl Display, style: AlertStyle) {
         let alert = Alert {
-            message: Arc::from(message.to_string()),
+            message: message.to_string().into(),
             style,
             id: Alert::fresh_id(),
             created_at: Instant::now(),
@@ -576,8 +576,8 @@ pub struct Alert {
 }
 
 impl Alert {
-    pub fn fresh_id() -> usize {
-        ALERT_ID.fetch_add(1, Ordering::Relaxed)
+    fn fresh_id() -> usize {
+        ALERT_ID.fetch_add(1, Ordering::SeqCst)
     }
 }
 

psst-gui/src/data/playback.rs

@@ -91,13 +91,16 @@ pub struct NowPlaying {
 }
 
 impl NowPlaying {
-    pub fn cover_image_url(&self, _width: f64, _height: f64) -> Option<String> {
+    pub fn cover_image_url(&self, width: f64, height: f64) -> Option<&str> {
         match &self.item {
-            Playable::Track(track) => track
-                .album
-                .as_ref()
-                .and_then(|album| album.images.get(0).map(|img| img.url.to_string())),
-            Playable::Episode(episode) => episode.images.get(0).map(|img| img.url.to_string()),
+            Playable::Track(track) => {
+                let album = track.album.as_ref().or(match &self.origin {
+                    PlaybackOrigin::Album(album) => Some(album),
+                    _ => None,
+                })?;
+                Some(&album.image(width, height)?.url)
+            }
+            Playable::Episode(episode) => Some(&episode.image(width, height)?.url),
         }
     }
 

psst-gui/src/ui/playback.rs

@@ -168,7 +168,6 @@ fn cover_widget(size: f64) -> impl Widget<NowPlaying> {
     })
     .fix_size(size, size)
     .clip(Size::new(size, size).to_rounded_rect(4.0))
-    .link()
     .on_left_click(|ctx, _, _, _| {
         ctx.submit_command(SHOW_ARTWORK);
     })