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

Leaning-up currentTrack requests - event already has data

Browse Source
This commit is contained in:
James Barnsley
2018-04-01 22:06:02 +12:00
parent fcbfc64ec6
commit 9bffdf3de1
4 changed files with 60 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
mopidy_iris/static/app.js
View File

@ -3475,6 +3475,7 @@ exports.setTimePosition = setTimePosition;
exports.timePosition = timePosition;
exports.getUriSchemes = getUriSchemes;
exports.getCurrentTrack = getCurrentTrack;
exports.currentTrackLoaded = currentTrackLoaded;
exports.getQueue = getQueue;
exports.changeTrack = changeTrack;
exports.playURIs = playURIs;
@ -3679,6 +3680,13 @@ function getCurrentTrack() {
};
}
function currentTrackLoaded(tl_track) {
return {
type: 'MOPIDY_CURRENT_TRACK_LOADED',
tl_track: tl_track
};
}
function getQueue() {
return {
type: 'MOPIDY_GET_QUEUE'
@ -51497,7 +51505,7 @@ var MopidyMiddleware = function () {
break;
case 'event:trackPlaybackStarted':
store.dispatch(mopidyActions.getCurrentTrack());
store.dispatch(mopidyActions.currentTrackLoaded(data.tl_track));
break;
case 'event:volumeChanged':
@ -53095,27 +53103,31 @@ var MopidyMiddleware = function () {
case 'MOPIDY_GET_CURRENT_TRACK':
request(socket, store, 'playback.getCurrentTlTrack').then(function (response) {
if (response && response.track) {
var track = helpers.formatTracks(response);
// We've got Spotify running, and it's a spotify track - go straight to the source!
if (store.getState().spotify.enabled && helpers.uriSource(track.uri) == 'spotify') {
store.dispatch(spotifyActions.getTrack(track.uri));
// Some other source, rely on Mopidy backends to do their work
} else {
store.dispatch(mopidyActions.getImages('tracks', [track.uri]));
}
// Set our window title to the track title
helpers.setWindowTitle(track, store.getState().mopidy.play_state);
store.dispatch({
type: 'CURRENT_TRACK_LOADED',
current_track: track
});
store.dispatch(mopidyActions.currentTrackLoaded(response));
}
});
break;
case 'MOPIDY_CURRENT_TRACK_LOADED':
var track = helpers.formatTracks(action.tl_track);
// We've got Spotify running, and it's a spotify track - go straight to the source!
if (store.getState().spotify.enabled && helpers.uriSource(track.uri) == 'spotify') {
store.dispatch(spotifyActions.getTrack(track.uri));
// Some other source, rely on Mopidy backends to do their work
} else {
store.dispatch(mopidyActions.getImages('tracks', [track.uri]));
}
// Set our window title to the track title
helpers.setWindowTitle(track, store.getState().mopidy.play_state);
store.dispatch({
type: 'CURRENT_TRACK_LOADED',
current_track: track
});
break;
case 'MOPIDY_GET_TRACK':
request(socket, store, 'library.lookup', action.data).then(function (response) {
if (response.length > 0) {

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

File diff suppressed because one or more lines are too long

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

@ -171,6 +171,13 @@ export function getCurrentTrack(){
}
}
export function currentTrackLoaded(tl_track){
return {
type: 'MOPIDY_CURRENT_TRACK_LOADED',
tl_track: tl_track
}
}
export function getQueue(){
return {
type: 'MOPIDY_GET_QUEUE'

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

@ -95,7 +95,7 @@ const MopidyMiddleware = (function(){
break;
case 'event:trackPlaybackStarted':
store.dispatch(mopidyActions.getCurrentTrack());
store.dispatch(mopidyActions.currentTrackLoaded(data.tl_track));
break;
case 'event:volumeChanged':
@ -2002,28 +2002,32 @@ const MopidyMiddleware = (function(){
.then(
response => {
if (response && response.track){
var track = helpers.formatTracks(response);
// We've got Spotify running, and it's a spotify track - go straight to the source!
if (store.getState().spotify.enabled && helpers.uriSource(track.uri) == 'spotify'){
store.dispatch(spotifyActions.getTrack(track.uri))
// Some other source, rely on Mopidy backends to do their work
} else {
store.dispatch(mopidyActions.getImages('tracks',[track.uri]))
}
// Set our window title to the track title
helpers.setWindowTitle(track, store.getState().mopidy.play_state);
store.dispatch({
type: 'CURRENT_TRACK_LOADED',
current_track: track
});
store.dispatch(mopidyActions.currentTrackLoaded(response));
}
}
);
break;
case 'MOPIDY_CURRENT_TRACK_LOADED':
var track = helpers.formatTracks(action.tl_track);
// We've got Spotify running, and it's a spotify track - go straight to the source!
if (store.getState().spotify.enabled && helpers.uriSource(track.uri) == 'spotify'){
store.dispatch(spotifyActions.getTrack(track.uri))
// Some other source, rely on Mopidy backends to do their work
} else {
store.dispatch(mopidyActions.getImages('tracks',[track.uri]))
}
// Set our window title to the track title
helpers.setWindowTitle(track, store.getState().mopidy.play_state);
store.dispatch({
type: 'CURRENT_TRACK_LOADED',
current_track: track
});
break;
case 'MOPIDY_GET_TRACK':
request(socket, store, 'library.lookup', action.data )
.then(