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

Bringing all tracks into core index; Need to refactor loading all assets

Browse Source
This commit is contained in:
James Barnsley
2017-11-08 08:44:56 +13:00
parent 7739a16504
commit 5063cc095c
6 changed files with 183 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,14 @@ const CoreMiddleware = (function(){
action.album.images = helpers.digestMopidyImages(store.getState().mopidy, action.album.images);
}
// Load our tracks
if (action.album.tracks){
store.dispatch({
type: 'TRACKS_LOADED',
tracks: action.album.tracks
});
}
next(action)
break
@ -129,13 +137,30 @@ const CoreMiddleware = (function(){
if (action.albums[i].images && action.albums[i].images.length > 0){
action.albums[i].images = helpers.digestMopidyImages(store.getState().mopidy, action.albums[i].images);
}
// Load our tracks
if (action.albums[i].tracks){
store.dispatch({
type: 'TRACKS_LOADED',
tracks: action.albums[i].tracks
});
}
}
next(action)
break
case 'ARTIST_LOADED':
if (action.data) ReactGA.event({ category: 'Artist', action: 'Load', label: action.artist.uri })
if (action.data) ReactGA.event({ category: 'Artist', action: 'Load', label: action.artist.uri });
// Load our tracks
if (action.artist.tracks){
store.dispatch({
type: 'TRACKS_LOADED',
tracks: action.artist.tracks
});
}
next(action)
break
@ -239,9 +264,17 @@ const CoreMiddleware = (function(){
}
}
// Load our tracks
if (action.playlist.tracks){
store.dispatch({
type: 'TRACKS_LOADED',
tracks: action.playlist.tracks
});
}
// proceed as usual
action.playlist = playlist
next(action)
action.playlist = playlist;
next(action);
break
case 'PLAYLISTS_LOADED':
@ -290,6 +323,49 @@ const CoreMiddleware = (function(){
next(action)
break
case 'MOPIDY_TLTRACKS':
var core = store.getState().core;
var tracklist = []
for (var i = 0; i < action.data.length; i++){
var tltrack = helpers.formatTracks(action.data[i]);
// load our metadata (if we have any for that tlid)
if (core.queue_metadata !== undefined && core.queue_metadata['tlid_'+tltrack.tlid] !== undefined){
var metadata = core.queue_metadata['tlid_'+tltrack.tlid]
} else {
var metadata = {}
}
var current_tlid = null;
if (core.current_track && core.tracks && core.tracks[core.current_track] !== undefined && core.tracks[core.current_track].tlid !== undefined){
current_tlid = core.tracks[core.current_track].tlid;
}
var track = Object.assign(
{},
tltrack,
metadata,
{
playing: (tltrack.tlid == current_tlid)
})
tracklist.push(track)
}
// Append to our action
tracklist = helpers.formatTracks(tracklist);
action.tracklist = tracklist;
// Load our tracks into index
store.dispatch({
type: 'TRACKS_LOADED',
tracks: tracklist
});
next(action);
break
// Get assets from all of our providers
case 'GET_LIBRARY_PLAYLISTS':
if (store.getState().spotify.connected){

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

@ -12,38 +12,10 @@ export default function reducer(core = {}, action){
**/
case 'MOPIDY_TLTRACKS':
if (!action.data ) return core
var tracklist = []
for (var i = 0; i < action.data.length; i++){
var tltrack = helpers.formatTracks(action.data[i]);
// load our metadata (if we have any for that tlid)
if (core.queue_metadata !== undefined && core.queue_metadata['tlid_'+tltrack.tlid] !== undefined){
var metadata = core.queue_metadata['tlid_'+tltrack.tlid]
} else {
var metadata = {}
}
var current_tlid = null;
if (core.current_track && core.tracks && core.tracks[core.current_track] !== undefined && core.tracks[core.current_track].tlid !== undefined){
current_tlid = core.tracks[core.current_track].tlid;
}
var track = Object.assign(
{},
tltrack,
metadata,
{
playing: (tltrack.tlid == current_tlid)
})
tracklist.push(track)
if (!action.tracklist){
return core;
}
tracklist = helpers.formatTracks(tracklist);
return Object.assign({}, core, { current_tracklist: tracklist });
return Object.assign({}, core, { current_tracklist: action.tracklist });
case 'MOPIDY_CURRENTTLTRACK':
if (!action.data) return core

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

@ -15,7 +15,10 @@ const sendRequest = (dispatch, getState, params, signed = false) => {
return new Promise((resolve, reject) => {
var loader_key = helpers.generateGuid();
dispatch(uiActions.startLoading(loader_key, 'lastfm_'+params));
var method = params.substring(params.indexOf("method=")+7, params.length);
method = method.substring(0, method.indexOf("&"));
dispatch(uiActions.startLoading(loader_key, 'lastfm_'+method));
var config = {
method: 'GET',
@ -83,8 +86,11 @@ const sendSignedRequest = (dispatch, getState, params) => {
});
}
var loader_key = helpers.generateGuid()
dispatch(uiActions.startLoading(loader_key, 'lastfm_'+params));
var loader_key = helpers.generateGuid();
var method = params.substring(params.indexOf("method=")+7, params.length);
method = method.substring(0, method.indexOf("&"));
dispatch(uiActions.startLoading(loader_key, 'lastfm_'+method));
params += "&sk="+getState().lastfm.session.key;

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

@ -32,15 +32,6 @@ const LastfmMiddleware = (function(){
next(action);
break;
case 'MOPIDY_CURRENTTLTRACK':
if (action.data && action.data.track){
if (state.lastfm.session){
store.dispatch(lastfmActions.scrobble(action.data.track));
}
}
next(action);
break;
// This action is irrelevant to us, pass it on to the next middleware
default: