Merge pull request #12 from adamint/develop

add options to getSavedAlbums, update kotlin version

Author: adamint

build.gradle

@@ -2,7 +2,7 @@ group 'com.adamratzman'
 version '1.0.3'
 
 buildscript {
-    ext.kotlin_version = '1.2.51'
+    ext.kotlin_version = '1.2.61'
 
     repositories {
         mavenCentral()

src/main/kotlin/com/adamratzman/spotify/endpoints/priv/library/ClientLibraryAPI.kt

@@ -25,9 +25,10 @@ class ClientLibraryAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      *
      * @return Paging Object of [SavedAlbum] ordered by position in library
      */
-    fun getSavedAlbums(): SpotifyRestAction<PagingObject<SavedAlbum>> {
+    fun getSavedAlbums(limit: Int? = null, offset: Int? = null, market: Market? = null): SpotifyRestAction<PagingObject<SavedAlbum>> {
         return toAction(Supplier {
-            get(EndpointBuilder("/me/albums").build()).toPagingObject<SavedAlbum>(endpoint = this)
+            get(EndpointBuilder("/me/albums").with("limit", limit).with("offset", offset).with("market", market?.code)
+                    .build()).toPagingObject<SavedAlbum>(endpoint = this)
         })
     }
 

src/main/kotlin/com/adamratzman/spotify/utils/Endpoints.kt

@@ -0,0 +1,72 @@
+package com.adamratzman.spotify.utils
+
+import com.adamratzman.spotify.main.SpotifyAPI
+import com.adamratzman.spotify.main.SpotifyClientAPI
+import com.adamratzman.spotify.main.base
+import org.json.JSONObject
+import org.jsoup.Connection
+import org.jsoup.Jsoup
+import java.util.function.Supplier
+
+abstract class SpotifyEndpoint(val api: SpotifyAPI) {
+    fun get(url: String): String {
+        return execute(url)
+    }
+
+    fun post(url: String, body: String? = null): String {
+        return execute(url, body, Connection.Method.POST)
+    }
+
+    fun put(url: String, body: String? = null, contentType: String? = null): String {
+        return execute(url, body, Connection.Method.PUT, contentType = contentType)
+    }
+
+    fun delete(url: String, body: String? = null, data: List<Pair<String, String>>? = null, contentType: String? = null): String {
+        return execute(url, body, Connection.Method.DELETE, data = data, contentType = contentType)
+    }
+
+    private fun execute(url: String, body: String? = null, method: Connection.Method = Connection.Method.GET,
+                        retry202: Boolean = true, contentType: String? = null, data: List<Pair<String, String>>? = null): String {
+        if (api !is SpotifyClientAPI && System.currentTimeMillis() >= api.expireTime) {
+            api.refreshClient()
+            api.expireTime = System.currentTimeMillis() + api.token.expires_in * 1000
+        }
+        var connection = Jsoup.connect(url).ignoreContentType(true)
+        data?.forEach { connection.data(it.first, it.second) }
+        if (contentType != null) connection.header("Content-Type", contentType)
+        if (body != null) {
+            if (contentType != null) connection.requestBody(body)
+            else
+                connection = if (method == Connection.Method.DELETE) {
+                    val key = JSONObject(body).keySet().toList()[0]
+                    connection.data(key, JSONObject(body).getJSONArray(key).toString())
+                } else connection.requestBody(body)
+        }
+        connection = connection.header("Authorization", "Bearer ${api.token.access_token}")
+        val document = connection.method(method).ignoreHttpErrors(true).execute()
+        if (document.statusCode() / 200 != 1 /* Check if status is 2xx */) throw BadRequestException(api.gson.fromJson(document.body(), ErrorResponse::class.java).error)
+        else if (document.statusCode() == 202 && retry202) return execute(url, body, method, false)
+        return document.body()
+    }
+
+    fun <T> toAction(supplier: Supplier<T>) = SpotifyRestAction(api, supplier)
+}
+
+internal class EndpointBuilder(val path: String) {
+    val builder = StringBuilder(base)
+
+    init {
+        builder.append(path)
+    }
+
+    fun with(key: String, value: Any?): EndpointBuilder {
+        if (value != null && (value !is String || value.isNotEmpty())) {
+            if (builder.toString() == base + path) builder.append("?")
+            else builder.append("&")
+            builder.append(key).append("=").append(value.toString())
+        }
+        return this
+    }
+
+    fun build() = builder.toString()
+}

src/main/kotlin/com/adamratzman/spotify/utils/Helpers.kt

@@ -1,80 +1,13 @@
 package com.adamratzman.spotify.utils
 
 import com.adamratzman.spotify.main.SpotifyAPI
-import com.adamratzman.spotify.main.SpotifyClientAPI
-import com.adamratzman.spotify.main.base
 import com.google.gson.Gson
 import org.json.JSONObject
-import org.jsoup.Connection
-import org.jsoup.Jsoup
 import java.io.InvalidObjectException
 import java.net.URLEncoder
 import java.util.*
 import java.util.function.Supplier
 
-abstract class SpotifyEndpoint(val api: SpotifyAPI) {
-    fun get(url: String): String {
-        return execute(url)
-    }
-
-    fun post(url: String, body: String? = null): String {
-        return execute(url, body, Connection.Method.POST)
-    }
-
-    fun put(url: String, body: String? = null, contentType: String? = null): String {
-        return execute(url, body, Connection.Method.PUT, contentType = contentType)
-    }
-
-    fun delete(url: String, body: String? = null, data: List<Pair<String, String>>? = null, contentType: String? = null): String {
-        return execute(url, body, Connection.Method.DELETE, data = data, contentType = contentType)
-    }
-
-    private fun execute(url: String, body: String? = null, method: Connection.Method = Connection.Method.GET,
-                        retry202: Boolean = true, contentType: String? = null, data: List<Pair<String, String>>? = null): String {
-        if (api !is SpotifyClientAPI && System.currentTimeMillis() >= api.expireTime) {
-            api.refreshClient()
-            api.expireTime = System.currentTimeMillis() + api.token.expires_in * 1000
-        }
-        var connection = Jsoup.connect(url).ignoreContentType(true)
-        data?.forEach { connection.data(it.first, it.second) }
-        if (contentType != null) connection.header("Content-Type", contentType)
-        if (body != null) {
-            if (contentType != null) connection.requestBody(body)
-            else
-                connection = if (method == Connection.Method.DELETE) {
-                    val key = JSONObject(body).keySet().toList()[0]
-                    connection.data(key, JSONObject(body).getJSONArray(key).toString())
-                } else connection.requestBody(body)
-        }
-        connection = connection.header("Authorization", "Bearer ${api.token.access_token}")
-        val document = connection.method(method).ignoreHttpErrors(true).execute()
-        if (document.statusCode() / 200 != 1 /* Check if status is 2xx */) throw BadRequestException(api.gson.fromJson(document.body(), ErrorResponse::class.java).error)
-        else if (document.statusCode() == 202 && retry202) return execute(url, body, method, false)
-        return document.body()
-    }
-
-    fun <T> toAction(supplier: Supplier<T>) = SpotifyRestAction(api, supplier)
-}
-
-internal class EndpointBuilder(val path: String) {
-    val builder = StringBuilder(base)
-
-    init {
-        builder.append(path)
-    }
-
-    fun with(key: String, value: Any?): EndpointBuilder {
-        if (value != null && (value !is String || value.isNotEmpty())) {
-            if (builder.toString() == base + path) builder.append("?")
-            else builder.append("&")
-            builder.append(key).append("=").append(value.toString())
-        }
-        return this
-    }
-
-    fun build() = builder.toString()
-}
-
 data class CursorBasedPagingObject<out T>(val href: String, val items: List<T>, val limit: Int, val next: String?, val cursors: Cursor,
                                           val total: Int, val endpoint: SpotifyEndpoint) {
     inline fun <reified T> getNext(): SpotifyRestAction<CursorBasedPagingObject<T>> = endpoint.toAction(