line

adamint · adamint · commit 65a863c640b2 · 2019-11-04T12:32:48.000-05:00
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/SpotifyRestAction.kt b/src/commonMain/kotlin/com.adamratzman.spotify/SpotifyRestAction.kt
@@ -5,6 +5,9 @@ import com.adamratzman.spotify.models.AbstractPagingObject
 import com.adamratzman.spotify.utils.TimeUnit
 import com.adamratzman.spotify.utils.getCurrentTimeMs
 import com.adamratzman.spotify.utils.schedule
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlin.coroutines.suspendCoroutine
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -18,9 +21,6 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
 
 /**
  * Provides a uniform interface to retrieve, whether synchronously or asynchronously, [T] from Spotify
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/models/PagingObjects.kt b/src/commonMain/kotlin/com.adamratzman.spotify/models/PagingObjects.kt
@@ -241,7 +241,6 @@ abstract class AbstractPagingObject<T : Any>(
     private fun getNextImpl() = getImpl(PagingTraversalType.FORWARDS)
     private fun getPreviousImpl() = getImpl(PagingTraversalType.BACKWARDS)
 
-
     fun getNext(): AbstractPagingObject<T>? = getNextImpl()
     fun getPrevious(): AbstractPagingObject<T>? = getPreviousImpl()
 
@@ -282,12 +281,11 @@ abstract class AbstractPagingObject<T : Any>(
 
     @ExperimentalCoroutinesApi
     fun flowEndOrdered(): Flow<AbstractPagingObject<T>> = flowForward()
-
 }
 
 internal fun Any.instantiatePagingObjects(spotifyApi: SpotifyApi) = when (this) {
-     is FeaturedPlaylists -> this.playlists
+    is FeaturedPlaylists -> this.playlists
     is Album -> this.tracks
-     is Playlist -> this.tracks
+    is Playlist -> this.tracks
     else -> null
-}.let { it?.endpoint = spotifyApi.tracks; this }
+}.let { it?.endpoint = spotifyApi.tracks; this }
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/models/ResultObjects.kt b/src/commonMain/kotlin/com.adamratzman.spotify/models/ResultObjects.kt
@@ -122,5 +122,4 @@ class SpotifyUriException(message: String) : SpotifyException.BadRequestExceptio
 class SpotifyRatelimitedException(time: Long) :
     SpotifyException.UnNullableException("Calls to the Spotify API have been ratelimited for $time seconds until ${getCurrentTimeMs() + time * 1000}ms")
 
-
 typealias CountryCode = Market
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/models/SpotifyUris.kt b/src/commonMain/kotlin/com.adamratzman.spotify/models/SpotifyUris.kt
@@ -106,7 +106,7 @@ sealed class SpotifyUri(val input: String, type: String) {
          *     SpotifyUri.isType<UserUri>("spotify:track:abc") // returns: false
          * ```
          * */
-        inline fun <reified T: SpotifyUri> isType(input: String): Boolean {
+        inline fun <reified T : SpotifyUri> isType(input: String): Boolean {
             return safeInitiate(input, ::invoke)?.let { it is T } ?: false
         }
 
@@ -119,7 +119,7 @@ sealed class SpotifyUri(val input: String, type: String) {
          *     SpotifyUri.canBeType<UserUri>("spotify:track:abc") // returns: false
          * ```
          * */
-        inline fun <reified T: SpotifyUri> canBeType(input: String): Boolean {
+        inline fun <reified T : SpotifyUri> canBeType(input: String): Boolean {
             return isType<T>(input) || !input.contains(':')
         }
     }
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/utils/Base64.kt b/src/commonMain/kotlin/com.adamratzman.spotify/utils/Base64.kt
@@ -1,3 +1,4 @@
+/* Spotify Web API - Kotlin Wrapper; MIT License, 2019; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
 import kotlinx.io.core.String
@@ -33,4 +34,4 @@ fun encodeToBase64(src: ByteArray): ByteArray {
     return result.toByteArray()
 }
 
-fun String.encodeToBase64() = String(encodeToBase64(toByteArray()))
+fun String.encodeToBase64() = String(encodeToBase64(toByteArray()))
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/private/ClientFollowingAPITest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/private/ClientFollowingAPITest.kt
@@ -4,13 +4,13 @@ package com.adamratzman.spotify.private
 import com.adamratzman.spotify.SpotifyClientAPI
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.api
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class ClientFollowingAPITest : Spek({
     describe("Client following tests") {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/private/ClientLibraryAPITest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/private/ClientLibraryAPITest.kt
@@ -5,11 +5,11 @@ import com.adamratzman.spotify.SpotifyClientAPI
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.api
 import com.adamratzman.spotify.endpoints.client.LibraryType
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class ClientLibraryAPITest : Spek({
     describe("Client Library tests") {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/private/ClientPlaylistAPITest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/private/ClientPlaylistAPITest.kt
@@ -5,11 +5,11 @@ import com.adamratzman.spotify.SpotifyClientAPI
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.api
 import com.adamratzman.spotify.endpoints.client.SpotifyTrackPositions
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class ClientPlaylistAPITest : Spek({
     describe("Client playlist test") {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/public/BrowseAPITest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/public/BrowseAPITest.kt
@@ -6,12 +6,12 @@ import com.adamratzman.spotify.api
 import com.adamratzman.spotify.endpoints.public.TuneableTrackAttribute
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.getCurrentTimeMs
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class BrowseAPITest : Spek({
     describe("Browse test") {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/public/PublicAlbumsAPITest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/public/PublicAlbumsAPITest.kt
@@ -4,14 +4,14 @@ package com.adamratzman.spotify.public
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.api
 import com.adamratzman.spotify.utils.Market
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class PublicAlbumsAPITest : Spek({
     describe("Public Albums test") {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/public/PublicArtistsAPITest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/public/PublicArtistsAPITest.kt
@@ -5,13 +5,13 @@ import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.api
 import com.adamratzman.spotify.endpoints.public.ArtistApi
 import com.adamratzman.spotify.utils.Market
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class PublicArtistsAPITest : Spek({
     describe("Public Artists test") {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/public/PublicFollowingAPITest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/public/PublicFollowingAPITest.kt
@@ -3,10 +3,10 @@ package com.adamratzman.spotify.public
 
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.api
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class PublicFollowingAPITest : Spek({
     describe("Public Following test") {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/public/PublicPlaylistsAPITest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/public/PublicPlaylistsAPITest.kt
@@ -3,12 +3,12 @@ package com.adamratzman.spotify.public
 
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.api
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class PublicPlaylistsAPITest : Spek({
     describe("Public playlists test") {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/public/PublicTracksAPITest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/public/PublicTracksAPITest.kt
@@ -4,12 +4,12 @@ package com.adamratzman.spotify.public
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.api
 import com.adamratzman.spotify.utils.Market
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class PublicTracksAPITest : Spek({
     describe("Track API (Public View) test") {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/public/SearchAPITest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/public/SearchAPITest.kt
@@ -5,10 +5,10 @@ import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.api
 import com.adamratzman.spotify.endpoints.public.SearchApi
 import com.adamratzman.spotify.utils.Market
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class SearchAPITest : Spek({
     describe("Search API test") {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/utilities/UrisTests.kt b/src/commonTest/kotlin/com.adamratzman/spotify/utilities/UrisTests.kt
@@ -10,14 +10,14 @@ import com.adamratzman.spotify.models.SpotifyUri
 import com.adamratzman.spotify.models.SpotifyUriException
 import com.adamratzman.spotify.models.TrackUri
 import com.adamratzman.spotify.models.UserUri
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonConfiguration
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class UrisTests : Spek({
     describe("Uris tests") {
diff --git a/src/jsMain/kotlin/com/adamratzman/spotify/SpotifyLogger.kt b/src/jsMain/kotlin/com/adamratzman/spotify/SpotifyLogger.kt
@@ -1,3 +1,4 @@
+/* Spotify Web API - Kotlin Wrapper; MIT License, 2019; Original author: Adam Ratzman */
 package com.adamratzman.spotify
 
 actual class SpotifyLogger actual constructor(actual var enabled: Boolean) {
diff --git a/src/jsMain/kotlin/com/adamratzman/spotify/http/Endpoints.kt b/src/jsMain/kotlin/com/adamratzman/spotify/http/Endpoints.kt
@@ -1,3 +1,4 @@
+/* Spotify Web API - Kotlin Wrapper; MIT License, 2019; Original author: Adam Ratzman */
 package com.adamratzman.spotify.http
 
 import com.adamratzman.spotify.utils.encodeToBase64
diff --git a/src/jsMain/kotlin/com/adamratzman/spotify/http/HttpConnection.kt b/src/jsMain/kotlin/com/adamratzman/spotify/http/HttpConnection.kt
@@ -1,10 +1,9 @@
+/* Spotify Web API - Kotlin Wrapper; MIT License, 2019; Original author: Adam Ratzman */
 package com.adamratzman.spotify.http
 
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.promise
-import kotlin.js.Promise
 
-actual fun <T> runBlocking(coroutineCode: suspend () -> T):dynamic {
+actual fun <T> runBlocking(coroutineCode: suspend () -> T): dynamic {
     return GlobalScope.promise { coroutineCode() }
-}
+}
diff --git a/src/jsMain/kotlin/com/adamratzman/spotify/utils/Concurrency.kt b/src/jsMain/kotlin/com/adamratzman/spotify/utils/Concurrency.kt
@@ -1,3 +1,4 @@
+/* Spotify Web API - Kotlin Wrapper; MIT License, 2019; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
 import kotlinx.coroutines.CoroutineScope
@@ -8,7 +9,6 @@ actual enum class TimeUnit(val multiplier: Int) {
     MILLISECONDS(1), SECONDS(1000), MINUTES(60000)
     ;
     actual fun toMillis(duration: Long) = duration * multiplier
-
 }
 
 internal actual fun CoroutineScope.schedule(
@@ -19,4 +19,4 @@ internal actual fun CoroutineScope.schedule(
     launch {
         delay(timeUnit.toMillis(quantity.toLong()))
     }
-}
+}
diff --git a/src/jsMain/kotlin/com/adamratzman/spotify/utils/IO.kt b/src/jsMain/kotlin/com/adamratzman/spotify/utils/IO.kt
@@ -1,14 +1,14 @@
+/* Spotify Web API - Kotlin Wrapper; MIT License, 2019; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
 import org.w3c.files.File
 
 actual typealias File = File
 
 internal actual fun convertFileToBufferedImage(file: File): BufferedImage = file
-internal actual fun convertUrlPathToBufferedImage(url: String): BufferedImage
-        = throw NotImplementedError("Images not implemented yet.")
-internal actual fun convertLocalImagePathToBufferedImage(path: String): BufferedImage
-        = throw NotImplementedError("Images not implemented yet.")
-internal actual fun encodeBufferedImageToBase64String(image: BufferedImage): String
-        = throw NotImplementedError("Images not implemented yet.")
-
+internal actual fun convertUrlPathToBufferedImage(url: String): BufferedImage =
+        throw NotImplementedError("Images not implemented yet.")
+internal actual fun convertLocalImagePathToBufferedImage(path: String): BufferedImage =
+        throw NotImplementedError("Images not implemented yet.")
+internal actual fun encodeBufferedImageToBase64String(image: BufferedImage): String =
+        throw NotImplementedError("Images not implemented yet.")
diff --git a/src/jsMain/kotlin/com/adamratzman/spotify/utils/Misc.kt b/src/jsMain/kotlin/com/adamratzman/spotify/utils/Misc.kt
@@ -1,3 +1,4 @@
+/* Spotify Web API - Kotlin Wrapper; MIT License, 2019; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
 import kotlin.js.Date
@@ -8,4 +9,4 @@ internal actual fun getCurrentTimeMs(): Long {
 
 internal actual fun formatDate(format: String, date: Long): String {
     return Date(date).toISOString()
-}
+}
diff --git a/src/jsMain/kotlin/com/adamratzman/spotify/utils/Types.kt b/src/jsMain/kotlin/com/adamratzman/spotify/utils/Types.kt
@@ -1,3 +1,4 @@
+/* Spotify Web API - Kotlin Wrapper; MIT License, 2019; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
 import org.w3c.files.File
@@ -6,4 +7,4 @@ actual typealias BufferedImage = File
 
 actual typealias ConcurrentHashMap<K, V> = HashMap<K, V>
 
-actual fun <K, V> ConcurrentHashMap<K, V>.toList(): List<Pair<K, V>> = toList()
+actual fun <K, V> ConcurrentHashMap<K, V>.toList(): List<Pair<K, V>> = toList()
diff --git a/src/jsTest/kotlin/com/adamratzman/spotify/CommonImpl.kt b/src/jsTest/kotlin/com/adamratzman/spotify/CommonImpl.kt
@@ -11,4 +11,4 @@ actual fun getEnvironmentVariable(name: String): String? {
 @Test
 fun test() {
     println("asdf")
-}
+}
diff --git a/src/jvmMain/kotlin/com/adamratzman/spotify/utils/Concurrency.kt b/src/jvmMain/kotlin/com/adamratzman/spotify/utils/Concurrency.kt
@@ -2,10 +2,10 @@
 package com.adamratzman.spotify.utils
 
 import com.adamratzman.spotify.SpotifyRestAction
+import java.util.concurrent.CompletableFuture
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import java.util.concurrent.CompletableFuture
 
 actual typealias TimeUnit = java.util.concurrent.TimeUnit
 

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ sealed class SpotifyUri(val input: String, type: String) {`
`106`	`106`	`* SpotifyUri.isType<UserUri>("spotify:track:abc") // returns: false`
`107`	`107`	* ```
`108`	`108`	`* */`
`109`		`- inline fun <reified T: SpotifyUri> isType(input: String): Boolean {`
	`109`	`+ inline fun <reified T : SpotifyUri> isType(input: String): Boolean {`
`110`	`110`	`return safeInitiate(input, ::invoke)?.let { it is T } ?: false`
`111`	`111`	`}`
`112`	`112`
`@@ -119,7 +119,7 @@ sealed class SpotifyUri(val input: String, type: String) {`
`119`	`119`	`* SpotifyUri.canBeType<UserUri>("spotify:track:abc") // returns: false`
`120`	`120`	* ```
`121`	`121`	`* */`
`122`		`- inline fun <reified T: SpotifyUri> canBeType(input: String): Boolean {`
	`122`	`+ inline fun <reified T : SpotifyUri> canBeType(input: String): Boolean {`
`123`	`123`	`return isType<T>(input) \|\| !input.contains(':')`
`124`	`124`	`}`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* Spotify Web API - Kotlin Wrapper; MIT License, 2019; Original author: Adam Ratzman */`
`1`	`2`	`package com.adamratzman.spotify.utils`
`2`	`3`
`3`	`4`	`import kotlinx.io.core.String`
`@@ -33,4 +34,4 @@ fun encodeToBase64(src: ByteArray): ByteArray {`
`33`	`34`	`return result.toByteArray()`
`34`	`35`	`}`
`35`	`36`
`36`		`-fun String.encodeToBase64() = String(encodeToBase64(toByteArray()))`
	`37`	`+fun String.encodeToBase64() = String(encodeToBase64(toByteArray()))`