Add support for fetching user library albums and songs

src/main/kotlin/com/stevesoltys/applemusic/AppleMusic.kt

@@ -5,9 +5,11 @@ import com.stevesoltys.applemusic.model.artist.ArtistResponse
 import com.stevesoltys.applemusic.model.chart.ChartResponse
 import com.stevesoltys.applemusic.model.chart.ChartResultType
 import com.stevesoltys.applemusic.model.chart.ChartType
-import com.stevesoltys.applemusic.model.libraryartist.LibraryArtistResponse
+import com.stevesoltys.applemusic.model.album.library.LibraryAlbumResponse
+import com.stevesoltys.applemusic.model.artist.library.LibraryArtistResponse
 import com.stevesoltys.applemusic.model.search.SearchResponse
 import com.stevesoltys.applemusic.model.search.SearchResultType
+import com.stevesoltys.applemusic.model.track.song.library.LibrarySongResponse
 import com.stevesoltys.applemusic.net.AppleMusicHttpException
 import com.stevesoltys.applemusic.net.AppleMusicRetrofitBuilder
 import com.stevesoltys.applemusic.net.AppleMusicService
@@ -213,6 +215,54 @@ class AppleMusic(
     )
   }
 
+  /**
+   * Get all albums from a user's library.
+   */
+  fun getLibraryAlbums(
+    userToken: String,
+    include: Set<String>? = null,
+    localization: String? = null,
+    limit: Int? = null,
+    offset: String? = null,
+    extend: Set<String>? = null
+  ): LibraryAlbumResponse {
+
+    return call(
+      appleMusicService.getLibraryAlbums(
+        userToken = userToken,
+        include = include?.toTypedArray(),
+        localization = localization,
+        limit = limit,
+        offset = offset,
+        extend = extend?.toTypedArray()
+      )
+    )
+  }
+
+  /**
+   * Get all songs from a user's library.
+   */
+  fun getLibrarySongs(
+    userToken: String,
+    include: Set<String>? = null,
+    localization: String? = null,
+    limit: Int? = null,
+    offset: String? = null,
+    extend: Set<String>? = null
+  ): LibrarySongResponse {
+
+    return call(
+      appleMusicService.getLibrarySongs(
+        userToken = userToken,
+        include = include?.toTypedArray(),
+        localization = localization,
+        limit = limit,
+        offset = offset,
+        extend = extend?.toTypedArray()
+      )
+    )
+  }
+
   private fun <T> call(call: Call<T>): T {
     val response = call.execute()
 

src/main/kotlin/com/stevesoltys/applemusic/model/PlayParameters.kt

@@ -0,0 +1,9 @@
+package com.stevesoltys.applemusic.model
+
+/**
+ * @author Steve Soltys
+ */
+data class PlayParameters(
+  val id: String,
+  val kind: String
+)

src/main/kotlin/com/stevesoltys/applemusic/model/Relationship.kt

@@ -4,6 +4,7 @@ package com.stevesoltys.applemusic.model
  * @author Steve Soltys
  */
 open class Relationship {
+  val href: String? = null
 
-  var href: String? = null
+  val next: String? = null
 }

src/main/kotlin/com/stevesoltys/applemusic/model/album/library/LibraryAlbum.kt

@@ -0,0 +1,11 @@
+package com.stevesoltys.applemusic.model.album.library
+
+import com.stevesoltys.applemusic.model.Resource
+
+/**
+ * @author Steve Soltys
+ */
+data class LibraryAlbum(
+  val attributes: LibraryAlbumAttributes? = null,
+  val relationships: LibraryAlbumRelationships? = null
+) : Resource()

src/main/kotlin/com/stevesoltys/applemusic/model/album/library/LibraryAlbumArtistsRelationship.kt

@@ -0,0 +1,8 @@
+package com.stevesoltys.applemusic.model.album.library
+
+import com.stevesoltys.applemusic.model.Relationship
+import com.stevesoltys.applemusic.model.artist.library.LibraryArtist
+
+data class LibraryAlbumArtistsRelationship(
+  val data: List<LibraryArtist>
+) : Relationship()

src/main/kotlin/com/stevesoltys/applemusic/model/album/library/LibraryAlbumAttributes.kt

@@ -0,0 +1,19 @@
+package com.stevesoltys.applemusic.model.album.library
+
+import com.stevesoltys.applemusic.model.Artwork
+import com.stevesoltys.applemusic.model.PlayParameters
+
+/**
+ * @author Steve Soltys
+ */
+data class LibraryAlbumAttributes(
+  val artistName: String,
+  val artwork: Artwork,
+  val contentRating: String? = null,
+  val dateAdded: String? = null,
+  val name: String,
+  val playParams: PlayParameters? = null,
+  val releaseDate: String? = null,
+  val trackCount: Int,
+  val genreNames: List<String>
+)

src/main/kotlin/com/stevesoltys/applemusic/model/album/library/LibraryAlbumCatalogRelationship.kt

@@ -0,0 +1,8 @@
+package com.stevesoltys.applemusic.model.album.library
+
+import com.stevesoltys.applemusic.model.Relationship
+import com.stevesoltys.applemusic.model.album.Album
+
+data class LibraryAlbumCatalogRelationship(
+  val data: List<Album>
+) : Relationship()

src/main/kotlin/com/stevesoltys/applemusic/model/album/library/LibraryAlbumRelationships.kt

@@ -0,0 +1,11 @@
+package com.stevesoltys.applemusic.model.album.library
+
+import com.stevesoltys.applemusic.model.Relationship
+
+/**
+ * @author Steve Soltys
+ */
+data class LibraryAlbumRelationships(
+  val artists: LibraryAlbumArtistsRelationship? = null,
+  val catalog: LibraryAlbumCatalogRelationship? = null
+) : Relationship()

src/main/kotlin/com/stevesoltys/applemusic/model/album/library/LibraryAlbumResponse.kt

@@ -0,0 +1,10 @@
+package com.stevesoltys.applemusic.model.album.library
+
+import com.stevesoltys.applemusic.model.ResponseRoot
+
+/**
+ * @author Steve Soltys
+ */
+data class LibraryAlbumResponse(
+  val data: List<LibraryAlbum>
+) : ResponseRoot()

src/main/kotlin/com/stevesoltys/applemusic/model/libraryartist/LibraryArtist.kt → src/main/kotlin/com/stevesoltys/applemusic/model/artist/library/LibraryArtist.kt

@@ -1,4 +1,4 @@
-package com.stevesoltys.applemusic.model.libraryartist
+package com.stevesoltys.applemusic.model.artist.library
 
 import com.stevesoltys.applemusic.model.Resource
 

src/main/kotlin/com/stevesoltys/applemusic/model/libraryartist/LibraryArtistAttributes.kt → src/main/kotlin/com/stevesoltys/applemusic/model/artist/library/LibraryArtistAttributes.kt

@@ -1,4 +1,4 @@
-package com.stevesoltys.applemusic.model.libraryartist
+package com.stevesoltys.applemusic.model.artist.library
 
 /**
  * @author Steve Soltys

src/main/kotlin/com/stevesoltys/applemusic/model/libraryartist/LibraryArtistsCatalogRelationship.kt → src/main/kotlin/com/stevesoltys/applemusic/model/artist/library/LibraryArtistCatalogRelationship.kt

@@ -1,8 +1,8 @@
-package com.stevesoltys.applemusic.model.libraryartist
+package com.stevesoltys.applemusic.model.artist.library
 
 import com.stevesoltys.applemusic.model.Resource
 import com.stevesoltys.applemusic.model.artist.Artist
 
-data class LibraryArtistsCatalogRelationship(
+data class LibraryArtistCatalogRelationship(
   val data: List<Artist>
 ) : Resource()

src/main/kotlin/com/stevesoltys/applemusic/model/artist/library/LibraryArtistRelationships.kt

@@ -0,0 +1,10 @@
+package com.stevesoltys.applemusic.model.artist.library
+
+import com.stevesoltys.applemusic.model.Relationship
+
+/**
+ * @author Steve Soltys
+ */
+data class LibraryArtistRelationships(
+  val catalog: LibraryArtistCatalogRelationship? = null
+) : Relationship()

src/main/kotlin/com/stevesoltys/applemusic/model/libraryartist/LibraryArtistResponse.kt → src/main/kotlin/com/stevesoltys/applemusic/model/artist/library/LibraryArtistResponse.kt

@@ -1,4 +1,4 @@
-package com.stevesoltys.applemusic.model.libraryartist
+package com.stevesoltys.applemusic.model.artist.library
 
 import com.stevesoltys.applemusic.model.ResponseRoot
 

src/main/kotlin/com/stevesoltys/applemusic/model/track/song/library/LibrarySong.kt

@@ -0,0 +1,11 @@
+package com.stevesoltys.applemusic.model.track.song.library
+
+import com.stevesoltys.applemusic.model.Resource
+
+/**
+ * @author Steve Soltys
+ */
+data class LibrarySong(
+  val attributes: LibrarySongAttributes? = null,
+  val relationships: LibrarySongRelationships? = null
+) : Resource()

src/main/kotlin/com/stevesoltys/applemusic/model/track/song/library/LibrarySongAlbumsRelationship.kt

@@ -0,0 +1,9 @@
+package com.stevesoltys.applemusic.model.track.song.library
+
+import com.stevesoltys.applemusic.model.Relationship
+import com.stevesoltys.applemusic.model.album.library.LibraryAlbum
+import com.stevesoltys.applemusic.model.artist.library.LibraryArtist
+
+data class LibrarySongAlbumsRelationship(
+  val data: List<LibraryAlbum>
+) : Relationship()

src/main/kotlin/com/stevesoltys/applemusic/model/track/song/library/LibrarySongArtistsRelationship.kt

@@ -0,0 +1,8 @@
+package com.stevesoltys.applemusic.model.track.song.library
+
+import com.stevesoltys.applemusic.model.Relationship
+import com.stevesoltys.applemusic.model.artist.library.LibraryArtist
+
+data class LibrarySongArtistsRelationship(
+  val data: List<LibraryArtist>
+) : Relationship()

src/main/kotlin/com/stevesoltys/applemusic/model/track/song/library/LibrarySongAttributes.kt

@@ -0,0 +1,22 @@
+package com.stevesoltys.applemusic.model.track.song.library
+
+import com.stevesoltys.applemusic.model.Artwork
+import com.stevesoltys.applemusic.model.PlayParameters
+
+/**
+ * @author Steve Soltys
+ */
+data class LibrarySongAttributes(
+  val albumName: String? = null,
+  val artistName: String,
+  val artwork: Artwork,
+  val contentRating: String? = null,
+  val discNumber: Int? = null,
+  val durationInMillis: Int,
+  val genreNames: List<String>,
+  val hasLyrics: Boolean,
+  val name: String,
+  val playParams: PlayParameters? = null,
+  val releaseDate: String? = null,
+  val trackNumber: Int? = null
+)

src/main/kotlin/com/stevesoltys/applemusic/model/track/song/library/LibrarySongCatalogRelationship.kt

@@ -0,0 +1,10 @@
+package com.stevesoltys.applemusic.model.track.song.library
+
+import com.stevesoltys.applemusic.model.Relationship
+import com.stevesoltys.applemusic.model.Resource
+import com.stevesoltys.applemusic.model.album.Album
+import com.stevesoltys.applemusic.model.track.song.Song
+
+data class LibrarySongCatalogRelationship(
+  val data: List<Song>
+) : Relationship()

src/main/kotlin/com/stevesoltys/applemusic/model/track/song/library/LibrarySongRelationships.kt

@@ -0,0 +1,12 @@
+package com.stevesoltys.applemusic.model.track.song.library
+
+import com.stevesoltys.applemusic.model.Relationship
+
+/**
+ * @author Steve Soltys
+ */
+data class LibrarySongRelationships(
+  val albums: LibrarySongAlbumsRelationship? = null,
+  val artists: LibrarySongArtistsRelationship? = null,
+  val catalog: LibrarySongCatalogRelationship? = null
+) : Relationship()

src/main/kotlin/com/stevesoltys/applemusic/model/track/song/library/LibrarySongResponse.kt

@@ -0,0 +1,10 @@
+package com.stevesoltys.applemusic.model.track.song.library
+
+import com.stevesoltys.applemusic.model.ResponseRoot
+
+/**
+ * @author Steve Soltys
+ */
+data class LibrarySongResponse(
+  val data: List<LibrarySong>
+) : ResponseRoot()

src/main/kotlin/com/stevesoltys/applemusic/net/AppleMusicService.kt

@@ -3,8 +3,10 @@ package com.stevesoltys.applemusic.net
 import com.stevesoltys.applemusic.model.album.AlbumResponse
 import com.stevesoltys.applemusic.model.artist.ArtistResponse
 import com.stevesoltys.applemusic.model.chart.ChartResponse
-import com.stevesoltys.applemusic.model.libraryartist.LibraryArtistResponse
+import com.stevesoltys.applemusic.model.album.library.LibraryAlbumResponse
+import com.stevesoltys.applemusic.model.artist.library.LibraryArtistResponse
 import com.stevesoltys.applemusic.model.search.SearchResponse
+import com.stevesoltys.applemusic.model.track.song.library.LibrarySongResponse
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Header
@@ -80,4 +82,24 @@ interface AppleMusicService {
     @Query("offset") offset: String? = null,
     @Query("extend") extend: Array<String>? = null
   ): Call<LibraryArtistResponse>
+
+  @GET("me/library/albums")
+  fun getLibraryAlbums(
+    @Header("Music-User-Token") userToken: String,
+    @Query("include") include: Array<String>? = null,
+    @Query("l") localization: String? = null,
+    @Query("limit") limit: Int? = null,
+    @Query("offset") offset: String? = null,
+    @Query("extend") extend: Array<String>? = null
+  ): Call<LibraryAlbumResponse>
+
+  @GET("me/library/songs")
+  fun getLibrarySongs(
+    @Header("Music-User-Token") userToken: String,
+    @Query("include") include: Array<String>? = null,
+    @Query("l") localization: String? = null,
+    @Query("limit") limit: Int? = null,
+    @Query("offset") offset: String? = null,
+    @Query("extend") extend: Array<String>? = null
+  ): Call<LibrarySongResponse>
 }