improve playback address search, prevent position interpolation above track length, version 1.1.4

Author: LabyStudio

README.md

@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.LabyStudio:java-spotify-api:1.1.3:all'
+    implementation 'com.github.LabyStudio:java-spotify-api:1.1.4:all'
 }
 ```
 

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'de.labystudio'
-version '1.1.3'
+version '1.1.4'
 
 compileJava {
     sourceCompatibility = '1.8'

src/main/java/de/labystudio/spotifyapi/platform/windows/WinSpotifyAPI.java

@@ -29,6 +29,7 @@ public class WinSpotifyAPI extends AbstractTickSpotifyAPI {
     private long lastTimePositionUpdated;
     private boolean positionKnown = false;
     private long lastAccessorPosition = -1;
+    private long lastTimeSynced;
 
     /**
      * Updates the current track, position and playback state.
@@ -55,6 +56,13 @@ protected void onTick() {
 
             // Handle track changes
             if (!Objects.equals(trackId, this.currentTrack == null ? null : this.currentTrack.getId())) {
+                // Wait two seconds before updating the track, so Spotify has enough time to update the playback
+                if ((!this.hasTrack() || playback.getLength() == this.currentTrack.getLength())
+                        && playback.getPosition() >= this.currentPosition
+                        && System.currentTimeMillis() - this.lastTimeSynced < 2000) {
+                    return;
+                }
+
                 SpotifyTitle title = this.process.getTitle();
                 if (title != SpotifyTitle.UNKNOWN) {
                     int trackLength = playback.getLength();
@@ -91,6 +99,7 @@ protected void onTick() {
 
             // Fire keep alive
             this.listeners.forEach(SpotifyListener::onSync);
+            this.lastTimeSynced = System.currentTimeMillis();
         } catch (Exception exception) {
             // Fire on disconnect
             this.listeners.forEach(listener -> listener.onDisconnect(exception));
@@ -132,7 +141,13 @@ public int getPosition() {
         if (this.isPlaying) {
             // Interpolate position
             long timePassed = System.currentTimeMillis() - this.lastTimePositionUpdated;
-            return this.currentPosition + (int) timePassed;
+            long interpolatedPosition = this.currentPosition + timePassed;
+
+            if (this.hasTrack()) {
+                return (int) Math.min(interpolatedPosition, this.currentTrack.getLength());
+            } else {
+                return (int) interpolatedPosition;
+            }
         } else {
             return this.currentPosition;
         }

src/main/java/de/labystudio/spotifyapi/platform/windows/api/spotify/SpotifyProcess.java

@@ -66,7 +66,15 @@ public SpotifyProcess() {
                 PREFIX_CONTEXT,
                 (address, index) -> {
                     PlaybackAccessor accessor = new PlaybackAccessor(this, address);
-                    return accessor.isValid() && accessor.isPlaying() == isPlaying; // Check if address is valid
+                    boolean valid = accessor.isValid() && accessor.isPlaying() == isPlaying; // Check if address is valid
+
+                    // If valid then pull the data again and check if it is still valid
+                    if (valid) {
+                        accessor.update();
+                        return accessor.isValid();
+                    }
+
+                    return false;
                 }
         );
         if (this.addressPlayBack == -1) {