Skip to content

Commit

Permalink
Update to latest echo
Browse files Browse the repository at this point in the history
Still need to figure out the new Date formatting
  • Loading branch information
LuftVerbot committed Jan 12, 2025
1 parent 955988a commit 5fd6537
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package dev.brahmkshatriya.echo.extension
import dev.brahmkshatriya.echo.common.helpers.PagedData
import dev.brahmkshatriya.echo.common.models.Album
import dev.brahmkshatriya.echo.common.models.Artist
import dev.brahmkshatriya.echo.common.models.Date.Companion.toDate
import dev.brahmkshatriya.echo.common.models.EchoMediaItem
import dev.brahmkshatriya.echo.common.models.ImageHolder
import dev.brahmkshatriya.echo.common.models.ImageHolder.Companion.toImageHolder
Expand Down Expand Up @@ -197,7 +198,7 @@ class DeezerParser(private val session: DeezerSession) {
cover = getCover(md5, "cover", loaded),
duration = data["DURATION"]?.jsonPrimitive?.content?.toLongOrNull()?.times(1000),
releaseDate = data["DATE_ADD"]?.jsonPrimitive?.content?.toLongOrNull()?.let {
Date.from(Instant.ofEpochSecond(it)).toString()
Instant.ofEpochSecond(it).epochSecond.toInt().toDate()
},
artists = listOfNotNull(
Artist(
Expand All @@ -216,6 +217,7 @@ class DeezerParser(private val session: DeezerSession) {
)
}

@Suppress("NewApi")
fun JsonObject.toPlaylist(loaded: Boolean = false): Playlist {
val data = this["data"]?.jsonObject ?: this["DATA"]?.jsonObject ?: this
val type = data["PICTURE_TYPE"]?.jsonPrimitive?.content.orEmpty()
Expand All @@ -228,7 +230,7 @@ class DeezerParser(private val session: DeezerSession) {
subtitle = this["subtitle"]?.jsonPrimitive?.content.orEmpty(),
isEditable = data["PARENT_USER_ID"]?.jsonPrimitive?.content == session.credentials?.userId,
tracks = data["NB_SONG"]?.jsonPrimitive?.int ?: 0,
creationDate = data["DATE_ADD"]?.jsonPrimitive?.content,
creationDate = data["DATE_ADD"]?.jsonPrimitive?.content?.toIntOrNull()?.toDate(),
)
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ android.useAndroidX=true
kotlin.code.style=official
android.nonTransitiveRClass=true

libVersion=d83f9ae036
libVersion=b585210955

extType=music
extId=deezer
Expand Down

0 comments on commit 5fd6537

Please sign in to comment.