LocalId refactoring

Author: devgianlu

api/src/main/java/xyz/gianlu/librespot/api/handlers/PlayerHandler.java

@@ -136,7 +136,7 @@ private static void current(HttpServerExchange exchange, @NotNull Player player)
             obj.add("episode", ProtobufToJson.convert(metadata.episode));
         } else if (id instanceof LocalId) {
             JsonObject metadataObj = new JsonObject();
-            metadataObj.addProperty("name", ((LocalId) id).fileName());
+            metadataObj.addProperty("name", ((LocalId) id).name());
             metadataObj.addProperty("artist", ((LocalId) id).artist());
             metadataObj.addProperty("album", ((LocalId) id).album());
             metadataObj.addProperty("duration", ((LocalId) id).duration());

lib/src/main/java/xyz/gianlu/librespot/audio/MetadataWrapper.java

@@ -92,7 +92,7 @@ public Metadata.ImageGroup getCoverImage() {
     public String getName() {
         if (track != null) return track.getName();
         else if (episode != null) return episode.getName();
-        else return localTrack.fileName();
+        else return localTrack.name();
     }
 
     /**

lib/src/main/java/xyz/gianlu/librespot/metadata/LocalId.java

@@ -63,7 +63,7 @@ public String album() {
     }
 
     @NotNull
-    public String fileName() {
+    public String name() {
         try {
             return URLDecoder.decode(data[2], "UTF-8");
         } catch (UnsupportedEncodingException ex) {

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

@@ -55,7 +55,6 @@
 import xyz.gianlu.librespot.player.state.RestrictionsManager.Action;
 
 import java.io.Closeable;
-import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import java.util.function.Function;
@@ -128,24 +127,6 @@ private static String generateSessionId(@NotNull Random random) {
         return Base64.getEncoder().withoutPadding().encodeToString(bytes);
     }
 
-    private boolean shouldPlay(@Nullable PlayableId id) {
-        if (id == null)
-            return false;
-
-        if (id instanceof UnsupportedId)
-            return false;
-
-        if (id instanceof LocalId) {
-            if (conf.localFilesPath == null)
-                return false;
-
-            File localFile = new File(conf.localFilesPath, ((LocalId) id).fileName()); // FIXME
-            return localFile.exists() && localFile.canRead();
-        }
-
-        return true;
-    }
-
     private boolean shouldPlay(@NotNull ContextTrack track) {
         if (!track.getMetadataOrDefault("force_remove_reasons", "").isEmpty())
             return false;
@@ -154,15 +135,8 @@ private boolean shouldPlay(@NotNull ContextTrack track) {
             if (PlayableId.isDelimiter(track.getUri()))
                 return false;
 
-            if (PlayableId.isLocal(track.getUri())) {
-                if (conf.localFilesPath == null)
-                    return false;
-
-                LocalId id = (LocalId) PlayableId.fromUri(track.getUri());
-                File localFile = new File(conf.localFilesPath, id.fileName()); // FIXME
-                if (!localFile.exists() || !localFile.canRead())
-                    return false;
-            }
+            if (PlayableId.isLocal(track.getUri()))
+                return false;
         }
 
         boolean filterExplicit = "1".equals(session.getUserAttribute("filter-explicit-content"));
@@ -1129,7 +1103,7 @@ synchronized void initializeStart() throws IOException, MercuryClient.MercuryExc
             else state.getOptionsBuilder().setShufflingContext(false); // Must do this directly!
 
             setCurrentTrackIndex(0);
-            if (!shouldPlay(getCurrentPlayable())) {
+            if (!shouldPlay(tracks.get(getCurrentTrackIndex()))) {
                 LOGGER.debug("Cannot play currently selected track, skipping: {}", getCurrentPlayable());
 
                 boolean repeatTrack = isRepeatingTrack();
@@ -1182,7 +1156,7 @@ synchronized void initializeFrom(@NotNull Function<List<ContextTrack>, Integer>
                 LOGGER.warn("Failed updating current track metadata.", ex);
             }
 
-            if (!shouldPlay(getCurrentPlayable())) {
+            if (!shouldPlay(tracks.get(getCurrentTrackIndex()))) {
                 LOGGER.debug("Cannot play currently selected track, skipping: {}", getCurrentPlayable());
 
                 boolean repeatTrack = isRepeatingTrack();

player/src/main/java/xyz/gianlu/librespot/player/playback/PlayerQueueEntry.java

@@ -110,7 +110,7 @@ private void load(boolean preload) throws IOException, Codec.CodecException, Mer
         PlayableContentFeeder.LoadedStream stream;
         if (playable instanceof LocalId)
             stream = PlayableContentFeeder.LoadedStream.forLocalFile((LocalId) playable,
-                    new File(conf.localFilesPath, ((LocalId) playable).fileName()));
+                    new File(conf.localFilesPath, ((LocalId) playable).name()));
         else
             stream = session.contentFeeder().load(playable, new VorbisOnlyAudioQuality(conf.preferredQuality), preload, this);
 
@@ -124,7 +124,7 @@ private void load(boolean preload) throws IOException, Codec.CodecException, Mer
             LOGGER.info("Loaded track. {name: '{}', artists: '{}', duration: {}, uri: {}, id: {}}", metadata.track.getName(),
                     Utils.artistsToString(metadata.track.getArtistList()), metadata.track.getDuration(), playable.toSpotifyUri(), playbackId);
         } else if (playable instanceof LocalId) {
-            LOGGER.info("Loaded local file. {filename: '{}', duration: {}, uri: {}, id: {}}", ((LocalId) playable).fileName(),
+            LOGGER.info("Loaded local file. {filename: '{}', duration: {}, uri: {}, id: {}}", ((LocalId) playable).name(),
                     ((LocalId) playable).duration(), playable.toSpotifyUri(), playbackId);
         }