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

Processor cancelled vs finished; Re-run processor if incomplete during next render

Browse Source
This commit is contained in:
James Barnsley
2017-08-15 16:36:50 +12:00
parent 6f0088204b
commit f51e83099e
14 changed files with 156 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/js/services/core/reducer.js
View File

@ -200,36 +200,6 @@ export default function reducer(core = {}, action){
return Object.assign({}, core, { albums: albums });
case 'LIBRARY_ALBUMS_LOADED':
var library_albums = []
if (core.library_albums) library_albums = Object.assign([], core.library_albums)
return Object.assign({}, core, {
library_albums: helpers.removeDuplicates([...library_albums, ...action.uris]),
library_albums_more: (action.more ? action.more : null),
library_albums_total: (action.total ? action.total : null),
library_albums_started: (action.started ? action.started : null),
});
case 'ALBUM_LIBRARY_CHECK':
var items = Object.assign([], core.library_albums)
// add/remove library reference
var index = items.indexOf(action.key)
// removing existing
if (index > -1 && !action.in_library){
items.splice(index, 1)
} else if (index < 0 && action.in_library){
items.push(action.key)
}
return Object.assign({}, core, { library_albums: items });
case 'LOCAL_ALBUMS_LOADED':
if (!action.uris) return Object.assign({}, core, { local_albums: null });
return Object.assign({}, core, { local_albums: action.uris });
case 'NEW_RELEASES_LOADED':
if (!action.uris){
return Object.assign({}, core, {
@ -304,36 +274,6 @@ export default function reducer(core = {}, action){
artists[action.key] = artist
return Object.assign({}, core, { artists: artists });
case 'LIBRARY_ARTISTS_LOADED':
var library_artists = []
if (core.library_artists) library_artists = Object.assign([], core.library_artists)
return Object.assign({}, core, {
library_artists: helpers.removeDuplicates([...library_artists, ...action.uris]),
library_artists_more: action.more,
library_artists_total: action.total,
library_artists_started: true
});
case 'ARTIST_LIBRARY_CHECK':
var items = Object.assign([], core.library_artists)
// add/remove library reference
var index = items.indexOf(action.key)
// removing existing
if (index > -1 && !action.in_library){
items.splice(index, 1)
} else if (index < 0 && action.in_library){
items.push(action.key)
}
return Object.assign({}, core, { library_artists: items });
case 'LOCAL_ARTISTS_LOADED':
if (!action.uris) return Object.assign({}, core, { local_artists: null });
return Object.assign({}, core, { local_artists: action.uris });
/**
* User profiles
@ -532,21 +472,6 @@ export default function reducer(core = {}, action){
library_playlists_started: true
});
case 'PLAYLIST_LIBRARY_CHECK':
var items = Object.assign([], core.library_playlists)
// add/remove library reference
var index = items.indexOf(action.key)
// removing existing
if (index > -1 && !action.in_library){
items.splice(index, 1)
} else if (index < 0 && action.in_library){
items.push(action.key)
}
return Object.assign({}, core, { library_playlists: items });
/**
* Genres

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

@ -852,6 +852,9 @@ const MopidyMiddleware = (function(){
**/
case 'MOPIDY_GET_LIBRARY_ALBUMS':
store.dispatch({type: 'MOPIDY_LIBRARY_ALBUMS_CLEAR'})
instruct( socket, store, 'library.browse', { uri: 'local:directory?type=album' } )
.then( response => {
if (response.length <= 0) return
@ -872,7 +875,7 @@ const MopidyMiddleware = (function(){
var processor = store.getState().ui.processes['MOPIDY_LIBRARY_ALBUMS_PROCESSOR']
if (processor.cancelling){
store.dispatch(uiActions.processFinished('MOPIDY_LIBRARY_ALBUMS_PROCESSOR'))
store.dispatch(uiActions.processCancelled('MOPIDY_LIBRARY_ALBUMS_PROCESSOR'))
return false
}
}
@ -1003,6 +1006,9 @@ const MopidyMiddleware = (function(){
**/
case 'MOPIDY_GET_LIBRARY_ARTISTS':
store.dispatch({type: 'MOPIDY_LIBRARY_ARTISTS_CLEAR'})
instruct( socket, store, 'library.browse', { uri: 'local:directory?type=artist' } )
.then( response => {
if (response.length <= 0) return
@ -1024,7 +1030,7 @@ const MopidyMiddleware = (function(){
var processor = store.getState().ui.processes['MOPIDY_LIBRARY_ARTISTS_PROCESSOR']
if (processor.cancelling){
store.dispatch(uiActions.processFinished('MOPIDY_LIBRARY_ARTISTS_PROCESSOR'))
store.dispatch(uiActions.processCancelled('MOPIDY_LIBRARY_ARTISTS_PROCESSOR'))
return false
}
}

29
src/js/services/mopidy/reducer.js
View File

@ -151,6 +151,35 @@ export default function reducer(mopidy = {}, action){
}
return Object.assign({}, mopidy, { library_albums: uris })
case 'MOPIDY_LIBRARY_PLAYLISTS_CLEAR':
return Object.assign({}, mopidy, { library_playlists: [] })
case 'MOPIDY_LIBRARY_ARTISTS_CLEAR':
return Object.assign({}, mopidy, { library_artists: [] })
case 'MOPIDY_LIBRARY_ALBUMS_CLEAR':
return Object.assign({}, mopidy, { library_albums: [] })
case 'MOPIDY_LIBRARY_PLAYLISTS_PROCESSOR_CANCELLED':
return Object.assign({}, mopidy, { library_playlists_status: 'cancelled' })
case 'MOPIDY_LIBRARY_PLAYLISTS_PROCESSOR_FINISHED':
return Object.assign({}, mopidy, { library_playlists_status: 'finished' })
case 'MOPIDY_LIBRARY_ARTISTS_PROCESSOR_CANCELLED':
return Object.assign({}, mopidy, { library_artists_status: 'cancelled' })
case 'MOPIDY_LIBRARY_ARTISTS_PROCESSOR_FINISHED':
return Object.assign({}, mopidy, { library_artists_status: 'finished' })
case 'MOPIDY_LIBRARY_ALBUMS_PROCESSOR_CANCELLED':
return Object.assign({}, mopidy, { library_albums_status: 'cancelled' })
case 'MOPIDY_LIBRARY_ALBUMS_PROCESSOR_FINISHED':
return Object.assign({}, mopidy, { library_albums_status: 'finished' })
default:
return mopidy
}

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

@ -597,10 +597,10 @@ export function following(uri, method = 'GET'){
if( typeof(is_following) === 'object' ) is_following = is_following[0]
dispatch({
type: asset_name.toUpperCase()+'_LIBRARY_CHECK',
type: 'SPOTIFY_LIBRARY_'+asset_name.toUpperCase()+'_CHECK',
key: uri,
in_library: is_following
});
})
});
}
}
@ -1298,6 +1298,7 @@ export function reorderPlaylistTracks( uri, range_start, range_length, insert_be
export function getLibraryPlaylists(){
return (dispatch, getState) => {
dispatch({type: 'SPOTIFY_LIBRARY_PLAYLISTS_CLEAR'})
dispatch(uiActions.startProcess('SPOTIFY_GET_LIBRARY_PLAYLISTS_PROCESSOR','Loading Spotify playlists', {next: 'me/playlists?limit=50'}))
}
}
@ -1317,7 +1318,7 @@ export function getLibraryPlaylistsProcessor(data){
var processor = getState().ui.processes['SPOTIFY_GET_LIBRARY_PLAYLISTS_PROCESSOR']
if (processor.cancelling){
dispatch(uiActions.processFinished('SPOTIFY_GET_LIBRARY_PLAYLISTS_PROCESSOR'))
dispatch(uiActions.processCancelled('SPOTIFY_GET_LIBRARY_PLAYLISTS_PROCESSOR'))
return false
}
}
@ -1343,6 +1344,7 @@ export function getLibraryPlaylistsProcessor(data){
export function getLibraryArtists(){
return (dispatch, getState) => {
dispatch({type: 'SPOTIFY_LIBRARY_ARTISTS_CLEAR'})
dispatch(uiActions.startProcess('SPOTIFY_GET_LIBRARY_ARTISTS_PROCESSOR','Loading Spotify artists', {next: 'me/following?type=artist&limit=50'}))
}
}
@ -1362,7 +1364,7 @@ export function getLibraryArtistsProcessor(data){
var processor = getState().ui.processes['SPOTIFY_GET_LIBRARY_ARTISTS_PROCESSOR']
if (processor.cancelling){
dispatch(uiActions.processFinished('SPOTIFY_GET_LIBRARY_ARTISTS_PROCESSOR'))
dispatch(uiActions.processCancelled('SPOTIFY_GET_LIBRARY_ARTISTS_PROCESSOR'))
return false
}
}
@ -1388,6 +1390,7 @@ export function getLibraryArtistsProcessor(data){
export function getLibraryAlbums(){
return (dispatch, getState) => {
dispatch({type: 'SPOTIFY_LIBRARY_ALBUMS_CLEAR'})
dispatch(uiActions.startProcess('SPOTIFY_GET_LIBRARY_ALBUMS_PROCESSOR','Loading Spotify albums', {next: 'me/albums?limit=50'}))
}
}
@ -1407,7 +1410,7 @@ export function getLibraryAlbumsProcessor(data){
var processor = getState().ui.processes['SPOTIFY_GET_LIBRARY_ALBUMS_PROCESSOR']
if (processor.cancelling){
dispatch(uiActions.processFinished('SPOTIFY_GET_LIBRARY_ALBUMS_PROCESSOR'))
dispatch(uiActions.processCancelled('SPOTIFY_GET_LIBRARY_ALBUMS_PROCESSOR'))
return false
}
}

60
src/js/services/spotify/reducer.js
View File

@ -174,6 +174,66 @@ export default function reducer(spotify = {}, action){
}
return Object.assign({}, spotify, { library_albums: uris })
case 'SPOTIFY_LIBRARY_PLAYLISTS_CLEAR':
return Object.assign({}, spotify, { library_playlists: [] })
case 'SPOTIFY_LIBRARY_ARTISTS_CLEAR':
return Object.assign({}, spotify, { library_artists: [] })
case 'SPOTIFY_LIBRARY_ALBUMS_CLEAR':
return Object.assign({}, spotify, { library_albums: [] })
case 'SPOTIFY_GET_LIBRARY_PLAYLISTS_PROCESSOR_CANCELLED':
return Object.assign({}, spotify, { library_playlists_status: 'cancelled' })
case 'SPOTIFY_GET_LIBRARY_PLAYLISTS_PROCESSOR_FINISHED':
return Object.assign({}, spotify, { library_playlists_status: 'finished' })
case 'SPOTIFY_GET_LIBRARY_ARTISTS_PROCESSOR_CANCELLED':
return Object.assign({}, spotify, { library_artists_status: 'cancelled' })
case 'SPOTIFY_GET_LIBRARY_ARTISTS_PROCESSOR_FINISHED':
return Object.assign({}, spotify, { library_artists_status: 'finished' })
case 'SPOTIFY_GET_LIBRARY_ALBUMS_PROCESSOR_CANCELLED':
return Object.assign({}, spotify, { library_albums_status: 'cancelled' })
case 'SPOTIFY_GET_LIBRARY_ALBUMS_PROCESSOR_FINISHED':
return Object.assign({}, spotify, { library_albums_status: 'finished' })
case 'SPOTIFY_LIBRARY_ALBUM_CHECK':
var items = Object.assign([], spotify.library_albums)
var index = items.indexOf(action.key)
if (index > -1 && !action.in_library){
items.splice(index, 1)
} else if (index < 0 && action.in_library){
items.push(action.key)
}
return Object.assign({}, spotify, { library_albums: items });
case 'SPOTIFY_LIBRARY_ARTIST_CHECK':
var items = Object.assign([], spotify.library_artists)
var index = items.indexOf(action.key)
if (index > -1 && !action.in_library){
items.splice(index, 1)
} else if (index < 0 && action.in_library){
items.push(action.key)
}
return Object.assign({}, spotify, { library_artists: items });
case 'SPOTIFY_LIBRARY_PLAYLIST_CHECK':
var items = Object.assign([], spotify.library_playlists)
var index = items.indexOf(action.key)
if (index > -1 && !action.in_library){
items.splice(index, 1)
} else if (index < 0 && action.in_library){
items.push(action.key)
}
return Object.assign({}, spotify, { library_playlists: items });
default:
return spotify
}

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

@ -200,6 +200,13 @@ export function cancelProcess(key){
}
}
export function processCancelled(key){
return {
type: 'PROCESS_CANCELLED',
key: key
}
}
export function processFinished(key){
return {
type: 'PROCESS_FINISHED',

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

@ -130,9 +130,16 @@ const UIMiddleware = (function(){
next(action)
break
case 'CANCEL_PROCESS':
case 'PROCESS_CANCELLED':
store.dispatch({
type: action.key+'_CANCEL'
type: action.key+'_CANCELLED'
})
next(action)
break
case 'PROCESS_FINISHED':
store.dispatch({
type: action.key+'_FINISHED'
})
next(action)
break

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

@ -153,6 +153,7 @@ export default function reducer(ui = {}, action){
}
return Object.assign({}, ui, {processes: processes})
case 'PROCESS_CANCELLED':
case 'PROCESS_FINISHED':
var processes = Object.assign({}, (ui.processes ? ui.processes : {}))
if (processes[action.key]){