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

Merge branch 'feature/async'

Browse Source
This commit is contained in:
James Barnsley
2017-10-14 17:43:12 +13:00
parent 3caac95c55 c36ea44925
commit c529039d20
9 changed files with 310 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,18 +77,21 @@ const CoreMiddleware = (function(){
next(action)
break
case 'ALBUM_LOADED':
if (action.data) ReactGA.event({ category: 'Album', action: 'Load', label: action.album.uri })
case 'TRACK_LOADED':
if (action.data) ReactGA.event({ category: 'Track', action: 'Load', label: action.key });
if (action.track.album && action.track.album.images && action.track.album.images.length > 0){
action.track.album.images = helpers.digestMopidyImages(store.getState().mopidy, action.track.album.images);
}
next(action)
break
case 'ALBUM_LOADED':
if (action.data) ReactGA.event({ category: 'Album', action: 'Load', label: action.key })
// make sure our images use mopidy host:port
if (action.album.images && action.album.images.length > 0){
var images = Object.assign([], action.album.images)
for (var i = 0; i < images.length; i++){
if (typeof(images[i]) === 'string' && images[i].startsWith('/images/')){
images[i] = '//'+store.getState().mopidy.host+':'+store.getState().mopidy.port+images[i]
}
}
action.album.images = images
action.album.images = helpers.digestMopidyImages(store.getState().mopidy, action.album.images);
}
next(action)
@ -98,15 +101,8 @@ const CoreMiddleware = (function(){
if (action.data) ReactGA.event({ category: 'Albums', action: 'Load', label: action.albums.length+' items' })
for (var i = 0; i < action.albums.length; i++){
// make sure our images use mopidy host:port
if (action.albums[i].images && action.albums[i].images.length > 0){
var images = Object.assign([], action.albums[i].images)
for (var j = 0; j < images.length; j++){
if (typeof(images[j]) === 'string' && images[j].startsWith('/images/')){
images[j] = '//'+store.getState().mopidy.host+':'+store.getState().mopidy.port+images[j]
}
}
action.albums[i].images = images
action.albums[i].images = helpers.digestMopidyImages(store.getState().mopidy, action.albums[i].images);
}
}

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

@ -1735,13 +1735,12 @@ const MopidyMiddleware = (function(){
instruct(socket, store, 'library.getImages', {uris: action.uris})
.then(response => {
let records = []
var records = []
for (var uri in response){
if (response.hasOwnProperty(uri)){
let images = response[uri]
images = helpers.digestMopidyImages(store.getState().mopidy, images)
var images = response[uri];
images = helpers.digestMopidyImages(store.getState().mopidy, images);
records.push({
uri: uri,
images: images
@ -1749,7 +1748,7 @@ const MopidyMiddleware = (function(){
}
}
let action_data = {
var action_data = {
type: (action.context+'_LOADED').toUpperCase()
}
action_data[action.context] = records