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

Mopidy results first

Browse Source
This commit is contained in:
James Barnsley
2017-09-05 15:47:35 +12:00
parent d6205d1a25 9900954a56
commit ff74bfefbc
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/services/mopidy/reducer.js
View File

@ -147,6 +147,7 @@ export default function reducer(mopidy = {}, action){
**/ **/
case 'MOPIDY_CLEAR_SEARCH_RESULTS': case 'MOPIDY_CLEAR_SEARCH_RESULTS':
console.log(action)
return Object.assign({}, mopidy, { search_results: {} }); return Object.assign({}, mopidy, { search_results: {} });
case 'MOPIDY_SEARCH_RESULTS_LOADED': case 'MOPIDY_SEARCH_RESULTS_LOADED':

24
src/js/views/Search.js
View File

@ -77,36 +77,36 @@ class Search extends React.Component{
var spotify_search_enabled = (this.props.search_settings && this.props.search_settings.spotify) var spotify_search_enabled = (this.props.search_settings && this.props.search_settings.spotify)
var artists = [] var artists = []
if (this.props.spotify_search_results.artists){
artists = [...artists, ...helpers.getIndexedRecords(this.props.artists,this.props.spotify_search_results.artists)]
}
if (this.props.mopidy_search_results.artists){ if (this.props.mopidy_search_results.artists){
artists = [...artists, ...helpers.getIndexedRecords(this.props.artists,this.props.mopidy_search_results.artists)] artists = [...artists, ...helpers.getIndexedRecords(this.props.artists,this.props.mopidy_search_results.artists)]
} }
if (this.props.spotify_search_results.artists){
artists = [...artists, ...helpers.getIndexedRecords(this.props.artists,this.props.spotify_search_results.artists)]
}
var albums = [] var albums = []
if (this.props.spotify_search_results.albums){
albums = [...albums, ...helpers.getIndexedRecords(this.props.albums,this.props.spotify_search_results.albums)]
}
if (this.props.mopidy_search_results.albums){ if (this.props.mopidy_search_results.albums){
albums = [...albums, ...helpers.getIndexedRecords(this.props.albums,this.props.mopidy_search_results.albums)] albums = [...albums, ...helpers.getIndexedRecords(this.props.albums,this.props.mopidy_search_results.albums)]
} }
if (this.props.spotify_search_results.albums){
albums = [...albums, ...helpers.getIndexedRecords(this.props.albums,this.props.spotify_search_results.albums)]
}
var playlists = [] var playlists = []
if (this.props.spotify_search_results.playlists){
playlists = [...playlists, ...helpers.getIndexedRecords(this.props.playlists,this.props.spotify_search_results.playlists)]
}
if (this.props.mopidy_search_results.playlists){ if (this.props.mopidy_search_results.playlists){
playlists = [...playlists, ...helpers.getIndexedRecords(this.props.playlists,this.props.mopidy_search_results.playlists)] playlists = [...playlists, ...helpers.getIndexedRecords(this.props.playlists,this.props.mopidy_search_results.playlists)]
} }
if (this.props.spotify_search_results.playlists){
playlists = [...playlists, ...helpers.getIndexedRecords(this.props.playlists,this.props.spotify_search_results.playlists)]
}
var tracks = [] var tracks = []
if (this.props.spotify_search_results.tracks){
tracks = [...tracks, ...this.props.spotify_search_results.tracks]
}
if (this.props.mopidy_search_results.tracks){ if (this.props.mopidy_search_results.tracks){
tracks = [...tracks, ...this.props.mopidy_search_results.tracks] tracks = [...tracks, ...this.props.mopidy_search_results.tracks]
} }
if (this.props.spotify_search_results.tracks){
tracks = [...tracks, ...this.props.spotify_search_results.tracks]
}
switch (this.props.view){ switch (this.props.view){