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

Moving libraries into each provider for better granularity; Loading all artists (larger than expected)

Browse Source
This commit is contained in:
James Barnsley
2017-08-12 23:01:55 +12:00
parent 884d3fdd49
commit eaf86e1848
9 changed files with 302 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -592,12 +592,20 @@ const MopidyMiddleware = (function(){
// drop in our URI list
var playlist_uris = helpers.arrayOf('uri',response)
var playlist_uris_filtered = []
store.dispatch({ type: 'LIBRARY_PLAYLISTS_LOADED', uris: playlist_uris });
// Remove any Spotify playlists. These will be handled by our Spotify API
for (var i = 0; i < playlist_uris.length; i++){
if (helpers.uriSource(playlist_uris[i]) != 'spotify'){
playlist_uris_filtered.push(playlist_uris[i])
}
}
store.dispatch({ type: 'MOPIDY_LIBRARY_PLAYLISTS_LOADED', uris: playlist_uris_filtered });
// get the full playlist objects
for (var i = 0; i < response.length; i++ ){
instruct( socket, store, 'playlists.lookup', { uri: response[i].uri })
for (var i = 0; i < playlist_uris_filtered.length; i++ ){
instruct( socket, store, 'playlists.lookup', { uri: playlist_uris_filtered[i] })
.then( response => {
var source = helpers.uriSource(response.uri)
var playlist = Object.assign(
@ -850,7 +858,7 @@ const MopidyMiddleware = (function(){
var uris = helpers.arrayOf('uri',response)
store.dispatch({
type: 'LIBRARY_ALBUMS_LOADED',
type: 'MOPIDY_LIBRARY_ALBUMS_LOADED',
uris: uris
});
@ -860,8 +868,6 @@ const MopidyMiddleware = (function(){
break;
case 'MOPIDY_LIBRARY_ALBUMS_PROCESSOR':
console.log(action)
if (store.getState().ui.processes['MOPIDY_LIBRARY_ALBUMS_PROCESSOR'] !== undefined){
var processor = store.getState().ui.processes['MOPIDY_LIBRARY_ALBUMS_PROCESSOR']

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

@ -122,6 +122,35 @@ export default function reducer(mopidy = {}, action){
enqueue_uris_batches: batches
});
/**
* Library
**/
case 'MOPIDY_LIBRARY_PLAYLISTS_LOADED':
if (mopidy.library_playlists){
var uris = [...mopidy.library_playlists,...action.uris]
} else {
var uris = action.uris
}
return Object.assign({}, mopidy, { library_playlists: uris })
case 'MOPIDY_LIBRARY_ARTISTS_LOADED':
if (mopidy.library_artists){
var uris = [...mopidy.library_artists,...action.uris]
} else {
var uris = action.uris
}
return Object.assign({}, mopidy, { library_artists: uris })
case 'MOPIDY_LIBRARY_ALBUMS_LOADED':
if (mopidy.library_albums){
var uris = [...mopidy.library_albums,...action.uris]
} else {
var uris = action.uris
}
return Object.assign({}, mopidy, { library_albums: uris })
default:
return mopidy
}