secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Loading library albums only on demand

Browse Source
This commit is contained in:
James Barnsley
2017-08-11 21:59:14 +12:00
parent 190a20c882
commit 9bb4b79f1e
12 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/js/services/core/actions.js
View File

@ -167,6 +167,17 @@ export function addTracksToPlaylist( uri, tracks_uris ){
}
/**
* Asset libraries
**/
export function getLibraryPlaylists(){
return {
type: 'GET_LIBRARY_PLAYLISTS'
}
}
/**
* Assets loaded
**/

10
src/js/services/core/middleware.js
View File

@ -254,6 +254,16 @@ const CoreMiddleware = (function(){
next(action)
break
case 'GET_LIBRARY_PLAYLISTS':
if (store.getState().spotify.connected){
store.dispatch(spotifyActions.getLibraryPlaylists())
}
if (store.getState().mopidy.connected){
store.dispatch(mopidyActions.getLibraryPlaylists())
}
next(action)
break
case 'RESTART':
location.reload()
break

20
src/js/services/spotify/actions.js
View File

@ -70,7 +70,7 @@ const sendRequest = ( dispatch, getState, endpoint, method = 'GET', data = false
dispatch(refreshToken(dispatch, getState))
}
dispatch(uiActions.createNotification('Spotify: '+message,'bad'))
dispatch(uiActions.createNotification(message,'bad'))
console.error( endpoint+' failed', response)
reject(error)
}
@ -978,11 +978,19 @@ export function getUserPlaylists(user_uri){
var playlists = []
for (var i = 0; i < response.items.length; i++){
var can_edit = false
if (getState().spotify.me && response.items[i].owner.id == getState().spotify.me.id){
can_edit = true
} else if (response.items[i].owner.id == getState().backend_username){
can_edit = true
}
playlists.push(Object.assign(
{},
response.items[i],
{
can_edit: (getState().spotify.me && response.items[i].owner.id == getState().spotify.me.id),
can_edit: can_edit,
tracks_total: response.items[i].tracks.total
}
))
@ -1259,6 +1267,9 @@ function loadNextPlaylistsBatch(dispatch, getState, playlists, lastResponse){
loadNextPlaylistsBatch( dispatch, getState, playlists, response )
});
}else{
dispatch(uiActions.processFinished('SPOTIFY_GET_ALL_LIBRARY_PLAYLISTS'))
dispatch({
type: 'SPOTIFY_LIBRARY_PLAYLISTS_LOADED',
playlists: playlists
@ -1266,8 +1277,11 @@ function loadNextPlaylistsBatch(dispatch, getState, playlists, lastResponse){
}
}
export function getAllLibraryPlaylists(){
export function getLibraryPlaylists(){
return (dispatch, getState) => {
dispatch(uiActions.startProcess('SPOTIFY_GET_ALL_LIBRARY_PLAYLISTS','Loading library playlists'))
sendRequest( dispatch, getState, 'me/playlists?limit=50' )
.then( response => {
loadNextPlaylistsBatch( dispatch, getState, response.items, response )

32
src/js/services/spotify/middleware.js
View File

@ -67,59 +67,27 @@ const SpotifyMiddleware = (function(){
break
case 'SPOTIFY_CREATE_PLAYLIST':
if( !store.getState().spotify.authorization ){
store.dispatch( uiActions.createNotification( "Must be logged in to Spotify to do that", 'bad' ) )
return
}
store.dispatch( spotifyActions.createPlaylist( action.name, action.description, action.is_private, action.is_collaborative ))
break
case 'SPOTIFY_REMOVE_PLAYLIST_TRACKS':
var playlist = state.core.playlists[action.key]
if( !store.getState().spotify.authorization ){
store.dispatch( uiActions.createNotification( "Must be logged in to Spotify to do that", 'bad' ) )
return
}
if( !store.getState().spotify.me || store.getState().spotify.me.id != playlist.owner.id ){
store.dispatch( uiActions.createNotification( "You can't edit a playlist you don't own", 'bad' ) )
return
}
store.dispatch( spotifyActions.deleteTracksFromPlaylist( playlist.uri, playlist.snapshot_id, action.tracks_indexes ))
break
case 'SPOTIFY_ADD_PLAYLIST_TRACKS':
if( !store.getState().spotify.authorization ){
store.dispatch( uiActions.createNotification( "Must be logged in to Spotify to do that", 'bad' ) )
return
}
store.dispatch( spotifyActions.addTracksToPlaylist( action.key, action.tracks_uris ))
break
case 'SPOTIFY_REORDER_PLAYLIST_TRACKS':
if( !store.getState().spotify.authorization ){
store.dispatch( uiActions.createNotification( "Must be logged in to Spotify to do that", 'bad' ) )
return
}
if( !store.getState().spotify.me || store.getState().spotify.me.id != helpers.getFromUri('artistid',action.key) ){
store.dispatch( uiActions.createNotification( "You can't edit a playlist you don't own", 'bad' ) )
return
}
store.dispatch( spotifyActions.reorderPlaylistTracks( action.key, action.range_start, action.range_length, action.insert_before, action.snapshot_id ))
break
case 'SPOTIFY_SAVE_PLAYLIST':
if( !store.getState().spotify.authorization ){
store.dispatch( uiActions.createNotification( "Must be logged in to Spotify to do that", 'bad' ) )
return
}
store.dispatch( spotifyActions.savePlaylist( action.key, action.name, action.description, action.is_public, action.is_collaborative ))
break

12
src/js/services/ui/actions.js
View File

@ -168,23 +168,25 @@ export function stopLoading(key){
}
}
export function startProcess(key,content){
export function startProcess(key,message,data = {}){
return {
type: 'START_PROCESS',
key: key,
content: content
message: message,
data: data
}
}
export function updateProcess(key,content){
export function updateProcess(key,message,data = {}){
return {
type: 'UPDATE_PROCESS',
key: key,
content: content
message: message,
data: data
}
}
export function runProcess(key){
export function runProcess(key,data = {}){
return {
type: key
}

3
src/js/services/ui/middleware.js
View File

@ -124,7 +124,8 @@ const UIMiddleware = (function(){
case 'START_PROCESS':
store.dispatch({
type: action.key
type: action.key,
data: action.data
})
next(action)
break

3
src/js/services/ui/reducer.js
View File

@ -130,7 +130,8 @@ export default function reducer(ui = {}, action){
var processes = Object.assign({}, (ui.processes ? ui.processes : []))
processes[action.key] = {
key: action.key,
content: action.content
message: action.message,
data: action.data
}
return Object.assign({}, ui, {processes: processes})