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

Fixing sorting for local playlist tracks

Browse Source
This commit is contained in:
James Barnsley
2017-12-21 08:38:21 +13:00
parent fc2ad51e60
commit 75bb86d592
6 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mopidy_iris/static/app.js
View File

@ -49176,7 +49176,7 @@ function reducer() {
case 'PLAYLIST_TRACKS':
var playlists = Object.assign([], core.playlists);
var playlist = Object.assign({}, playlists[action.key], { tracks: helpers.formatTracks(action.tracks) });
var playlist = Object.assign({}, playlists[action.key], { tracks_uris: action.tracks_uris });
playlists[action.key] = playlist;
return Object.assign({}, core, { playlists: playlists });
@ -50380,6 +50380,18 @@ var CoreMiddleware = function () {
});
break;
case 'PLAYLIST_TRACKS':
var tracks = helpers.formatTracks(action.tracks);
action.tracks_uris = helpers.arrayOf('uri', tracks);
store.dispatch({
type: 'TRACKS_LOADED',
tracks: tracks
});
next(action);
break;
case 'PLAYLIST_TRACKS_REORDERED':
var playlists = Object.assign({}, core.playlists);
var playlist = Object.assign({}, playlists[action.key]);
@ -52515,7 +52527,6 @@ var MopidyMiddleware = function () {
// update playlist
playlist = Object.assign({}, playlist, { tracks: tracks });
instruct(socket, store, 'playlists.save', { playlist: playlist }).then(function (response) {
store.dispatch({
type: 'MOPIDY_RESOLVE_PLAYLIST_TRACKS',
tracks: playlist.tracks,

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/index.html
View File

@ -38,7 +38,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1513712660";
var build = "1513797212";
var version = "3.9.0";
// Construct the script tag

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

@ -248,6 +248,18 @@ const CoreMiddleware = (function(){
});
break;
case 'PLAYLIST_TRACKS':
var tracks = helpers.formatTracks(action.tracks);
action.tracks_uris = helpers.arrayOf('uri', tracks);
store.dispatch({
type: 'TRACKS_LOADED',
tracks: tracks
});
next(action);
break;
case 'PLAYLIST_TRACKS_REORDERED':
var playlists = Object.assign({}, core.playlists);
var playlist = Object.assign({}, playlists[action.key]);

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

@ -188,7 +188,7 @@ export default function reducer(core = {}, action){
case 'PLAYLIST_TRACKS':
var playlists = Object.assign([], core.playlists)
var playlist = Object.assign({}, playlists[action.key], { tracks: helpers.formatTracks(action.tracks) })
var playlist = Object.assign({}, playlists[action.key], { tracks_uris: action.tracks_uris })
playlists[action.key] = playlist
return Object.assign({}, core, { playlists: playlists });

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

@ -1270,7 +1270,7 @@ const MopidyMiddleware = (function(){
});
break
case 'MOPIDY_REORDER_PLAYLIST_TRACKS':
case 'MOPIDY_REORDER_PLAYLIST_TRACKS':
instruct(socket, store, 'playlists.lookup', { uri: action.key })
.then(response => {
@ -1303,13 +1303,12 @@ const MopidyMiddleware = (function(){
playlist = Object.assign({}, playlist, { tracks: tracks })
instruct(socket, store, 'playlists.save', { playlist: playlist } )
.then(response => {
store.dispatch({
type: 'MOPIDY_RESOLVE_PLAYLIST_TRACKS',
tracks: playlist.tracks,
key: playlist.uri
})
})
});
});
});
break