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

Upgrading to lookup.uris (no singular uri argument any more); Immutable add_uris prevents track disappearing from lists

Browse Source
This commit is contained in:
James Barnsley
2020-01-18 07:32:44 +13:00
parent aff3a4d035
commit 20d5e3729d
5 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
mopidy_iris/static/app.js
View File

@ -70320,7 +70320,7 @@ function clearLibraryArtists() {
function getArtist(uri) {
return {
type: 'MOPIDY_GET_ARTIST',
data: { uri: uri }
uri: uri
};
}
@ -71076,12 +71076,12 @@ var MopidyMiddleware = function () {
}));
// split into batches
var uris = Object.assign([], action.uris);
var _uris = Object.assign([], action.uris);
var batches = [];
var batch_size = 5;
while (uris.length > 0) {
while (_uris.length > 0) {
batches.push({
uris: uris.splice(0, batch_size),
uris: _uris.splice(0, batch_size),
at_position: action.at_position,
play_next: action.play_next,
offset: action.offset + batch_size * batches.length,
@ -71183,8 +71183,11 @@ var MopidyMiddleware = function () {
break;
case 'MOPIDY_PLAY_URIS':
var from_uri = action.from_uri;
if (!action.uris || action.uris.length <= 0) {
var _uris = Object.assign([], action.uris);
if (!_uris || !_uris.length) {
_this.props.uiActions.createNotification({ content: 'No URIs to play', type: 'warning' });
break;
}
@ -71205,7 +71208,7 @@ var MopidyMiddleware = function () {
} else {
var first_uri_index = 0;
}
var first_uri = action.uris[first_uri_index];
var first_uri = _uris[first_uri_index];
// add our first track
request(socket, store, 'tracklist.add', { uris: [first_uri], at_position: 0 }).then(function (response) {
@ -71217,20 +71220,20 @@ var MopidyMiddleware = function () {
for (var _i2 = 0; _i2 < response.length; _i2++) {
tlids.push(response[_i2].tlid);
}
store.dispatch(pusherActions.addQueueMetadata(tlids, action.from_uri));
store.dispatch(pusherActions.addQueueMetadata(tlids, from_uri));
} else {
store.dispatch(coreActions.handleException('Mopidy: Failed to add some tracks', response));
}
// Remove our first_uri as we've already added it
action.uris.splice(first_uri_index, 1);
_uris.splice(first_uri_index, 1);
// And add the rest of our uris (if any)
if (action.uris.length > 0) {
if (_uris.length > 0) {
// Wait a moment so the server can trigger track_changed etc
// this means our UI feels snappier as the first track shows up quickly
setTimeout(function () {
store.dispatch(mopidyActions.enqueueURIs(action.uris, action.from_uri, null, 1));
store.dispatch(mopidyActions.enqueueURIs(_uris, from_uri, null, 1));
}, 100);
}
}, function (error) {
@ -71818,9 +71821,9 @@ var MopidyMiddleware = function () {
case 'MOPIDY_RESOLVE_PLAYLIST_TRACKS':
var tracks = Object.assign([], action.tracks);
var uris = helpers.arrayOf('uri', tracks);
var _uris = helpers.arrayOf('uri', tracks);
request(socket, store, 'library.lookup', { uris: uris }).then(function (response) {
request(socket, store, 'library.lookup', { uris: _uris }).then(function (response) {
for (var uri in response) {
if (response.hasOwnProperty(uri)) {
var track = response[uri][0];
@ -72036,15 +72039,15 @@ var MopidyMiddleware = function () {
}
}
var uris = Object.assign([], action.data.uris);
var uris_to_load = uris.splice(0, 50);
var _uris = Object.assign([], action.data.uris);
var uris_to_load = _uris.splice(0, 50);
if (uris_to_load.length > 0) {
store.dispatch(uiActions.updateProcess('MOPIDY_LIBRARY_ALBUMS_PROCESSOR', 'Loading ' + uris.length + ' local albums', {
uris: uris,
remaining: uris.length
store.dispatch(uiActions.updateProcess('MOPIDY_LIBRARY_ALBUMS_PROCESSOR', 'Loading ' + _uris.length + ' local albums', {
uris: _uris,
remaining: _uris.length
}));
store.dispatch(mopidyActions.getAlbums(uris_to_load, { name: 'MOPIDY_LIBRARY_ALBUMS_PROCESSOR', data: { uris: uris } }));
store.dispatch(mopidyActions.getAlbums(uris_to_load, { name: 'MOPIDY_LIBRARY_ALBUMS_PROCESSOR', data: { uris: _uris } }));
} else {
store.dispatch(uiActions.processFinishing('MOPIDY_LIBRARY_ALBUMS_PROCESSOR'));
}
@ -72286,11 +72289,10 @@ var MopidyMiddleware = function () {
* */
case 'MOPIDY_GET_ARTIST':
request(socket, store, 'library.lookup', action.data).then(function (response) {
if (response.length <= 0) {
return;
}
request(socket, store, 'library.lookup', { uris: [action.uri] }).then(function (response) {
console.log(response);
if (!response[action.uri] || !response[action.uri].length) return;
response = response[action.uri];
var albums = [];
for (var _i8 = 0; _i8 < response.length; _i8++) {
if (response[_i8].album) {
@ -72315,7 +72317,7 @@ var MopidyMiddleware = function () {
// Start with an empty artist object
var artist = {
uri: action.data.uri,
uri: action.uri,
provider: 'mopidy'
};

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 = "1579256009";
var build = "1579284872";
var version = "3.44.0";
// Construct the script tag

2
src/js/services/mopidy/actions.js
View File

@ -429,7 +429,7 @@ export function clearLibraryArtists() {
export function getArtist(uri) {
return {
type: 'MOPIDY_GET_ARTIST',
data: { uri },
uri,
};
}

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

@ -851,8 +851,10 @@ const MopidyMiddleware = (function () {
break;
case 'MOPIDY_PLAY_URIS':
const { from_uri } = action;
let uris = Object.assign([], action.uris);
if (!action.uris || action.uris.length <= 0) {
if (!uris || !uris.length) {
this.props.uiActions.createNotification({ content: 'No URIs to play', type: 'warning' });
break;
}
@ -869,11 +871,11 @@ const MopidyMiddleware = (function () {
// Shuffle/random mode
if (store.getState().mopidy.random) {
var first_uri_index = Math.floor(Math.random() * action.uris.length);
} else {
var first_uri_index = 0;
}
var first_uri = action.uris[first_uri_index];
var first_uri_index = Math.floor(Math.random() * action.uris.length);
} else {
var first_uri_index = 0;
}
var first_uri = uris[first_uri_index];
// add our first track
request(socket, store, 'tracklist.add', { uris: [first_uri], at_position: 0 })
@ -887,7 +889,7 @@ const MopidyMiddleware = (function () {
for (let i = 0; i < response.length; i++) {
tlids.push(response[i].tlid);
}
store.dispatch(pusherActions.addQueueMetadata(tlids, action.from_uri));
store.dispatch(pusherActions.addQueueMetadata(tlids, from_uri));
} else {
store.dispatch(coreActions.handleException(
'Mopidy: Failed to add some tracks',
@ -896,15 +898,15 @@ const MopidyMiddleware = (function () {
}
// Remove our first_uri as we've already added it
action.uris.splice(first_uri_index, 1);
uris.splice(first_uri_index, 1);
// And add the rest of our uris (if any)
if (action.uris.length > 0) {
if (uris.length > 0) {
// Wait a moment so the server can trigger track_changed etc
// this means our UI feels snappier as the first track shows up quickly
setTimeout(
() => {
store.dispatch(mopidyActions.enqueueURIs(action.uris, action.from_uri, null, 1));
store.dispatch(mopidyActions.enqueueURIs(uris, from_uri, null, 1));
},
100,
);
@ -2071,17 +2073,15 @@ const MopidyMiddleware = (function () {
* */
case 'MOPIDY_GET_ARTIST':
request(socket, store, 'library.lookup', action.data)
request(socket, store, 'library.lookup', { uris: [action.uri] })
.then((response) => {
if (response.length <= 0) {
return;
}
console.log(response);
if (!response[action.uri] || !response[action.uri].length) return;
response = response[action.uri];
const albums = [];
for (let i = 0; i < response.length; i++) {
if (response[i].album) {
var album = {
...response[i].album,
uri: response[i].album.uri,
};
@ -2102,17 +2102,17 @@ const MopidyMiddleware = (function () {
// Start with an empty artist object
let artist = {
uri: action.data.uri,
provider: 'mopidy',
uri: action.uri,
provider: 'mopidy',
};
// Get the artist object from the track. This is a bit ugly because it's a simplified
// (Mopidy) artist object but gives us enough to fetch their name and artwork.
for (const raw_artist of response[0].artists) {
// We're only interested in the artist we asked for
if (raw_artist.uri === artist.uri) {
artist = { ...raw_artist };
}
// We're only interested in the artist we asked for
if (raw_artist.uri === artist.uri) {
artist = { ...raw_artist };
}
}
// Add our tracks and albums