Add buffering UI notification, reduce log noise when buffering

compenguy · May 24, 2024 · b6f9ee2 · b6f9ee2
1 parent da390db
commit b6f9ee2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/messages.rs b/src/messages.rs
@@ -80,6 +80,7 @@ pub(crate) enum State {
     Disconnected,
     AddStation(String, String),
     Tuned(String),
+    Buffering,
     TrackCaching(Track),
     TrackStarting(Track),
     #[allow(dead_code)]

diff --git a/src/model.rs b/src/model.rs
@@ -642,7 +642,7 @@ impl Model {
             debug!("Track already started.");
         } else {
             debug!("No tracks started yet. Starting next track.");
-            info!(
+            debug!(
                 "playlist length: {} + {} pending",
                 self.playlist_len(),
                 self.pending_len()
@@ -657,7 +657,9 @@ impl Model {
                 self.notify_playing().await?;
                 self.notify_next().await?;
             } else {
-                warn!("requested to start track, but no tracks are ready");
+                debug!("requested to start track, but no tracks are ready");
+                self.publish_state(State::Buffering)
+                    .await?;
             }
         }
         Ok(())

diff --git a/src/term_ui/mod.rs b/src/term_ui/mod.rs
@@ -296,6 +296,28 @@ impl Terminal {
         self.dirty |= true;
     }
 
+    fn update_state_buffering(&mut self) {
+        self.active_track = None;
+        self.siv
+            .call_on_name("playing", |v: &mut Panel<LinearLayout>| {
+                trace!("Playing panel title: buffering");
+                v.set_title(format!("Buffering..."));
+            });
+        self.siv.call_on_name("title", |v: &mut TextView| {
+            debug!("No track, clearing title");
+            v.set_content(String::default());
+        });
+        self.siv.call_on_name("artist", |v: &mut TextView| {
+            debug!("No track, clearing artist");
+            v.set_content(String::default());
+        });
+        self.siv.call_on_name("album", |v: &mut TextView| {
+            debug!("No track, clearing album");
+            v.set_content(String::default());
+        });
+        self.dirty |= true;
+    }
+
     fn update_volume(&mut self, volume: f32) {
         trace!("Updating volume...");
         self.siv.call_on_name("volume", |v: &mut SliderView| {
@@ -325,6 +347,7 @@ impl Terminal {
                 State::Volume(v) => self.update_volume(v),
                 State::Paused(elapsed) => self.update_playing(elapsed, true),
                 State::Stopped(r) => self.update_state_stopped(r),
+                State::Buffering => self.update_state_buffering(),
                 State::TrackCaching(_) => (),
                 State::Muted => (),
                 State::Unmuted => (),