Fixes and Optimizations

Send queue update only after completion
Don't test if lyrics are available when not requested
Changed reconnect time to 2 seconds

Author: werwolf2303

src/main/java/com/spotifyxp/deps/xyz/gianlu/librespot/core/Session.java

@@ -1445,7 +1445,7 @@ public void run() {
                         scheduledReconnect = scheduler.schedule(() -> {
                             ConsoleLoggingModules.warning("Socket timed out. Reconnecting...");
                             reconnect();
-                        }, 120 + configuration().connectionTimeout, TimeUnit.SECONDS);
+                        }, configuration().connectionTimeout, TimeUnit.SECONDS);
 
                         TimeProvider.updateWithPing(packet.payload);
 

src/main/java/com/spotifyxp/deps/xyz/gianlu/librespot/player/Player.java

@@ -273,11 +273,13 @@ public void load(@NotNull String uri, boolean play, boolean shuffle) {
 
     public void addToQueue(@NotNull String uri) {
         state.addToQueue(ContextTrack.newBuilder().setUri(uri).build());
-        state.updated();
     }
 
     public void removeFromQueue(@NotNull String uri) {
         state.removeFromQueue(uri);
+    }
+
+    public void updated() {
         state.updated();
     }
 

src/main/java/com/spotifyxp/listeners/PlayerListener.java

@@ -84,24 +84,23 @@ public void onContextChanged(@NotNull Player player, @NotNull String s) {
 
     @Override
     public void onTrackChanged(@NotNull Player player, @NotNull PlayableId playableId, @Nullable MetadataWrapper metadataWrapper, boolean b) {
-        Events.triggerEvent(SpotifyXPEvents.queueUpdate.getName(), playableId.toSpotifyUri());
-        if (!TrackUtils.isTrackLiked(playableId.toSpotifyUri().split(":")[2])) {
-            PlayerArea.heart.isFilled = false;
-            PlayerArea.heart.setImage(Graphics.HEART.getPath());
-        } else {
-            PlayerArea.heart.isFilled = true;
-            PlayerArea.heart.setImage(Graphics.HEARTFILLED.getPath());
-        }
-        if (PlayerArea.playerAreaLyricsButton.isFilled) {
-            PublicValues.lyricsDialog.open(playableId.toSpotifyUri());
-        }
-        if (InstanceManager.getUnofficialSpotifyApi().getLyrics(playableId.toSpotifyUri()) == null) {
-            PlayerArea.playerAreaLyricsButton.getJComponent().setToolTipText("No lyrics found");
-        } else {
-            PlayerArea.playerAreaLyricsButton.getJComponent().setToolTipText(null);
+        try {
+            Events.triggerEvent(SpotifyXPEvents.queueUpdate.getName(), playableId.toSpotifyUri());
+            if (!TrackUtils.isTrackLiked(playableId.toSpotifyUri().split(":")[2])) {
+                PlayerArea.heart.isFilled = false;
+                PlayerArea.heart.setImage(Graphics.HEART.getPath());
+            } else {
+                PlayerArea.heart.isFilled = true;
+                PlayerArea.heart.setImage(Graphics.HEARTFILLED.getPath());
+            }
+            if (PlayerArea.playerAreaLyricsButton.isFilled) {
+                PublicValues.lyricsDialog.open(playableId.toSpotifyUri());
+            }
+            locked = false;
+            Events.triggerEvent(SpotifyXPEvents.playerLockRelease.getName());
+        }catch (Exception e) {
+            ConsoleLogging.Throwable(e);
         }
-        locked = false;
-        Events.triggerEvent(SpotifyXPEvents.playerLockRelease.getName());
     }
 
     @Override

src/main/java/com/spotifyxp/panels/PlayerArea.java

@@ -101,6 +101,7 @@ public void mouseClicked(MouseEvent e) {
                         for (String s : Shuffle.before) {
                             InstanceManager.getSpotifyPlayer().addToQueue(s);
                         }
+                        InstanceManager.getSpotifyPlayer().updated();
                     } catch (Exception e2) {
                         ConsoleLogging.Throwable(e2);
                         GraphicalMessage.openException(e2);
@@ -461,13 +462,6 @@ public void run(Object... data) {
                             playerPlayTime.setText(lastPlayState.playtime);
                             playerPlayTimeTotal.setText(lastPlayState.playtimetotal);
                             InstanceManager.getSpotifyPlayer().load(lastPlayState.uri, false, PublicValues.shuffle);
-                            if (!TrackUtils.isTrackLiked(lastPlayState.uri.split(":")[2])) {
-                                heart.isFilled = false;
-                                heart.setImage(Graphics.HEART.getPath());
-                            } else {
-                                heart.isFilled = true;
-                                heart.setImage(Graphics.HEARTFILLED.getPath());
-                            }
                             InstanceManager.getSpotifyPlayer().seek(lastPlayState.playerslider * 1000);
                             playerAreaVolumeSlider.setValue(Integer.parseInt(lastPlayState.playervolume));
                             doneLastParsing = true;
@@ -478,6 +472,7 @@ public void run(Object... data) {
                                 for (String s : lastPlayState.history) {
                                     InstanceManager.getSpotifyPlayer().addToQueue(s);
                                 }
+                                InstanceManager.getSpotifyPlayer().updated();
                             } catch (Exception ignored) {
                                 ConsoleLogging.warning("Failed to restore player history");
                             }
@@ -488,6 +483,7 @@ public void run(Object... data) {
                                 for (String s : lastPlayState.queue) {
                                     InstanceManager.getSpotifyPlayer().addToQueue(s);
                                 }
+                                InstanceManager.getSpotifyPlayer().updated();
                             } catch (Exception ignored) {
                                 ConsoleLogging.warning("Failed to restore player queue");
                             }

src/main/java/com/spotifyxp/utils/PlayerUtils.java

@@ -126,6 +126,7 @@ public Player buildPlayer() {
                 .setLocalFilesPath(new File(PublicValues.fileslocation))
                 .build();
         Session.Configuration.Builder configurationBuilder = new Session.Configuration.Builder()
+                .setConnectionTimeout(2)
                 .setCacheDir(new File(PublicValues.fileslocation, "cache"))
                 .setStoredCredentialsFile(new File(PublicValues.fileslocation, "credentials.json"));
         if(PublicValues.config.getBoolean(ConfigValues.cache_disabled.name)) {

src/main/java/com/spotifyxp/utils/Shuffle.java

@@ -37,6 +37,7 @@ public static void makeShuffle() {
             for (String s : mixed) {
                 InstanceManager.getSpotifyPlayer().addToQueue(s);
             }
+            InstanceManager.getSpotifyPlayer().updated();
         } catch (Exception e) {
             ConsoleLogging.Throwable(e);
             GraphicalMessage.openException(e);