Merge pull request #38 from adamint/dev

Request caching, custom HTTP library

Author: adamint

README.md

@@ -22,13 +22,13 @@ This library is available via Maven Central.
 <dependency>
     <groupId>com.adamratzman</groupId>
     <artifactId>spotify-api-kotlin</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
 </dependency>
 ```
 
 ### Gradle
 ```
-compile group: 'com.adamratzman', name: 'spotify-api-kotlin', version: '2.0.0'
+compile group: 'com.adamratzman', name: 'spotify-api-kotlin', version: '2.0.1'
 ```
 
 To use the latest snapshot instead, you must add the Jitpack repository

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'com.adamratzman'
-version '2.0.0'
+version '2.0.1'
 
 archivesBaseName = 'spotify-api-kotlin'
 
@@ -21,7 +21,6 @@ repositories {
 dependencies {
     // Actual library dependencies
     implementation(group: 'org.json', name: 'json', version: '20180130')
-    implementation('org.jsoup:jsoup:1.10.3')
     implementation("com.google.code.gson:gson:2.8.1")
 
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.11"

src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPlayerAPI.kt

@@ -30,26 +30,37 @@ import java.util.function.Supplier
 class ClientPlayerAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     fun getDevices(): SpotifyRestAction<List<Device>> {
         return toAction(Supplier {
-            get(EndpointBuilder("/me/player/devices").toString()).toInnerObject("devices", api, Device::class.java)
+            get(EndpointBuilder("/me/player/devices").toString()).toInnerObject(
+                "devices",
+                api,
+                mutableListOf<Device>().javaClass
+            ).toList()
         })
     }
 
     fun getCurrentContext(): SpotifyRestAction<CurrentlyPlayingContext?> {
         return toAction(Supplier {
-            val obj: CurrentlyPlayingContext? = get(EndpointBuilder("/me/player").toString()).toObject(api, CurrentlyPlayingContext::class.java)
+            val obj: CurrentlyPlayingContext? =
+                get(EndpointBuilder("/me/player").toString()).toObject(api, CurrentlyPlayingContext::class.java)
             if (obj?.timestamp == null) null else obj
         })
     }
 
     fun getRecentlyPlayed(): SpotifyRestPagingAction<PlayHistory, CursorBasedPagingObject<PlayHistory>> {
         return toPagingObjectAction(Supplier {
-            get(EndpointBuilder("/me/player/recently-played").toString()).toCursorBasedPagingObject(endpoint = this, tClazz = PlayHistory::class.java)
+            get(EndpointBuilder("/me/player/recently-played").toString()).toCursorBasedPagingObject(
+                endpoint = this,
+                tClazz = PlayHistory::class.java
+            )
         })
     }
 
     fun getCurrentlyPlaying(): SpotifyRestAction<CurrentlyPlayingObject?> {
         return toAction(Supplier {
-            val obj: CurrentlyPlayingObject? = get(EndpointBuilder("/me/player/currently-playing").toString()).toObject(api, CurrentlyPlayingObject::class.java)
+            val obj: CurrentlyPlayingObject? = get(EndpointBuilder("/me/player/currently-playing").toString()).toObject(
+                api,
+                CurrentlyPlayingObject::class.java
+            )
             if (obj?.timestamp == null) null else obj
         })
     }
@@ -64,22 +75,37 @@ class ClientPlayerAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     fun seekPosition(positionMs: Long, deviceId: String? = null): SpotifyRestAction<Unit> {
         return toAction(Supplier {
             if (positionMs < 0) throw IllegalArgumentException("Position must not be negative!")
-            put(EndpointBuilder("/me/player/seek").with("position_ms", positionMs).with("device_id", deviceId).toString())
+            put(
+                EndpointBuilder("/me/player/seek").with("position_ms", positionMs).with(
+                    "device_id",
+                    deviceId
+                ).toString()
+            )
             Unit
         })
     }
 
     fun setRepeatMode(state: PlayerRepeatState, deviceId: String? = null): SpotifyRestAction<Unit> {
         return toAction(Supplier {
-            put(EndpointBuilder("/me/player/repeat").with("state", state.toString().toLowerCase()).with("device_id", deviceId).toString())
+            put(
+                EndpointBuilder("/me/player/repeat").with("state", state.toString().toLowerCase()).with(
+                    "device_id",
+                    deviceId
+                ).toString()
+            )
             Unit
         })
     }
 
     fun setVolume(volume: Int, deviceId: String? = null): SpotifyRestAction<Unit> {
         if (volume !in 0..100) throw IllegalArgumentException("Volume must be within 0 to 100 inclusive. Provided: $volume")
         return toAction(Supplier {
-            put(EndpointBuilder("/me/player/volume").with("volume_percent", volume).with("device_id", deviceId).toString())
+            put(
+                EndpointBuilder("/me/player/volume").with("volume_percent", volume).with(
+                    "device_id",
+                    deviceId
+                ).toString()
+            )
             Unit
         })
     }
@@ -162,8 +188,10 @@ class ClientPlayerAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     fun transferPlayback(vararg deviceId: String, play: Boolean = true): SpotifyRestAction<Unit> {
         if (deviceId.size > 1) throw IllegalArgumentException("Although an array is accepted, only a single device_id is currently supported. Supplying more than one will  400 Bad Request")
         return toAction(Supplier {
-            put(EndpointBuilder("/me/player").with("device_ids", deviceId.joinToString(",") { it.encode() })
-                    .with("play", play).toString())
+            put(
+                EndpointBuilder("/me/player").with("device_ids", deviceId.joinToString(",") { it.encode() })
+                    .with("play", play).toString()
+            )
             Unit
         })
     }

src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPlaylistAPI.kt

@@ -265,10 +265,34 @@ class ClientPlaylistAPI(api: SpotifyAPI) : PlaylistsAPI(api) {
         })
     }
 
-    /*
-    private fun removePlaylistTracks(
+    fun removePlaylistTrack(
+        playlist: String,
+        track: String,
+        positions: SpotifyTrackPositions,
+        snapshotId: String? = null
+    ) = removePlaylistTracks(playlist, track to positions, snapshotId = snapshotId)
+
+    fun removePlaylistTrack(
         playlist: String,
-        tracks: List<Pair<TrackURI, SpotifyTrackPositions?>>,
+        track: String,
+        snapshotId: String? = null
+    ) = removePlaylistTracks(playlist, track, snapshotId = snapshotId)
+
+    fun removePlaylistTracks(
+        playlist: String,
+        vararg tracks: String,
+        snapshotId: String? = null
+    ) = removePlaylistTracksImpl(playlist, tracks.map { it to null }.toTypedArray(), snapshotId)
+
+    fun removePlaylistTracks(
+        playlist: String,
+        vararg tracks: Pair<String, SpotifyTrackPositions>,
+        snapshotId: String? = null
+    ) = removePlaylistTracksImpl(playlist, tracks.toList().toTypedArray(), snapshotId)
+
+    private fun removePlaylistTracksImpl(
+        playlist: String,
+        tracks: Array<Pair<String, SpotifyTrackPositions?>>,
         snapshotId: String?
     ): SpotifyRestAction<String> {
         return toAction(Supplier {
@@ -277,17 +301,14 @@ class ClientPlaylistAPI(api: SpotifyAPI) : PlaylistsAPI(api) {
             val json = JSONObject().also { if (snapshotId != null) it.put("snapshot_id", snapshotId) }
 
             tracks.map { (track, positions) ->
-                JSONObject().put("uri", track.uri)
+                JSONObject().put("uri", TrackURI(track).uri)
                     .also { if (positions?.positions?.isNotEmpty() == true) it.put("positions", positions.positions) }
             }.let { json.put("tracks", JSONArray(it)) }
-
             delete(
-                EndpointBuilder("/playlists/${PlaylistURI(playlist).id}/tracks").toString(), data = listOf(
-                    "tracks" to json.toString()
-                )
+                EndpointBuilder("/playlists/${PlaylistURI(playlist).id}/tracks").toString(), body = json.toString()
             )
         })
-    }*/
+    }
 
     /*
     fun removeAllOccurances(user: String, playlist: String, vararg tracks: String): SpotifyRestAction<Unit> {

src/main/kotlin/com/adamratzman/spotify/endpoints/public/BrowseAPI.kt

@@ -20,6 +20,7 @@ import com.adamratzman.spotify.utils.SpotifyCategory
 import com.adamratzman.spotify.utils.SpotifyEndpoint
 import com.adamratzman.spotify.utils.TrackURI
 import com.adamratzman.spotify.utils.encode
+import com.adamratzman.spotify.utils.map
 import com.adamratzman.spotify.utils.toObject
 import com.adamratzman.spotify.utils.toPagingObject
 import org.json.JSONObject