fix AudioSegment model, manually parse SpotifyPublicUser (thanks spotify)

Signed-off-by: Adam Ratzman <adam@adamratzman.com>

Author: adamint

src/main/kotlin/com/adamratzman/spotify/main/SpotifyAPI.kt

@@ -24,6 +24,7 @@ import com.adamratzman.spotify.utils.byteEncode
 import com.adamratzman.spotify.utils.getAlbumConverter
 import com.adamratzman.spotify.utils.getFeaturedPlaylistsConverter
 import com.adamratzman.spotify.utils.getPlaylistConverter
+import com.adamratzman.spotify.utils.getPublicUserConverter
 import com.adamratzman.spotify.utils.getSavedTrackConverter
 import com.adamratzman.spotify.utils.toObject
 import com.adamratzman.spotify.utils.toObjectNullable
@@ -438,4 +439,5 @@ private fun getKlaxon(api: SpotifyAPI) = Klaxon()
     .converter(getFeaturedPlaylistsConverter(api))
     .converter(getPlaylistConverter(api))
     .converter(getAlbumConverter(api))
-    .converter(getSavedTrackConverter(api))
+    .converter(getSavedTrackConverter(api))
+    .converter(getPublicUserConverter(api))

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

@@ -5,7 +5,38 @@ import com.beust.klaxon.Converter
 import com.beust.klaxon.JsonValue
 import org.json.JSONObject
 
-fun getSavedTrackConverter(api:SpotifyAPI)= object : Converter {
+fun getPublicUserConverter(api: SpotifyAPI) = object : Converter {
+    override fun canConvert(cls: Class<*>): Boolean {
+        return cls == SpotifyPublicUser::class.java
+    }
+
+    override fun fromJson(jv: JsonValue): Any? {
+        return jv.obj?.let { obj ->
+            if (obj.string("id")?.isNotBlank() == true) {
+                SpotifyPublicUser(
+                    obj.string("display_name"),
+                    obj.obj("external_urls")!!.map.mapValues { it.value as String },
+                    obj.obj("followers")?.let { api.klaxon.parseFromJsonObject<Followers>(it) } ?: Followers(null, -1),
+                    obj.string("href")!!,
+                    obj.string("id")!!,
+                    obj.array("images") ?: listOf(),
+                    obj.string("type")!!,
+                    obj.string("uri")!!
+                )
+            } else {
+                // this is the *Spotify* user, and is SOMEHOW broken
+                SpotifyPublicUser(
+                    externalUrls = hashMapOf(), href = "https://api.spotify.com/v1/users/spotify",
+                    id = "spotify", type = "user", _uri = "spotify:user:spotify"
+                )
+            }
+        }
+    }
+
+    override fun toJson(value: Any): String = JSONObject(value).toString()
+}
+
+fun getSavedTrackConverter(api: SpotifyAPI) = object : Converter {
     override fun canConvert(cls: Class<*>): Boolean {
         return cls == SavedTrack::class.java
     }
@@ -48,6 +79,7 @@ fun getAlbumConverter(api: SpotifyAPI) = object : Converter {
                 obj.obj("tracks")!!.toJsonString().toPagingObject(endpoint = api.tracks),
                 obj.string("type")!!,
                 obj.string("uri")!!,
+                AlbumURI(obj.string("uri")!!),
                 obj.int("total_tracks")!!
             )
         }

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

@@ -76,7 +76,7 @@ data class SpotifyUserInformation(
 
 data class SpotifyPublicUser(
     @Json(name = "display_name") val displayName: String? = null,
-    @Json(name = "external_urls") val externalUrls: HashMap<String, String>,
+    @Json(name = "external_urls") val externalUrls: Map<String, String>,
     val followers: Followers = Followers(null, -1),
     val href: String,
     val id: String,
@@ -339,10 +339,10 @@ data class AudioSegment(
     val start: Float,
     val duration: Float,
     val confidence: Float,
-    @Json(name = "input_process") val loudness_start: Float,
-    @Json(name = "input_process") val loudness_max_time: Float,
-    @Json(name = "input_process") val loudness_max: Float,
-    @Json(name = "input_process") val loudness_end: Float? = null,
+    @Json(name = "loudness_start") val loudnessStart: Float,
+    @Json(name = "loudness_max_time") val loudnessMaxTime: Float,
+    @Json(name = "loudness_max") val loudnessMax: Float,
+    @Json(name = "loudness_end") val loudnessEnd: Float? = null,
     val pitches: List<Float>,
     val timbre: List<Float>
 )

src/test/kotlin/com/adamratzman/spotify/private/ClientPersonalizationAPITest.kt

@@ -10,14 +10,13 @@ import org.spekframework.spek2.style.specification.describe
 
 class ClientPersonalizationAPITest : Spek({
     describe("personalization endpoints") {
+        if (api !is SpotifyClientAPI) return@describe
         it("top artists") {
-            if (api !is SpotifyClientAPI) return@it
             assertTrue(api.personalization.getTopArtists(5, timeRange = ClientPersonalizationAPI.TimeRange.MEDIUM_TERM)
                     .complete().isNotEmpty())
         }
 
         it("top tracks") {
-            (api as? SpotifyClientAPI) ?: return@it
             assertTrue(api.personalization.getTopTracks(5).complete().isNotEmpty())
         }
     }

src/test/kotlin/com/adamratzman/spotify/public/PublicAlbumsAPITest.kt

@@ -41,8 +41,8 @@ class PublicAlbumsAPITest : Spek({
             it("valid album") {
                 assertTrue(a.getAlbumTracks("29ct57rVIi3MIFyKJYUWrZ", 4, 3, Market.US).complete().items.isNotEmpty())
 
-                //assertTrue(a.getAlbumTracks("29ct57rVIi3MIFyKJYUWrZ", 4, 3).complete().items.isNotEmpty())
-                //assertFalse(a.getAlbumTracks("29ct57rVIi3MIFyKJYUWrZ", 4, 3, Market.US).complete().items[0].isRelinked())
+                assertTrue(a.getAlbumTracks("29ct57rVIi3MIFyKJYUWrZ", 4, 3).complete().items.isNotEmpty())
+                assertFalse(a.getAlbumTracks("29ct57rVIi3MIFyKJYUWrZ", 4, 3, Market.US).complete().items[0].isRelinked())
             }
         }
     }