Clean up

Author: devgianlu

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

@@ -6,6 +6,9 @@
 import xyz.gianlu.librespot.common.proto.Spirc;
 import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.mercury.model.TrackId;
+import xyz.gianlu.librespot.player.tracks.PlaylistProvider;
+import xyz.gianlu.librespot.player.tracks.StationProvider;
+import xyz.gianlu.librespot.player.tracks.TracksProvider;
 import xyz.gianlu.librespot.spirc.FrameListener;
 import xyz.gianlu.librespot.spirc.SpotifyIrc;
 

…u/librespot/player/PlaylistProvider.java …spot/player/tracks/PlaylistProvider.javacore/src/main/java/xyz/gianlu/librespot/player/PlaylistProvider.java renamed to core/src/main/java/xyz/gianlu/librespot/player/tracks/PlaylistProvider.java core/src/main/java/xyz/gianlu/librespot/player/PlaylistProvider.java renamed to core/src/main/java/xyz/gianlu/librespot/player/tracks/PlaylistProvider.java

@@ -1,4 +1,4 @@
-package xyz.gianlu.librespot.player;
+package xyz.gianlu.librespot.player.tracks;
 
 import org.jetbrains.annotations.NotNull;
 import xyz.gianlu.librespot.common.proto.Spirc;
@@ -31,7 +31,7 @@ private static int[] getShuffleExchanges(int size, long seed) {
         return exchanges;
     }
 
-    void shuffleTracks(@NotNull Random random) {
+    public void shuffleTracks(@NotNull Random random) {
         shuffleSeed = random.nextLong();
 
         List<Spirc.TrackRef> tracks = new ArrayList<>(state.getTrackList());
@@ -51,7 +51,7 @@ void shuffleTracks(@NotNull Random random) {
         state.addAllTrack(tracks);
     }
 
-    void unshuffleTracks() {
+    public void unshuffleTracks() {
         List<Spirc.TrackRef> tracks = new ArrayList<>(state.getTrackList());
         if (state.getPlayingTrackIndex() != 0) {
             Collections.swap(tracks, 0, state.getPlayingTrackIndex());

…lu/librespot/player/StationProvider.java …espot/player/tracks/StationProvider.javacore/src/main/java/xyz/gianlu/librespot/player/StationProvider.java renamed to core/src/main/java/xyz/gianlu/librespot/player/tracks/StationProvider.java core/src/main/java/xyz/gianlu/librespot/player/StationProvider.java renamed to core/src/main/java/xyz/gianlu/librespot/player/tracks/StationProvider.java

@@ -1,4 +1,4 @@
-package xyz.gianlu.librespot.player;
+package xyz.gianlu.librespot.player.tracks;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -22,6 +22,7 @@
  */
 public class StationProvider implements TracksProvider {
     private static final Logger LOGGER = Logger.getLogger(StationProvider.class);
+    private static final int LOAD_NEXT_PAGE_THRESHOLD = 3;
     private final MercuryClient mercury;
     private final Spirc.State.Builder state;
     private String nextPageUri;
@@ -38,7 +39,7 @@ public StationProvider(@NotNull Session session, @NotNull Spirc.State.Builder st
     @Override
     public int getNextTrackIndex(boolean consume) {
         int next = state.getPlayingTrackIndex() + 1;
-        if (next >= state.getTrackCount()) {
+        if (next >= state.getTrackCount() - LOAD_NEXT_PAGE_THRESHOLD) {
             try {
                 requestMore();
             } catch (IOException | MercuryClient.MercuryException ex) {
@@ -51,9 +52,7 @@ public int getNextTrackIndex(boolean consume) {
     }
 
     private void requestMore() throws IOException, MercuryClient.MercuryException {
-        if (nextPageUri == null)
-            resolveContext();
-
+        if (nextPageUri == null) resolveContext();
         getNextPage();
     }
 
@@ -70,18 +69,17 @@ private void getNextPage() throws IOException {
         JsonArray tracks = obj.getAsJsonArray("tracks");
         for (JsonElement elm : tracks) {
             JsonObject track = elm.getAsJsonObject();
+            String uri = track.get("uri").getAsString();
             state.addTrack(Spirc.TrackRef.newBuilder()
-                    .setUri(track.get("uri").getAsString())
-                    .setGid(ByteString.copyFrom(TrackId.fromUri(track.get("uri").getAsString()).getGid()))
+                    .setUri(uri)
+                    .setGid(ByteString.copyFrom(TrackId.fromUri(uri).getGid()))
                     .build());
         }
     }
 
     private void resolveContext() throws IOException, MercuryClient.MercuryException {
-        if (!state.hasContextUri()) {
-            LOGGER.fatal("Missing context URI!");
-            return;
-        }
+        if (!state.hasContextUri())
+            throw new IOException("Missing context URI!");
 
         MercuryRequests.ResolvedContextWrapper json = mercury.sendSync(MercuryRequests.resolveContext(state.getContextUri()));
         JsonObject firstPage = json.pages().get(0).getAsJsonObject();

…nlu/librespot/player/TracksProvider.java …respot/player/tracks/TracksProvider.javacore/src/main/java/xyz/gianlu/librespot/player/TracksProvider.java renamed to core/src/main/java/xyz/gianlu/librespot/player/tracks/TracksProvider.java core/src/main/java/xyz/gianlu/librespot/player/TracksProvider.java renamed to core/src/main/java/xyz/gianlu/librespot/player/tracks/TracksProvider.java

@@ -1,4 +1,4 @@
-package xyz.gianlu.librespot.player;
+package xyz.gianlu.librespot.player.tracks;
 
 import org.jetbrains.annotations.NotNull;
 import xyz.gianlu.librespot.mercury.model.TrackId;