Some refactoring

Author: devgianlu

core/src/main/java/xyz/gianlu/librespot/player/Player.java

@@ -490,6 +490,9 @@ private void loadAutoplay() {
             } else if (resp.statusCode == 204) {
                 MercuryRequests.StationsWrapper station = session.mercury().sendSync(MercuryRequests.getStationFor(context));
                 state.loadStation(station);
+
+                state.setPositionMs(0);
+                state.setPositionMeasuredAt(TimeProvider.currentTimeMillis());
                 loadTrack(true);
 
                 LOGGER.debug(String.format("Loading context for autoplay (using radio-apollo), uri: %s", state.getContextUri()));

core/src/main/java/xyz/gianlu/librespot/player/StateWrapper.java

@@ -18,7 +18,7 @@
 import xyz.gianlu.librespot.player.remote.Remote3Page;
 import xyz.gianlu.librespot.player.remote.Remote3Track;
 import xyz.gianlu.librespot.player.tracks.PlayablesProvider;
-import xyz.gianlu.librespot.player.tracks.PlaylistProvider;
+import xyz.gianlu.librespot.player.tracks.ShuffleableProvider;
 import xyz.gianlu.librespot.player.tracks.StationProvider;
 import xyz.gianlu.librespot.spirc.SpotifyIrc;
 
@@ -80,31 +80,31 @@ boolean isStatus(@NotNull Spirc.PlayStatus status) {
 
     void setShuffle(boolean shuffle) {
         state.setShuffle(shuffle && (playablesProvider == null || playablesProvider.canShuffle()));
-        if (state.getShuffle()) shuffleTracks(false);
-        else unshuffleTracks();
+        if (state.getShuffle()) shuffleContent(false);
+        else unshuffleContent();
     }
 
     private void loadPlayablesProvider(@NotNull String uri) throws SpotifyContext.UnsupportedContextException {
         SpotifyContext context = SpotifyContext.from(uri);
         playablesProvider = context.initProvider(session, state);
     }
 
-    private void shuffleTracks(boolean fully) {
+    private void shuffleContent(boolean fully) {
         if (playablesProvider == null) return;
 
-        if (playablesProvider.canShuffle() && playablesProvider instanceof PlaylistProvider)
-            ((PlaylistProvider) playablesProvider).shuffleTracks(session.random(), fully);
+        if (playablesProvider.canShuffle() && playablesProvider instanceof ShuffleableProvider)
+            ((ShuffleableProvider) playablesProvider).shuffleContent(session.random(), fully);
         else
-            LOGGER.warn("Cannot shuffle TracksProvider: " + playablesProvider);
+            LOGGER.warn("Cannot shuffle provider: " + playablesProvider);
     }
 
-    private void unshuffleTracks() {
+    private void unshuffleContent() {
         if (playablesProvider == null) return;
 
-        if (playablesProvider.canShuffle() && playablesProvider instanceof PlaylistProvider)
-            ((PlaylistProvider) playablesProvider).unshuffleTracks();
+        if (playablesProvider.canShuffle() && playablesProvider instanceof ShuffleableProvider)
+            ((ShuffleableProvider) playablesProvider).unshuffleContent();
         else
-            LOGGER.warn("Cannot unshuffle TracksProvider: " + playablesProvider);
+            LOGGER.warn("Cannot unshuffle provider: " + playablesProvider);
     }
 
     void updated() {
@@ -163,9 +163,9 @@ int getTrackCount() {
     void loadStation(@NotNull MercuryRequests.StationsWrapper station) throws SpotifyContext.UnsupportedContextException {
         state.setContextUri(station.uri());
 
-        state.setPlayingTrackIndex(0);
         state.clearTrack();
         state.addAllTrack(station.tracks());
+        state.setPlayingTrackIndex(0);
         SpotifyIrc.trimTracks(state);
 
         loadPlayablesProvider(station.uri());
@@ -228,7 +228,7 @@ private void loadPage(@NotNull Remote3Page page, @Nullable TrackSelector selecto
         state.setPlayingTrackIndex(selector == null ? 0 : selector.playingIndex());
         SpotifyIrc.trimTracks(state);
 
-        if (state.getShuffle()) shuffleTracks(selector == null || !selector.findMatch());
+        if (state.getShuffle()) shuffleContent(selector == null || !selector.findMatch());
     }
 
     void load(@NotNull Remote3Frame frame) throws IOException, MercuryClient.MercuryException, SpotifyContext.UnsupportedContextException {

core/src/main/java/xyz/gianlu/librespot/player/tracks/PlayablesProvider.java

@@ -13,7 +13,7 @@
  */
 public interface PlayablesProvider {
 
-    static int getPrevTrackIndex(Spirc.State.Builder state) {
+    static int getPrevTrackIndex(@NotNull Spirc.State.Builder state) {
         List<Spirc.TrackRef> queueTracks = new ArrayList<>();
         Iterator<Spirc.TrackRef> iter = state.getTrackList().iterator();
         while (iter.hasNext()) {

core/src/main/java/xyz/gianlu/librespot/player/tracks/PlaylistProvider.java

@@ -20,7 +20,7 @@
 /**
  * @author Gianlu
  */
-public class PlaylistProvider implements PlayablesProvider {
+public class PlaylistProvider implements PlayablesProvider, ShuffleableProvider {
     private static final Logger LOGGER = Logger.getLogger(PlaylistProvider.class);
     private final Spirc.State.Builder state;
     private final MercuryClient mercury;
@@ -41,7 +41,8 @@ private static int[] getShuffleExchanges(int size, long seed) {
         return exchanges;
     }
 
-    public void shuffleTracks(@NotNull Random random, boolean fully) {
+    @Override
+    public void shuffleContent(@NotNull Random random, boolean fully) {
         if (state.getTrackCount() <= 1)
             return;
 
@@ -71,7 +72,8 @@ public void shuffleTracks(@NotNull Random random, boolean fully) {
         LOGGER.trace("Shuffled, seed: " + shuffleSeed);
     }
 
-    public void unshuffleTracks() {
+    @Override
+    public void unshuffleContent() {
         if (state.getTrackCount() <= 1)
             return;
 

core/src/main/java/xyz/gianlu/librespot/player/tracks/ShuffleableProvider.java

@@ -0,0 +1,14 @@
+package xyz.gianlu.librespot.player.tracks;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Random;
+
+/**
+ * @author Gianlu
+ */
+public interface ShuffleableProvider {
+    void shuffleContent(@NotNull Random random, boolean fully);
+
+    void unshuffleContent();
+}