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

Resolving track overwrite issue; Repairing queue images; Next is formatImages()

Browse Source
This commit is contained in:
James Barnsley
2018-09-08 21:16:18 +12:00
parent b7914e6c66
commit 1114b9031f
8 changed files with 10688 additions and 14008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,7 +507,7 @@ const CoreMiddleware = (function(){
var artists_loaded = [];
var albums_loaded = [];
action.tracks.forEach(raw_track => {
for (var raw_track of action.tracks){
var track = helpers.formatTrack(raw_track);
if (tracks_index[track.uri] !== undefined){
@ -541,7 +541,7 @@ const CoreMiddleware = (function(){
}
tracks_loaded.push(track);
});
};
if (artists_loaded.length > 0){
store.dispatch(coreActions.artistsLoaded(artists_loaded));
@ -550,6 +550,8 @@ const CoreMiddleware = (function(){
store.dispatch(coreActions.albumsLoaded(albums_loaded));
}
action.tracks = tracks_loaded;
next(action);
break;

11
src/js/services/genius/actions.js
View File

@ -26,7 +26,10 @@ var sendRequest = (dispatch, getState, endpoint, method = 'GET', data = false) =
if (endpoint.startsWith('https://') || endpoint.startsWith('http://')){
var url = endpoint;
} else {
var url = 'https://api.genius.com/'+endpoint+'?access_token='+getState().genius.access_token;
var url = 'https://api.genius.com/'+endpoint;
if (getState().genius.access_token){
url += '?access_token='+getState().genius.access_token;
}
}
// create our ajax request config
@ -213,9 +216,9 @@ export function findTrackLyrics(track){
});
}
dispatch(coreActions.trackLoaded({
uri: track.uri,
lyrics_results: lyrics_results
}));
uri: track.uri,
lyrics_results: lyrics_results
}));
// Immediately go and get the first result's lyrics
var lyrics_result = lyrics_results[0];

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

@ -1759,13 +1759,13 @@ const MopidyMiddleware = (function(){
var artists_uris = [];
for (var artist in response[uri][0].artists){
artists_loaded.push(helpers.formatArtist(artist));
artists_loaded.push(artist);
artists_uris.push(artist.uri);
}
var tracks_uris = [];
for (var track in response[uri]){
tracks_loaded.push(helpers.formatTrack(track));
tracks_loaded.push(helpers.track);
tracks_uris.push(track.uri);
}
@ -1811,7 +1811,7 @@ const MopidyMiddleware = (function(){
var artists = [];
for (var artist of response[0].artists){
artists.push(helpers.formatArtist(artist));
artists.push(artist);
}
var album = Object.assign(
@ -1819,7 +1819,7 @@ const MopidyMiddleware = (function(){
{
images: []
},
helpers.formatAlbum(response[0].album),
response[0].album,
{
source: 'local',
artists_uris: helpers.arrayOf('uri', artists),
@ -2073,8 +2073,8 @@ const MopidyMiddleware = (function(){
case 'MOPIDY_CURRENT_TRACK_LOADED':
var track = helpers.formatTrack(action.tl_track);
// We don't have the track already in our index
if (!store.getState().core.tracks[track.uri]){
// We don't have the track already in our index, or we do but it's a partial record
if (store.getState().core.tracks[track.uri] === undefined || store.getState().core.tracks[track.uri].images === undefined){
// 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'){