Skip to content

Commit

Permalink
Fix User + Pass login problem, Add use flac setting, Add ability to a…
Browse files Browse the repository at this point in the history 
…dd/remove tracks from playlist, Add more home tab stuff
  • Loading branch information
@LuftVerbot
LuftVerbot committed May 25, 2024
1 parent 0603521 commit 214fdbc
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 13 deletions.
34 changes: 30 additions & 4 deletions app/src/main/java/dev/brahmkshatriya/echo/extension/DeezerApi.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class DeezerApi {

suspend fun getArlByEmail(mail: String, password: String) {
//Get SID
//getSid()
getSid()

val clientId = "447462"
val clientSecret = "a83bf7f38ad2f137e444727cfc3775cf"
Expand Down Expand Up @@ -309,7 +309,7 @@ class DeezerApi {
jObject
}

suspend fun getMediaUrl(track: Track): JsonObject = withContext(Dispatchers.IO) {
suspend fun getMediaUrl(track: Track, useFlac: Boolean): JsonObject = withContext(Dispatchers.IO) {
val urlBuilder = HttpUrl.Builder()
.scheme("https")
.host("dzmedia.fly.dev")
Expand All @@ -319,8 +319,11 @@ class DeezerApi {

// Create request body
val requestBody = JSONObject(mapOf(
// Limit to 320 until download is added
"formats" to arrayOf(/*"FLAC", */"MP3_320", "MP3_128", "MP3_64", "MP3_MISC"),
if(useFlac) {
"formats" to arrayOf("FLAC", "MP3_320", "MP3_128", "MP3_64", "MP3_MISC")
} else {
"formats" to arrayOf("MP3_320", "MP3_128", "MP3_64", "MP3_MISC")
},
"ids" to arrayOf(track.id.toLong())
)).toString().toRequestBody("application/json; charset=utf-8".toMediaType())

Expand Down Expand Up @@ -473,6 +476,29 @@ class DeezerApi {
return jObject
}

suspend fun addToPlaylist(playlist: Playlist, tracks: List<Track>) {
callApi(
method = "playlist.addSongs",
params = mapOf(
"playlist_id" to playlist.id,
"songs" to arrayOf(tracks.map { it.id } + 0)
)
)
}

suspend fun removeFromPlaylist(playlist: Playlist, tracks: List<Track> , indexes: List<Int>) {
val trackIds = tracks.map { it.id }
val ids = indexes.map { index -> trackIds[index] }
callApi(
method = "playlist.deleteSongs",
params = mapOf(
"playlist_id" to playlist.id,
"songs" to arrayOf(ids + 0)
)
)
}


suspend fun homePage(): JsonObject {
val jsonData = callApi(
method = "page.get",
Expand Down
54 changes: 45 additions & 9 deletions app/src/main/java/dev/brahmkshatriya/echo/extension/DeezerExtension.kt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.brahmkshatriya.echo.extension

import android.util.Log
import dev.brahmkshatriya.echo.common.clients.AlbumClient
import dev.brahmkshatriya.echo.common.clients.ArtistClient
import dev.brahmkshatriya.echo.common.clients.ExtensionClient
Expand All @@ -24,6 +25,8 @@ import dev.brahmkshatriya.echo.common.models.Tab
import dev.brahmkshatriya.echo.common.models.Track
import dev.brahmkshatriya.echo.common.models.User
import dev.brahmkshatriya.echo.common.settings.Setting
import dev.brahmkshatriya.echo.common.settings.SettingItem
import dev.brahmkshatriya.echo.common.settings.SettingSwitch
import dev.brahmkshatriya.echo.common.settings.Settings
import kotlinx.coroutines.async
import kotlinx.coroutines.coroutineScope
Expand All @@ -44,14 +47,23 @@ class DeezerExtension : ExtensionClient, HomeFeedClient, TrackClient, SearchClie
ignoreUnknownKeys = true
}

override val settingItems: List<Setting> = listOf()
override val settingItems: List<Setting> = listOf(
SettingSwitch(
"Use FLAC",
"flac",
"Use FLAC if available (loading takes longer)",
false
)
)

private lateinit var settings: Settings
override fun setSettings(settings: Settings) {
this.settings = settings
}

// Access shared email and pass
private val useFlac
get() = settings.getBoolean("flac") ?: false

private val arl: String
get() = DeezerCredentials.arl

Expand Down Expand Up @@ -79,23 +91,31 @@ class DeezerExtension : ExtensionClient, HomeFeedClient, TrackClient, SearchClie
val dataList = mutableListOf<MediaItemsContainer>()
val jsonData = json.decodeFromString<JsonArray>(tab?.extras!!["sections"].toString())
jsonData.map { section ->
val id = section.jsonObject["module_id"]!!.jsonPrimitive.content
val name = section.jsonObject["title"]!!.jsonPrimitive.content
// Just for the time being until everything is implemented
if (name == "Continue streaming" || name == "Mixes inspired by..." || name == "Playlists you'll love") {
if (id == "348128f5-bed6-4ccb-9a37-8e5f5ed08a62" ||
id == "8d10a320-f130-4dcb-a610-38baf0c57896" ||
id == "2a7e897f-9bcf-4563-8e11-b93a601766e1" ||
id == "7a65f4ed-71e1-4b6e-97ba-4de792e4af62" ||
id == "25f9200f-1ce0-45eb-abdc-02aecf7604b2" ||
id == "c320c7ad-95f5-4021-8de1-cef16b053b6d" ||
id == "b2e8249f-8541-479e-ab90-cf4cf5896cbc" ||
id == "927121fd-ef7b-428e-8214-ae859435e51c") {
val data = section.toMediaItemsContainer(name = name)
dataList.add(data)
}
}
dataList
}

//<============= Library =============>

private var allTabs: Pair<String, List<MediaItemsContainer>>? = null

override suspend fun getLibraryTabs(): List<Tab> {
if (arl == "") return emptyList()
val tabs = listOf(Tab("playlists", "Playlists"), Tab("albums", "Albums"), Tab("tracks", "Tracks"), Tab("artists", "Artists"))
val tabs = listOf(Tab("playlists", "Playlists"),
Tab("albums", "Albums"), Tab("tracks", "Tracks"), Tab("artists", "Artists"))
allTabs = "all" to tabs.mapNotNull { tab ->
when(tab.id) {
"playlists" -> {
Expand Down Expand Up @@ -199,7 +219,8 @@ class DeezerExtension : ExtensionClient, HomeFeedClient, TrackClient, SearchClie
}

override suspend fun addTracksToPlaylist(playlist: Playlist, tracks: List<Track>, index: Int, new: List<Track>) {
TODO("Not yet implemented")
if(arl == "") throw loginRequiredException
DeezerApi().addToPlaylist(playlist, new)
}

override suspend fun createPlaylist(title: String, description: String?): Playlist {
Expand All @@ -219,15 +240,30 @@ class DeezerExtension : ExtensionClient, HomeFeedClient, TrackClient, SearchClie
}

override suspend fun listEditablePlaylists(): List<Playlist> {
TODO("Not yet implemented")
if(arl == "") throw loginRequiredException
val playlistList = mutableListOf<Playlist>()
val jsonObject = DeezerApi().getPlaylists()
val resultObject = jsonObject["results"]!!.jsonObject
val tabObject = resultObject["TAB"]!!.jsonObject
val playlistObject = tabObject["playlists"]!!.jsonObject
val dataArray = playlistObject["data"]!!.jsonArray
dataArray.map {
val playlist = it.toPlaylist()
if(playlist.isEditable) {
playlistList.add(playlist)
}

}
return playlistList
}

override suspend fun moveTrackInPlaylist(playlist: Playlist, tracks: List<Track>, fromIndex: Int, toIndex: Int) {
TODO("Not yet implemented")
}

override suspend fun removeTracksFromPlaylist(playlist: Playlist, tracks: List<Track>, indexes: List<Int>) {
TODO("Not yet implemented")
if(arl == "") throw loginRequiredException
DeezerApi().removeFromPlaylist(playlist, tracks, indexes)
}

//<============= Search =============>
Expand Down Expand Up @@ -312,7 +348,7 @@ class DeezerExtension : ExtensionClient, HomeFeedClient, TrackClient, SearchClie
val jsonObject = if (track.extras["FILESIZE_MP3_MISC"] != "0" && track.extras["FILESIZE_MP3_MISC"] != null) {
DeezerApi().getMP3MediaUrl(track)
} else {
DeezerApi().getMediaUrl(track)
DeezerApi().getMediaUrl(track, useFlac)
}
val dataObject = jsonObject["data"]!!.jsonArray.first().jsonObject
val mediaObject = dataObject["media"]!!.jsonArray.first().jsonObject
Expand Down

0 comments on commit 214fdbc

Please sign in to comment.