Merge branch 'master' into dev

Signed-off-by: Adam Ratzman <[email protected]>

# Conflicts:
#	build.gradle.kts
#	gradle/wrapper/gradle-wrapper.properties
#	settings.gradle.kts
#	src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientFollowingApi.kt
#	src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientLibraryApi.kt
#	src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlayerApi.kt
#	src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlaylistApi.kt
#	src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/BrowseApi.kt
#	src/commonMain/kotlin/com.adamratzman.spotify/http/HttpConnection.kt
#	src/commonMain/kotlin/com.adamratzman.spotify/models/Playable.kt
#	src/commonTest/kotlin/com.adamratzman/spotify/utilities/JsonTests.kt
#	src/commonTest/kotlin/com.adamratzman/spotify/utilities/UrisTests.kt

Author: adamint

src/commonMain/kotlin/com.adamratzman.spotify/models/Artists.kt

@@ -23,9 +23,15 @@ data class SimpleArtist(
     val type: String
 ) : CoreObject() {
 
+    /**
+     * This [SimpleArtist] into a full [Artist] object
+     */
+    val fullArtist by lazy { api.artists.getArtist(id) }
+
     /**
      * Converts this [SimpleArtist] into a full [Artist] object
      */
+    @Deprecated("Replaced with a lazy fullArtist property", ReplaceWith("fullArtist"))
     fun toFullArtist() = api.artists.getArtist(id)
 }
 

src/commonMain/kotlin/com.adamratzman.spotify/models/Episode.kt

@@ -1,8 +1,10 @@
 /* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2020; Original author: Adam Ratzman */
 package com.adamratzman.spotify.models
 
+import com.adamratzman.spotify.SpotifyClientApi
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.utils.Locale
+import com.adamratzman.spotify.utils.Market
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -104,6 +106,13 @@ data class SimpleEpisode(
     val languages
         get() = (language?.let { showLanguagesPrivate + it } ?: showLanguagesPrivate)
                 .map { Locale.valueOf(it.replace("-", "_")) }
+
+    /**
+     * Converts this [SimpleEpisode] into a full [Episode] object
+     *
+     * @param market Provide this parameter if you want the list of returned items to be relevant to a particular country.
+     */
+    fun toFullEpisode(market: Market? = null) = (api as? SpotifyClientApi)?.episodes?.getEpisode(id, market)
 }
 
 /**

src/commonMain/kotlin/com.adamratzman.spotify/models/LocalTracks.kt

@@ -1,6 +1,7 @@
 /* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2020; Original author: Adam Ratzman */
 package com.adamratzman.spotify.models
 
+import com.adamratzman.spotify.utils.Market
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -68,4 +69,15 @@ data class LocalTrack(
     @SerialName("track_number") val trackNumber: Int? = null,
     override val type: String,
     override val uri: LocalTrackUri
-) : IdentifiableNullable(), Playable
+) : IdentifiableNullable(), Playable {
+
+    /**
+     * Search for this local track by name in Spotify's track catalog.
+     *
+     * @param limit The number of objects to return. Default: 50 (or api limit). Minimum: 1. Maximum: 50.
+     * @param offset The index of the first item to return. Default: 0. Use with limit to get the next set of items
+     * @param market Provide this parameter if you want the list of returned items to be relevant to a particular country.
+     * If omitted, the returned items will be relevant to all countries.
+     */
+    fun searchForSpotifyTrack(limit: Int? = null, offset: Int? = null, market: Market? = null) = api.search.searchTrack(name, limit, offset, market)
+}

src/commonMain/kotlin/com.adamratzman.spotify/models/Show.kt

@@ -1,6 +1,7 @@
 /* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2020; Original author: Adam Ratzman */
 package com.adamratzman.spotify.models
 
+import com.adamratzman.spotify.SpotifyClientApi
 import com.adamratzman.spotify.utils.Locale
 import com.adamratzman.spotify.utils.Market
 import kotlinx.serialization.SerialName
@@ -53,7 +54,12 @@ data class SimpleShow(
 
     val languages get() = languagesString.map { Locale.valueOf(it.replace("-", "_")) }
 
-    // TODO  fun toFullShow(market: Market? = null) = api.tracks.getTrack(id, market)
+    /**
+     * Converts this [SimpleShow] to a full [Show] object
+     *
+     * @param market Provide this parameter if you want the list of returned items to be relevant to a particular country.
+     */
+    fun toFullShow(market: Market? = null) = (api as? SpotifyClientApi)?.shows?.getShow(id, market)
 }
 
 /**