mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 13:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added createPlaylist(), renamePlaylist(), and deletePlaylist()

Browse Source 
functionality to IDataProvider and RemoteDataProvider
This commit is contained in:
casey langen 2017-11-06 17:56:47 -08:00
parent aba807b00f
commit 9f865eeec0
4 changed files with 98 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/MainActivity.kt
View File

@ -9,7 +9,6 @@ import android.os.Bundle
import android.os.Handler
import android.support.v4.app.DialogFragment
import android.support.v7.app.AlertDialog
import android.util.Log
import android.view.LayoutInflater
import android.view.Menu
import android.view.MenuItem

4
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/data/IDataProvider.kt
View File

@ -30,7 +30,11 @@ interface IDataProvider {
fun getCategoryValues(type: String, filter: String = ""): Observable<List<ICategoryValue>>
fun createPlaylist(playlistName: String, categoryType: String = "", categoryId: Long = -1, filter: String = ""): Observable<Long>
fun createPlaylist(playlistName: String, tracks: List<ITrack> = ArrayList()): Observable<Long>
fun appendToPlaylist(playlistId: Long, categoryType: String = "", categoryId: Long = -1, filter: String = "", offset: Long = -1): Observable<Boolean>
fun renamePlaylist(playlistId: Long, newName: String): Observable<Boolean>
fun deletePlaylist(playlistId: Long): Observable<Boolean>
val state: State
}

110
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/data/impl/remote/RemoteDataProvider.kt
View File

@ -159,30 +159,78 @@ class RemoteDataProvider(private val service: WebSocketService) : IDataProvider
.compose(applySchedulers())
}
override fun createPlaylist(playlistName: String, categoryType: String, categoryId: Long, filter: String): Observable<Long> {
if (playlistName.isBlank()) {
return Observable.just(0)
}
val message = SocketMessage.Builder
.request(Messages.Request.SavePlaylist)
.addOption(Messages.Key.PLAYLIST_NAME, playlistName)
.addOption(Messages.Key.SUBQUERY, createTrackListSubquery(categoryType, categoryId, filter))
.build()
return service.observe(message, client)
.flatMap<Long> { socketMessage -> extractId(socketMessage, Messages.Key.PLAYLIST_ID) }
.compose(applySchedulers())
}
override fun createPlaylist(playlistName: String, tracks: List<ITrack>): Observable<Long> {
if (playlistName.isBlank()) {
return Observable.just(0)
}
val externalIds = JSONArray()
tracks.forEach {
if (it.externalId.isNotEmpty()) {
externalIds.put(it.externalId)
}
}
val message = SocketMessage.Builder
.request(Messages.Request.SavePlaylist)
.addOption(Messages.Key.PLAYLIST_NAME, playlistName)
.addOption(Messages.Key.EXTERNAL_IDS, externalIds)
.build()
return service.observe(message, client)
.flatMap<Long> { socketMessage -> extractId(socketMessage, Messages.Key.PLAYLIST_ID) }
.compose(applySchedulers())
}
override fun appendToPlaylist(playlistId: Long, categoryType: String, categoryId: Long, filter: String, offset: Long): Observable<Boolean> {
val type = if (categoryType.isNotEmpty() && categoryId > 0)
Messages.Request.QueryTracksByCategory else Messages.Request.QueryTracks
val suboptions = JSONObject()
if (type == Messages.Request.QueryTracksByCategory) {
suboptions.put(Messages.Key.CATEGORY, categoryType)
suboptions.put(Messages.Key.ID, categoryId)
}
if (filter.isNotEmpty()) {
suboptions.put(Messages.Key.FILTER, filter)
}
val subquery = JSONObject()
.put(Messages.Key.TYPE, type.toString())
.put(Messages.Key.OPTIONS, suboptions)
val message = SocketMessage.Builder
.request(Messages.Request.AppendToPlaylist)
.addOption(Messages.Key.PLAYLIST_ID, playlistId)
.addOption(Messages.Key.OFFSET, offset)
.addOption(Messages.Key.SUBQUERY, subquery)
.addOption(Messages.Key.SUBQUERY, createTrackListSubquery(categoryType, categoryId, filter))
.build()
return service.observe(message, client)
.flatMap<Boolean> { socketMessage -> isSuccessful(socketMessage) }
.compose(applySchedulers())
}
override fun renamePlaylist(playlistId: Long, newName: String): Observable<Boolean> {
if (newName.isBlank()) {
return Observable.just(false)
}
val message = SocketMessage.Builder
.request(Messages.Request.RenamePlaylist)
.addOption(Messages.Key.PLAYLIST_ID, playlistId)
.addOption(Messages.Key.PLAYLIST_NAME, newName)
.build()
return service.observe(message, client)
.flatMap<Boolean> { socketMessage -> isSuccessful(socketMessage) }
.compose(applySchedulers())
}
override fun deletePlaylist(playlistId: Long): Observable<Boolean> {
val message = SocketMessage.Builder
.request(Messages.Request.DeletePlaylist)
.addOption(Messages.Key.PLAYLIST_ID, playlistId)
.build()
return service.observe(message, client)
@ -253,6 +301,26 @@ class RemoteDataProvider(private val service: WebSocketService) : IDataProvider
}
}
private fun createTrackListSubquery(categoryType: String, categoryId: Long, filter: String): JSONObject {
val type = if (categoryType.isNotEmpty() && categoryId > 0)
Messages.Request.QueryTracksByCategory else Messages.Request.QueryTracks
val suboptions = JSONObject()
if (type == Messages.Request.QueryTracksByCategory) {
suboptions.put(Messages.Key.CATEGORY, categoryType)
suboptions.put(Messages.Key.ID, categoryId)
}
if (filter.isNotBlank()) {
suboptions.put(Messages.Key.FILTER, filter)
}
return JSONObject()
.put(Messages.Key.TYPE, type.toString())
.put(Messages.Key.OPTIONS, suboptions)
}
private val toAlbumArtist: (JSONObject, String) -> ICategoryValue = { json, type -> RemoteAlbumArtist(json) }
private val toCategoryValue: (JSONObject, String) -> ICategoryValue = { json, type -> RemoteCategoryValue(type, json) }
@ -294,5 +362,9 @@ class RemoteDataProvider(private val service: WebSocketService) : IDataProvider
private fun isSuccessful(message: SocketMessage): Observable<Boolean> {
return Observable.just(message.getBooleanOption(Messages.Key.SUCCESS, false))
}
private fun extractId(message: SocketMessage, idKey: String): Observable<Long> {
return Observable.just(message.getLongOption(idKey, 0))
}
}
}

4
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/websocket/Messages.kt
View File

@ -96,10 +96,12 @@ class Messages {
val RELATIVE = "relative"
val PLAYING_CURRENT_TIME = "playing_current_time"
val PLAYLIST_ID = "playlist_id"
val PLAYLIST_NAME = "playlist_name"
val SUBQUERY = "subquery"
val TYPE = "type"
val OPTIONS = "options"
val SUCCESS = "success";
val SUCCESS = "success"
val EXTERNAL_IDS = "external_ids"
}
}