From ddc572b405317da4bc871d0acb796a7ae9708ed0 Mon Sep 17 00:00:00 2001
From: talwat <83217276+talwat@users.noreply.github.com>
Date: Wed, 16 Oct 2024 12:54:03 +0200
Subject: [PATCH] fix: refine loading indicator

---
 src/player.rs    | 24 ++++++++++++++----------
 src/player/ui.rs |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/player.rs b/src/player.rs
index b555759..b07a910 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -219,16 +219,28 @@ impl Player {
     }
 
     /// This will play the next track, as well as refilling the buffer in the background.
+    ///
+    /// This will also set `current` to the newly loaded song.
     pub async fn next(&self) -> eyre::Result<tracks::Decoded> {
         let track = match self.tracks.write().await.pop_front() {
             Some(x) => x,
             // If the queue is completely empty, then fallback to simply getting a new track.
             // This is relevant particularly at the first song.
-            None => self.list.random(&self.client).await?,
+            None => {
+                // Serves as an indicator that the queue is "loading".
+                // We're doing it here so that we don't get the "loading" display
+                // for only a frame in the other case that the buffer is not empty.
+                self.current.store(None);
+
+                self.list.random(&self.client).await?
+            }
         };
 
         let decoded = track.decode()?;
 
+        // Set the current track.
+        self.set_current(decoded.info.clone()).await?;
+
         Ok(decoded)
     }
 
@@ -243,9 +255,6 @@ impl Player {
         itx: Sender<()>,
         tx: Sender<Messages>,
     ) -> eyre::Result<()> {
-        // Serves as an indicator that the queue is "loading".
-        player.current.store(None);
-
         // Stop the sink.
         player.sink.stop();
 
@@ -253,12 +262,7 @@ impl Player {
 
         match track {
             Ok(track) => {
-                // Set the current track.
-                player.set_current(track.info.clone()).await?;
-
-                // Actually start playing it, this is done later so that the amount
-                // or times where "loading" appears briefly even though the track is
-                // from the buffer is minimized.
+                // Start playing the new track.
                 player.sink.append(track.data);
 
                 // Notify the background downloader that there's an empty spot
diff --git a/src/player/ui.rs b/src/player/ui.rs
index ec89027..a2de40c 100644
--- a/src/player/ui.rs
+++ b/src/player/ui.rs
@@ -89,7 +89,7 @@ async fn interface(player: Arc<Player>, minimalist: bool) -> eyre::Result<()> {
             vec![action, middle, controls]
         };
 
-        // Formats the menu properly
+        // Formats the menu properly.
         let menu: Vec<String> = menu
             .into_iter()
             .map(|x| format!("│ {} │\r\n", x.reset()).to_string())