From 79c4040a53f50f14f27c6d9e0fec9ad00101f638 Mon Sep 17 00:00:00 2001
From: Roderick van Domburg <roderick@vandomburg.net>
Date: Sat, 11 Dec 2021 21:32:34 +0100
Subject: [PATCH 1/2] Skip track on decoding error

---
 playback/src/player.rs | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/playback/src/player.rs b/playback/src/player.rs
index a7ff916d..a56130f3 100644
--- a/playback/src/player.rs
+++ b/playback/src/player.rs
@@ -737,7 +737,14 @@ impl PlayerTrackLoader {
             }
         };
 
-        assert!(audio.duration >= 0);
+        if audio.duration < 0 {
+            error!(
+                "Track duration for <{}> cannot be {}",
+                spotify_id.to_uri(),
+                audio.duration
+            );
+            return None;
+        }
         let duration_ms = audio.duration as u32;
 
         // (Most) podcasts seem to support only 96 bit Vorbis, so fall back to it
@@ -945,7 +952,7 @@ impl Future for PlayerInternal {
                     }
                     Poll::Ready(Err(_)) => {
                         warn!("Unable to load <{:?}>\nSkipping to next track", track_id);
-                        assert!(self.state.is_loading());
+                        debug_assert!(self.state.is_loading());
                         self.send_event(PlayerEvent::EndOfTrack {
                             track_id,
                             play_request_id,
@@ -1045,8 +1052,11 @@ impl Future for PlayerInternal {
                                             }
                                         }
                                         Err(e) => {
-                                            error!("PlayerInternal poll: {}", e);
-                                            exit(1);
+                                            warn!("Unable to decode samples for track <{:?}: {:?}>\nSkipping to next track", track_id, e);
+                                            self.send_event(PlayerEvent::EndOfTrack {
+                                                track_id,
+                                                play_request_id,
+                                            })
                                         }
                                     }
                                 }
@@ -1058,8 +1068,15 @@ impl Future for PlayerInternal {
                             self.handle_packet(packet, normalisation_factor);
                         }
                         Err(e) => {
-                            error!("PlayerInternal poll: {}", e);
-                            exit(1);
+                            warn!(
+                                "Unable to get packet for track <{:?}: {:?}>\nSkipping to next track",
+								e,
+                                track_id
+                            );
+                            self.send_event(PlayerEvent::EndOfTrack {
+                                track_id,
+                                play_request_id,
+                            })
                         }
                     }
                 } else {

From 8f23c3498fd9eeaf7d74ab2cb57548f0e811de57 Mon Sep 17 00:00:00 2001
From: Roderick van Domburg <roderick@vandomburg.net>
Date: Sun, 12 Dec 2021 20:01:05 +0100
Subject: [PATCH 2/2] Clean up warnings

---
 playback/src/player.rs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/playback/src/player.rs b/playback/src/player.rs
index a56130f3..d8dbb190 100644
--- a/playback/src/player.rs
+++ b/playback/src/player.rs
@@ -950,8 +950,11 @@ impl Future for PlayerInternal {
                             exit(1);
                         }
                     }
-                    Poll::Ready(Err(_)) => {
-                        warn!("Unable to load <{:?}>\nSkipping to next track", track_id);
+                    Poll::Ready(Err(e)) => {
+                        warn!(
+                            "Skipping to next track, unable to load track <{:?}>: {:?}",
+                            track_id, e
+                        );
                         debug_assert!(self.state.is_loading());
                         self.send_event(PlayerEvent::EndOfTrack {
                             track_id,
@@ -1052,7 +1055,7 @@ impl Future for PlayerInternal {
                                             }
                                         }
                                         Err(e) => {
-                                            warn!("Unable to decode samples for track <{:?}: {:?}>\nSkipping to next track", track_id, e);
+                                            warn!("Skipping to next track, unable to decode samples for track <{:?}>: {:?}", track_id, e);
                                             self.send_event(PlayerEvent::EndOfTrack {
                                                 track_id,
                                                 play_request_id,
@@ -1068,11 +1071,7 @@ impl Future for PlayerInternal {
                             self.handle_packet(packet, normalisation_factor);
                         }
                         Err(e) => {
-                            warn!(
-                                "Unable to get packet for track <{:?}: {:?}>\nSkipping to next track",
-								e,
-                                track_id
-                            );
+                            warn!("Skipping to next track, unable to get next packet for track <{:?}>: {:?}", track_id, e);
                             self.send_event(PlayerEvent::EndOfTrack {
                                 track_id,
                                 play_request_id,