got rid of three more model issues (15 left)

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

Author: adamint

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

@@ -17,8 +17,10 @@ import com.adamratzman.spotify.utils.Track
 import com.adamratzman.spotify.utils.TrackList
 import com.adamratzman.spotify.utils.catch
 import com.adamratzman.spotify.utils.encode
+import com.adamratzman.spotify.utils.toInnerObject
 import com.adamratzman.spotify.utils.toLinkedResult
 import com.adamratzman.spotify.utils.toObject
+import kotlinx.serialization.internal.ArrayListSerializer
 import java.util.function.Supplier
 
 /**
@@ -99,12 +101,18 @@ class ArtistsAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      */
     fun getArtistTopTracks(artist: String, market: Market = Market.US): SpotifyRestAction<List<Track>> {
         return toAction(Supplier {
+            println(get(
+                EndpointBuilder("/artists/${ArtistURI(artist).id.encode()}/top-tracks").with(
+                    "country",
+                    market.code
+                ).toString()
+            ))
             get(
                 EndpointBuilder("/artists/${ArtistURI(artist).id.encode()}/top-tracks").with(
                     "country",
                     market.code
                 ).toString()
-            ).toObject(api, TrackList.serializer()).tracks.map { it!! }
+            ).toInnerObject("tracks", api, ArrayListSerializer(Track.serializer()))
         })
     }
 

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

@@ -124,7 +124,7 @@ data class LinkedResult<out T>(val href: String, val items: List<T>) {
 }
 
 @Serializable
-abstract class RelinkingAvailableResponse(@Transient val linkedTrack: LinkedTrack?=null) : Linkable() {
+abstract class RelinkingAvailableResponse(@Transient val linkedTrack: LinkedTrack? = null) : Linkable() {
     fun isRelinked() = linkedTrack != null
 }
 
@@ -143,7 +143,7 @@ internal fun <T> String.toObjectNullable(o: SpotifyAPI?, serializer: KSerializer
 @Suppress("UNCHECKED_CAST")
 internal fun <T> String.toObject(o: SpotifyAPI?, serializer: KSerializer<T>): T {
     try {
-        val obj = (JSON.parse(serializer, this) as? T) ?: throw SpotifyException(
+        val obj = (JSON.nonstrict.parse(serializer, this) as? T) ?: throw SpotifyException(
             "Unable to parse $this",
             IllegalArgumentException("$serializer not found")
         )
@@ -152,7 +152,7 @@ internal fun <T> String.toObject(o: SpotifyAPI?, serializer: KSerializer<T>): T
             obj.instantiatePagingObjects(o)
         }
         return obj
-    }catch (e:java.lang.Exception){
+    } catch (e: java.lang.Exception) {
         println(this)
         throw e
     }
@@ -212,7 +212,8 @@ internal fun <T> String.toLinkedResult(api: SpotifyAPI, serializer: KSerializer<
 }
 
 internal fun <T> String.toInnerObject(innerName: String, api: SpotifyAPI, serializer: KSerializer<T>): T {
-    return JSONObject(this).getJSONObject(innerName).toString().toObject(api, serializer)
+    return JSONObject(this).let { it.optJSONObject(innerName) ?: it.getJSONArray(innerName) }
+        .toString().toObject(api, serializer)
 }
 
 internal fun <T> catch(function: () -> T): T? {

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

@@ -5,6 +5,7 @@ import com.adamratzman.spotify.main.SpotifyAPI
 import com.adamratzman.spotify.main.SpotifyRestAction
 import kotlinx.serialization.Optional
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
 /**
  * @param message the featured message in "Overview"
@@ -54,10 +55,10 @@ data class Followers(val href: String?, val total: Int)
 
 @Serializable
 data class SpotifyUserInformation(
-    val birthdate: String?,
-    val country: String?,
-    val display_name: String?,
-    val email: String?,
+    @Optional val birthdate: String? = null,
+    @Optional val country: String? = null,
+    @Optional val display_name: String? = null,
+    @Optional val email: String? = null,
     val external_urls: HashMap<String, String>,
     val followers: Followers,
     val href: String,
@@ -70,9 +71,9 @@ data class SpotifyUserInformation(
 
 @Serializable
 data class SpotifyPublicUser(
-    val display_name: String,
+    @Optional val display_name: String? = null,
     val external_urls: HashMap<String, String>,
-    @Optional val followers: Followers = Followers(null,-1),
+    @Optional val followers: Followers = Followers(null, -1),
     val href: String,
     val id: String,
     @Optional val images: List<SpotifyImage> = listOf(),
@@ -137,14 +138,14 @@ data class SimpleTrack(
     val external_urls: HashMap<String, String>,
     val href: String,
     val id: String,
-   @Optional val is_playable: Boolean = true,
+    @Optional val is_playable: Boolean = true,
     private val linked_from: LinkedTrack?,
     val name: String,
     val preview_url: String,
     val track_number: Int,
     val type: String,
     val uri: String,
-    val is_local:Boolean
+    val is_local: Boolean
 ) : RelinkingAvailableResponse(linked_from) {
     fun toFullTrack(market: Market? = null) = api.tracks.getTrack(id, market)
 }
@@ -153,7 +154,7 @@ data class SimpleTrack(
 data class Track(
     val album: SimpleAlbum,
     val artists: List<SimpleArtist>,
-   @Optional val available_markets: List<String>? = null,
+    @Optional val available_markets: List<String>? = null,
     @Optional val is_playable: Boolean = true,
     val disc_number: Int,
     val duration_ms: Int,
@@ -162,14 +163,14 @@ data class Track(
     val external_urls: HashMap<String, String>,
     val href: String,
     val id: String,
-    @Optional private val linked_from: LinkedTrack?=null,
+    @Optional private val linked_from: LinkedTrack? = null,
     val name: String,
     val popularity: Int,
     val preview_url: String,
     val track_number: Int,
     val type: String,
     val uri: String,
-    val is_local:Boolean
+    val is_local: Boolean
 ) : RelinkingAvailableResponse(linked_from)
 
 @Serializable
@@ -186,11 +187,20 @@ data class SimpleAlbum(
     val uri: String,
     val release_date: String,
     val release_date_precision: String,
-    val total_tracks:Int
+    val total_tracks: Int,
+    @Optional private val album_group: String? = null
 ) : Linkable() {
+    @Transient val albumGroup: AlbumGroup? = album_group?.let { _ -> AlbumGroup.values().find { it.id == album_group } }
     fun toFullAlbum(market: Market? = null) = api.albums.getAlbum(id, market)
 }
 
+enum class AlbumGroup(internal val id: String) {
+    ALBUM("album"),
+    SINGLE("single"),
+    COMPILATION("compilation"),
+    APPEARS_ON("appears_on")
+}
+
 @Serializable
 data class Album(
     val album_type: String,
@@ -210,7 +220,8 @@ data class Album(
     val release_date_precision: String,
     val tracks: PagingObject<SimpleTrack>,
     val type: String,
-    val uri: String
+    val uri: String,
+    val total_tracks: Int
 )
 
 @Serializable
@@ -223,7 +234,7 @@ data class SimplePlaylist(
     val name: String,
     val owner: SpotifyPublicUser,
     @Optional val primary_color: String? = null,
-    val public: Boolean?,
+    @Optional val public: Boolean? = null,
     val snapshot_id: String,
     val tracks: PlaylistTrackInfo,
     val type: String,
@@ -236,7 +247,17 @@ data class SimplePlaylist(
  * Some parameters are timestamps and will be updated soon to reflect Spotify's use of a Timestamp string
  */
 @Serializable
-data class PlaylistTrack(val added_at: String, val added_by: SpotifyPublicUser, val is_local: Boolean, val track: Track)
+data class PlaylistTrack(
+    @Optional val primary_color: String? = null,
+    val added_at: String,
+    val added_by: SpotifyPublicUser,
+    val is_local: Boolean,
+    val track: Track,
+    @Optional val video_thumbnail: VideoThumbnail? = null
+)
+
+@Serializable
+data class VideoThumbnail(val url: String?)
 
 @Serializable
 data class Playlist(
@@ -250,7 +271,7 @@ data class Playlist(
     val images: List<SpotifyImage>,
     val name: String,
     val owner: SpotifyPublicUser,
-    val public: Boolean?,
+    @Optional val public: Boolean? = null,
     val snapshot_id: String,
     val tracks: PagingObject<PlaylistTrack>,
     val type: String,
@@ -270,10 +291,13 @@ data class AudioAnalysis(
     val tatums: List<AudioTatum>,
     val track: TrackAnalysis
 )
+
 @Serializable
 data class AudioBar(val start: Float, val duration: Float, val confidence: Float)
+
 @Serializable
 data class AudioBeat(val start: Float, val duration: Float, val confidence: Float)
+
 @Serializable
 data class AudioTatum(val start: Float, val duration: Float, val confidence: Float)
 
@@ -312,7 +336,7 @@ data class AudioSegment(
     val loudness_start: Float,
     val loudness_max_time: Float,
     val loudness_max: Float,
-    @Optional val loudness_end: Float?=null,
+    @Optional val loudness_end: Float? = null,
     val pitches: List<Float>,
     val timbre: List<Float>
 )