Added shortcut API endpoint without metadata type (#149)

Author: devgianlu

api/README.md

@@ -22,6 +22,7 @@ All the endpoints will respond with `200` if successful or:
 
 ### Metadata
 - `POST \metadata\{type}\{uri}` Retrieve metadata. `type` can be one of `episode`, `track`, `album`, `show`, `artist` or `playlist`, `uri` is the standard Spotify uri.
+- `POST \metadata\{uri}` Retrieve metadata. `uri` is the standard Spotify uri, the type will be guessed based on the provided uri.
 
 ### Search
 - `POST \search\{query}` Make a search.
@@ -50,3 +51,5 @@ The currently available events are:
 `curl -X POST -d "uri=spotify:track:xxxxxxxxxxxxxxxxxxxxxx&play=true" http://localhost:24879/player/load`
 
 `curl -X POST http://localhost:24879/metadata/track/spotify:track:xxxxxxxxxxxxxxxxxxxxxx`
+
+`curl -X POST http://localhost:24879/metadata/spotify:track:xxxxxxxxxxxxxxxxxxxxxx`

api/src/main/java/xyz/gianlu/librespot/api/ApiServer.java

@@ -24,7 +24,8 @@ public ApiServer(@NotNull ApiConfiguration conf, @NotNull SessionWrapper wrapper
 
         handler = new RoutingHandler();
         handler.post("/player/{cmd}", new PlayerHandler(wrapper))
-                .post("/metadata/{type}/{uri}", new MetadataHandler(wrapper))
+                .post("/metadata/{type}/{uri}", new MetadataHandler(wrapper, true))
+                .post("/metadata/{uri}", new MetadataHandler(wrapper, false))
                 .post("/search/{query}", new SearchHandler(wrapper))
                 .post("/token/{scope}", new TokensHandler(wrapper))
                 .get("/events", events);

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

@@ -24,9 +24,11 @@
  */
 public final class MetadataHandler extends AbsSessionHandler {
     private static final Logger LOGGER = Logger.getLogger(MetadataHandler.class);
+    private final boolean needsType;
 
-    public MetadataHandler(@NotNull SessionWrapper wrapper) {
+    public MetadataHandler(@NotNull SessionWrapper wrapper, boolean needsType) {
         super(wrapper);
+        this.needsType = needsType;
     }
 
     @Override
@@ -38,24 +40,30 @@ public void handleRequest(@NotNull HttpServerExchange exchange, @NotNull Session
         }
 
         Map<String, Deque<String>> params = Utils.readParameters(exchange);
+        String uri = Utils.getFirstString(params, "uri");
+        if (uri == null) {
+            Utils.invalidParameter(exchange, "uri");
+            return;
+        }
+
+        MetadataType type;
         String typeStr = Utils.getFirstString(params, "type");
         if (typeStr == null) {
-            Utils.invalidParameter(exchange, "type");
-            return;
+            if (needsType) {
+                Utils.invalidParameter(exchange, "type");
+                return;
+            }
+
+            type = MetadataType.guessTypeFromUri(uri);
+        } else {
+            type = MetadataType.parse(typeStr);
         }
 
-        MetadataType type = MetadataType.parse(typeStr);
         if (type == null) {
             Utils.invalidParameter(exchange, "type");
             return;
         }
 
-        String uri = Utils.getFirstString(params, "uri");
-        if (uri == null) {
-            Utils.invalidParameter(exchange, "uri");
-            return;
-        }
-
         try {
             JsonObject obj = handle(session, type, uri);
             exchange.getResponseSender().send(obj.toString());
@@ -126,5 +134,14 @@ private static MetadataType parse(@NotNull String val) {
 
             return null;
         }
+
+        @Nullable
+        public static MetadataType guessTypeFromUri(@NotNull String uri) {
+            for (MetadataType type : values())
+                if (uri.contains(type.val))
+                    return type;
+
+            return null;
+        }
     }
 }