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

Discover moved to recommendations; URL handles context loading

Browse Source
This commit is contained in:
James Barnsley
2017-06-02 09:31:05 +12:00
parent b5f74e119f
commit a2d326563d
10 changed files with 214 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,14 +498,16 @@ export function getAutocompleteResults(field_id, query, types = ['album','artist
.then(response => {
var genres = []
if (genre_included){
var available_genres = getState().spotify.genres
for (var i = 0; i < available_genres.length; i++){
if (available_genres[i].includes(query)){
var genre = available_genres[i]
genres.push({
name: (genre.charAt(0).toUpperCase()+genre.slice(1)).replace('-',' '),
uri: 'spotify:genre:'+genre
})
var available_genres = getState().ui.genres
if (available_genres){
for (var i = 0; i < available_genres.length; i++){
if (available_genres[i].includes(query)){
var genre = available_genres[i]
genres.push({
name: (genre.charAt(0).toUpperCase()+genre.slice(1)).replace('-',' '),
uri: 'spotify:genre:'+genre
})
}
}
}
}

26
src/js/services/spotify/middleware.js
View File

@ -273,6 +273,32 @@ const SpotifyMiddleware = (function(){
});
break
case 'SPOTIFY_FAVORITES_LOADED':
if (action.artists.length > 0){
store.dispatch({
type: 'ARTISTS_LOADED',
artists: action.artists
})
action.artists_uris = helpers.asURIs(action.artists)
}
if (action.tracks.length > 0){
store.dispatch({
type: 'TRACKS_LOADED',
tracks: action.tracks
})
action.tracks_uris = helpers.asURIs(action.tracks)
}
next(action)
break
case 'SPOTIFY_TRACK_LOADED':
store.dispatch({
type: 'TRACK_LOADED',
key: action.data.uri,
track: action.data
});
break
case 'SPOTIFY_SEARCH_RESULTS_LOADED_MORE_TRACKS':
store.dispatch({
type: 'SEARCH_RESULTS_LOADED',

9
src/js/services/spotify/reducer.js
View File

@ -1,4 +1,6 @@
import * as helpers from '../../helpers'
export default function reducer(spotify = {}, action){
switch (action.type) {
@ -179,9 +181,6 @@ export default function reducer(spotify = {}, action){
if( !action.data ) return Object.assign({}, spotify, { discover: [] })
return Object.assign({}, spotify, { discover: [...spotify.discover, ...[action.data]] })
case 'SPOTIFY_GENRES_LOADED':
return Object.assign({}, spotify, {genres: action.genres})
case 'SPOTIFY_RECOMMENDATIONS_LOADED':
return Object.assign(
{},
@ -199,8 +198,8 @@ export default function reducer(spotify = {}, action){
{},
spotify,
{
favorite_artists: action.artists,
favorite_tracks: action.tracks
favorite_artists: action.artists_uris,
favorite_tracks: action.tracks_uris
})
case 'SPOTIFY_AUTOCOMPLETE_LOADING':