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

Play/queue actions on playlist save tracks to index for faster reuse

Browse Source
This commit is contained in:
James Barnsley
2020-06-12 22:42:49 +12:00
parent 7be693dea3
commit 7f9e2eeaf5
6 changed files with 87 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mopidy_iris/static/app.js
View File

@ -88723,8 +88723,8 @@ function getAllPlaylistTracksProcessor(data) {
}
// Add on our new batch of loaded tracks
var uris = [];
var new_uris = [];
var tracks = [];
var new_tracks = [];
var _iteratorNormalCompletion3 = true;
var _didIteratorError3 = false;
var _iteratorError3 = undefined;
@ -88734,7 +88734,7 @@ function getAllPlaylistTracksProcessor(data) {
var item = _step3.value;
if (item.track) {
new_uris.push(item.track.uri);
new_tracks.push(item.track);
}
}
} catch (err) {
@ -88752,24 +88752,30 @@ function getAllPlaylistTracksProcessor(data) {
}
}
if (data.uris) {
uris = [].concat(_toConsumableArray(data.uris), new_uris);
if (data.tracks) {
tracks = [].concat(_toConsumableArray(data.tracks), new_tracks);
} else {
uris = new_uris;
tracks = new_tracks;
}
// We got a next link, so we've got more work to be done
if (response.next) {
dispatch(uiActions.updateProcess('SPOTIFY_GET_ALL_PLAYLIST_TRACKS_PROCESSOR', 'Loading ' + (response.total - uris.length) + ' playlist tracks', _extends({}, data, {
dispatch(uiActions.updateProcess('SPOTIFY_GET_ALL_PLAYLIST_TRACKS_PROCESSOR', 'Loading ' + (response.total - tracks.length) + ' playlist tracks', _extends({}, data, {
next: response.next,
total: response.total,
remaining: response.total - uris.length
remaining: response.total - tracks.length
})));
dispatch(uiActions.runProcess('SPOTIFY_GET_ALL_PLAYLIST_TRACKS_PROCESSOR', _extends({}, data, {
next: response.next,
uris: uris
tracks: tracks
})));
} else {
// Seeing as we now have all the playlist's tracks, add them to the playlist we have
// in our index for quicker reuse next time
dispatch(coreActions.loadedMore('playlist', data.uri, 'track', { tracks: tracks }));
var uris = (0, _arrays.arrayOf)('uri', tracks);
if (data.shuffle) {
uris = (0, _arrays.shuffle)(uris);
}
@ -90770,7 +90776,7 @@ function reducer() {
var status = 'running';
if (last_run) {
var data = _extends({}, last_run.data, action.data);
status = last_run.status;
if (action.type === 'UPDATE_PROCESS') status = last_run.status;
} else {
var data = action.data;
}

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

@ -100,7 +100,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1591866424";
var build = "1591956475";
var version = "3.49.0";
// Construct the script tag

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

@ -131,27 +131,27 @@ function getToken(dispatch, getState) {
// We've already got a refresh in progress
if (getState().ui.load_queue.spotify_refresh_token !== undefined) {
console.log("Already refreshing token, we'll wait 1000ms and try again");
console.log("Already refreshing token, we'll wait 1000ms and try again");
// Re-check the queue periodically to see if it's finished yet
// TODO: Look at properly hooking up with the ajax finish event
setTimeout(
() =>
// Return myself for a re-check
getToken(dispatch, getState),
1000,
);
// Re-check the queue periodically to see if it's finished yet
// TODO: Look at properly hooking up with the ajax finish event
setTimeout(
() =>
// Return myself for a re-check
getToken(dispatch, getState),
1000,
);
} else {
refreshToken(dispatch, getState)
.then(
(response) => {
resolve(response.access_token);
},
(error) => {
reject(error);
},
);
}
refreshToken(dispatch, getState)
.then(
(response) => {
resolve(response.access_token);
},
(error) => {
reject(error);
},
);
}
});
}
@ -1206,14 +1206,14 @@ export function getArtistImages(artist) {
return (dispatch, getState) => {
request(dispatch, getState, `search?q=${artist.name}&type=artist`)
.then(response => {
if (response.artists.items.length > 0) {
const updatedArtist = {
uri: artist.uri,
images: response.artists.items[0].images,
}
dispatch(coreActions.artistLoaded(updatedArtist));
if (response.artists.items.length > 0) {
const updatedArtist = {
uri: artist.uri,
images: response.artists.items[0].images,
}
},
dispatch(coreActions.artistLoaded(updatedArtist));
}
},
error => {
dispatch(coreActions.handleException(
'Could not load artists',
@ -1658,56 +1658,65 @@ export function getAllPlaylistTracksProcessor(data) {
}
// Add on our new batch of loaded tracks
let uris = [];
const new_uris = [];
let tracks = [];
const new_tracks = [];
for (const item of response.items) {
if (item.track) {
new_uris.push(item.track.uri);
}
if (item.track) {
new_tracks.push(item.track);
}
}
if (data.uris) {
uris = [...data.uris, ...new_uris];
if (data.tracks) {
tracks = [...data.tracks, ...new_tracks];
} else {
uris = new_uris;
tracks = new_tracks;
}
// We got a next link, so we've got more work to be done
if (response.next) {
dispatch(uiActions.updateProcess(
'SPOTIFY_GET_ALL_PLAYLIST_TRACKS_PROCESSOR',
`Loading ${response.total - uris.length} playlist tracks`,
`Loading ${response.total - tracks.length} playlist tracks`,
{
...data,
next: response.next,
total: response.total,
remaining: response.total - uris.length,
...data,
next: response.next,
total: response.total,
remaining: response.total - tracks.length,
},
));
dispatch(uiActions.runProcess(
'SPOTIFY_GET_ALL_PLAYLIST_TRACKS_PROCESSOR',
{
...data,
next: response.next,
uris,
...data,
next: response.next,
tracks,
},
));
} else {
if (data.shuffle) {
uris = shuffle(uris);
}
// Seeing as we now have all the playlist's tracks, add them to the playlist we have
// in our index for quicker reuse next time
dispatch(coreActions.loadedMore(
'playlist',
data.uri,
'track',
{ tracks },
));
// We don't bother "finishing", we just want it "finished" immediately
// This bypasses the fade transition for a more smooth transition between two
// processes that flow together
let uris = arrayOf('uri', tracks);
if (data.shuffle) {
uris = shuffle(uris);
}
// We don't bother "finishing", we just want it "finished" immediately
// This bypasses the fade transition for a more smooth transition between two
// processes that flow together
dispatch(uiActions.removeProcess('SPOTIFY_GET_ALL_PLAYLIST_TRACKS_PROCESSOR'));
if (data.callback_action == 'enqueue') {
dispatch(mopidyActions.enqueueURIs(uris, data.uri, data.play_next, data.at_position, data.offset));
} else {
dispatch(mopidyActions.playURIs(uris, data.uri));
}
if (data.callback_action == 'enqueue') {
dispatch(mopidyActions.enqueueURIs(uris, data.uri, data.play_next, data.at_position, data.offset));
} else {
dispatch(mopidyActions.playURIs(uris, data.uri));
}
}
},
(error) => {
@ -1895,7 +1904,7 @@ export function getLibraryArtists() {
}
export function getLibraryArtistsProcessor(data) {
return (dispatch, getState) => {
return (dispatch, getState) => {
request(dispatch, getState, data.next)
.then(
(response) => {

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

@ -43,8 +43,8 @@ const UIMiddleware = (function () {
case 'OPEN_MODAL':
if (store.getState().ui.allow_reporting) {
ReactGA.event({ category: 'Modal', action: 'Opened', label: action.modal.name });
}
ReactGA.event({ category: 'Modal', action: 'Opened', label: action.modal.name });
}
$('body').addClass('modal-open');
store.dispatch(uiActions.hideContextMenu());
store.dispatch(uiActions.hideTouchContextMenu());
@ -87,7 +87,7 @@ const UIMiddleware = (function () {
var notification = window.Notification || window.mozNotification || window.webkitNotification;
if (typeof notification === 'undefined') return false;
if (typeof notification !== 'undefined') notification.requestPermission((permission) => {});
if (typeof notification !== 'undefined') notification.requestPermission((permission) => { });
// handle nested data objects
var data = {};

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

@ -157,7 +157,7 @@ export default function reducer(ui = {}, action) {
var status = 'running';
if (last_run) {
var data = { ...last_run.data, ...action.data };
status = last_run.status;
if (action.type === 'UPDATE_PROCESS') status = last_run.status;
} else {
var { data } = action;
}