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

Merge branch 'master' of github.com:jaedb/Iris

Browse Source
This commit is contained in:
James Barnsley
2017-01-18 17:58:26 +13:00
parent c4b3ce1a32 3604526edf
commit ca0bd6c39e
9 changed files with 177 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/components/Modal/AddToPlaylistModal.js
View File

@ -35,7 +35,7 @@ export default class AddToPlaylistModal extends React.Component{
<FontAwesome className="source" name={helpers.sourceIcon(playlist.uri)} />
&nbsp;
<span className="name">{ playlist.name }</span>
{ playlist.tracks ? <span className="grey-text">&nbsp;{ playlist.tracks.total } tracks</span> : null }
{ playlist.tracks_total ? <span className="grey-text">&nbsp;{ playlist.tracks_total } tracks</span> : null }
</div>
)
})

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

@ -206,20 +206,12 @@ export function getAlbums(){
* Other general actions
**/
export function getSearchResults(query, backends = null, fields = ['any']){
var queryObj = {};
for( var i = 0; i < fields.length; i++ ){
queryObj[fields[i]] = [query];
}
export function getSearchResults(query, uris = null, fields = ['any']){
return {
type: 'NOTHING'
type: 'MOPIDY_GET_SEARCH_RESULTS',
query: query,
uris: uris,
fields: fields
}
/*
return {
type: 'MOPIDY_INSTRUCT',
call: 'library.search',
value: { query: queryObj, uris: backends }
}
*/
}

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

@ -282,6 +282,25 @@ const MopidyMiddleware = (function(){
})
break;
case 'MOPIDY_GET_SEARCH_RESULTS':
var queryObject = {};
for( var i = 0; i < action.fields.length; i++ ){
queryObject[action.fields[i]] = [action.query];
}
instruct( socket, store, 'library.search', {query: queryObject, uris: action.uris})
.then( response => {
// collate all our different sources into one array
var tracks = []
for( var i = 0; i < response.length; i++ ){
if( response[i].tracks ) tracks = [...tracks, ...response[i].tracks]
}
store.dispatch({ type: 'SEARCH_RESULTS_LOADED', tracks: tracks });
})
break;
/**
* =============================================================== PLAYLIST(S) ==========

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

@ -382,8 +382,6 @@ export function getURL( url, action_name, uri = false ){
export function getSearchResults( query, type = 'album,artist,playlist,track', limit = 50, offset = 0 ){
return (dispatch, getState) => {
dispatch({ type: 'SEARCH_RESULTS_LOADED', reset: true });
var url = 'search?q='+query
url += '&type='+type
url += '&country='+getState().spotify.country
@ -427,7 +425,8 @@ export function getSearchResults( query, type = 'album,artist,playlist,track', l
artists_more: response.artists.next,
albums_uris: helpers.asURIs(response.albums.items),
albums_more: response.albums.next,
tracks: response.tracks
tracks: response.tracks.items,
tracks_more: response.tracks.next
});
});
}

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

@ -46,7 +46,7 @@ const SpotifyMiddleware = (function(){
store.dispatch( uiActions.createNotification( "Must be logged in to Spotify to do that", 'bad' ) )
return
}
store.dispatch( spotifyActions.addTracksToPlaylist( action.playlist_uri, action.tracks_uris ))
store.dispatch( spotifyActions.addTracksToPlaylist( action.uri, action.tracks_uris ))
break
@ -222,6 +222,68 @@ const SpotifyMiddleware = (function(){
});
break
case 'SPOTIFY_SEARCH_RESULTS_LOADED_MORE_TRACKS':
store.dispatch({
type: 'SEARCH_RESULTS_LOADED',
tracks: action.data.tracks.items,
tracks_more: action.data.tracks.next
});
break
case 'SPOTIFY_SEARCH_RESULTS_LOADED_MORE_ARTISTS':
store.dispatch({
type: 'ARTISTS_LOADED',
artists: action.data.artists.items
});
store.dispatch({
type: 'SEARCH_RESULTS_LOADED',
playlists_uris: helpers.asURIs(action.data.playlists.items),
playlists_more: action.data.playlists.next
});
break
case 'SPOTIFY_SEARCH_RESULTS_LOADED_MORE_ALBUMS':
store.dispatch({
type: 'ALBUMS_LOADED',
albums: action.data.albums.items
});
store.dispatch({
type: 'SEARCH_RESULTS_LOADED',
albums_uris: helpers.asURIs(action.data.albums.items),
albums_more: action.data.albums.next
});
break
case 'SPOTIFY_SEARCH_RESULTS_LOADED_MORE_PLAYLISTS':
var playlists = []
for (var i = 0; i < action.data.playlists.items.length; i++){
playlists.push(Object.assign(
{},
action.data.playlists.items[i],
{
can_edit: (getState().spotify.me && action.data.playlists.items[i].owner.id == getState().spotify.me.id),
tracks_total: action.data.playlists.items[i].tracks.total
}
))
}
store.dispatch({
type: 'PLAYLISTS_LOADED',
playlists: playlists
});
store.dispatch({
type: 'SEARCH_RESULTS_LOADED',
playlists_uris: helpers.asURIs(action.data.playlists.items),
playlists_more: action.data.playlists.next
});
break
// This action is irrelevant to us, pass it on to the next middleware
default:
return next(action);

15
src/js/services/ui/actions.js
View File

@ -18,20 +18,11 @@ export function hideContextMenu(){
}
}
export function searchStarted( query ){
export function startSearch( query ){
console.log('STARTING NOW')
return {
type: 'SEARCH_STARTED',
query: query,
data: {
artists: [],
albums: [],
playlists: [],
tracks: [],
artists_more: false,
albums_more: false,
playlists_more: false,
tracks_more: false
}
query: query
}
}

157
src/js/services/ui/reducer.js
View File

@ -297,6 +297,7 @@ export default function reducer(ui = {}, action){
var playlists = Object.assign([], ui.playlists)
if (playlists[action.uri]){
console.log([playlists[action.uri],action.playlist])
var playlist = Object.assign({}, playlists[action.uri], action.playlist)
}else{
var playlist = Object.assign({}, action.playlist)
@ -404,93 +405,91 @@ export default function reducer(ui = {}, action){
/**
* Search results
**/
**/
case 'SEARCH_STARTED':
return Object.assign({}, ui, { search_results: action.data })
case 'MOPIDY_SEARCH':
// collate all our different sources into one array
var tracks = []
for( var i = 0; i < action.data.length; i++ ){
if( action.data[i].tracks ) tracks = [...tracks, ...action.data[i].tracks]
}
// merge our results with all our other tracks
var results = Object.assign({}, ui.search_results, {
tracks: [...ui.search_results.tracks, ...tracks]
})
return Object.assign({}, ui, { search_results: results })
case 'SEARCH_RESULTS_LOADED':
if (action.reset) return ui
if (ui.search_results.artists_uris){
var artists_uris = [...ui.search_results.artists_uris, ...action.artists_uris]
}else{
var artists_uris = action.artists_uris
}
if (ui.search_results.albums_uris){
var albums_uris = [...ui.search_results.albums_uris, ...action.albums_uris]
}else{
var albums_uris = action.albums_uris
}
if (ui.search_results.playlists_uris){
var playlists_uris = [...ui.search_results.playlists_uris, ...action.playlists_uris]
}else{
var playlists_uris = action.playlists_uris
}
return Object.assign({}, ui, {
search_results: {
artists_more: (action.artists_more ? action.artists_more : null),
artists_uris: artists_uris,
albums_more: (action.albums_more ? action.albums_more : null),
albums_uris: albums_uris,
playlists_more: (action.playlists_more ? action.playlists_more : null),
playlists_uris: playlists_uris,
tracks: [ ...ui.search_results.tracks, ...action.tracks.items ],
tracks_more: action.tracks.next
artists_more: null,
artists_uris: [],
albums_more: null,
albums_uris: [],
playlists_more: null,
playlists_uris: [],
tracks: [],
tracks_more: null,
}
});
case 'SPOTIFY_SEARCH_RESULTS_LOADED_MORE_ARTISTS':
var results = Object.assign(
{},
ui.search_results,
{
artists_uris: [...ui.search_results.artists_uris, ...action.data.artists_uris],
artists_more: action.data.artists.next
case 'SEARCH_RESULTS_LOADED':
// artists
if (ui.search_results && ui.search_results.artists_uris){
var artists_uris = ui.search_results.artists_uris
}else{
var artists_uris = []
}
if (action.artists_uris) artists_uris = [...artists_uris, ...action.artists_uris]
// more tracks
if (typeof(action.artists_more) !== 'undefined') var artists_more = action.artists_more
else if (ui.search_results && ui.search_results.artists_more) var artists_more = ui.search_results.artists_more
else var artists_more = null
// albums
if (ui.search_results && ui.search_results.albums_uris){
var albums_uris = ui.search_results.albums_uris
}else{
var albums_uris = []
}
if (action.albums_uris) albums_uris = [...albums_uris, ...action.albums_uris]
// more tracks
if (typeof(action.albums_more) !== 'undefined') var albums_more = action.albums_more
else if (ui.search_results && ui.search_results.albums_more) var albums_more = ui.search_results.albums_more
else var albums_more = null
// playlists
if (ui.search_results && ui.search_results.playlists_uris){
var playlists_uris = ui.search_results.playlists_uris
}else{
var playlists_uris = []
}
if (action.playlists_uris) playlists_uris = [...playlists_uris, ...action.playlists_uris]
// more tracks
if (typeof(action.playlists_more) !== 'undefined') var playlists_more = action.playlists_more
else if (ui.search_results && ui.search_results.playlists_more) var playlists_more = ui.search_results.playlists_more
else var playlists_more = null
// tracks
if (ui.search_results && ui.search_results.tracks){
var tracks = ui.search_results.tracks
}else{
var tracks = []
}
if (action.tracks) tracks = [...tracks, ...action.tracks]
// more tracks
if (typeof(action.tracks_more) !== 'undefined') var tracks_more = action.tracks_more
else if (ui.search_results && ui.search_results.tracks_more) var tracks_more = ui.search_results.tracks_more
else var tracks_more = null
return Object.assign({}, ui, {
search_results: {
artists_more: artists_more,
artists_uris: artists_uris,
albums_more: albums_more,
albums_uris: albums_uris,
playlists_more: playlists_more,
playlists_uris: playlists_uris,
tracks: tracks,
tracks_more: tracks_more
}
)
return Object.assign({}, ui, { search_results: results })
case 'SPOTIFY_SEARCH_RESULTS_LOADED_MORE_ALBUMS':
var albums = [...ui.search_results.albums, ...action.data.albums.items]
var results = Object.assign({}, ui.search_results, {
albums: albums,
albums_more: action.data.albums.next
})
return Object.assign({}, ui, { search_results: results })
case 'SPOTIFY_SEARCH_RESULTS_LOADED_MORE_PLAYLISTS':
var playlists = [...ui.search_results.playlists, ...action.data.playlists.items]
var results = Object.assign({}, ui.search_results, {
playlists: playlists,
playlists_more: action.data.playlists.next
})
return Object.assign({}, ui, { search_results: results })
case 'SPOTIFY_SEARCH_RESULTS_LOADED_MORE_TRACKS':
var tracks = [...ui.search_results.tracks, ...action.data.tracks.items]
var results = Object.assign({}, ui.search_results, {
tracks: tracks,
tracks_more: action.data.tracks.next
})
return Object.assign({}, ui, { search_results: results })
});
/**

2
src/js/views/Playlist.js
View File

@ -173,7 +173,7 @@ class Playlist extends React.Component{
const mapStateToProps = (state, ownProps) => {
return {
playlist: state.ui.playlists[helpers.indexFriendlyUri(ownProps.params.uri)],
playlist: (state.ui.playlists && typeof(state.ui.playlists[ownProps.params.uri]) !== 'undefined' ? state.ui.playlists[ownProps.params.uri] : false ),
mopidy_connected: state.mopidy.connected,
spotify_authorized: state.spotify.authorized,
spotify_userid: state.spotify.me.id

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

@ -41,21 +41,15 @@ class Search extends React.Component{
}
performSearch( props = this.props ){
this.props.uiActions.searchStarted( props.params.query )
this.props.uiActions.startSearch(props.params.query)
this.props.spotifyActions.getSearchResults( props.params.query )
this.props.mopidyActions.getSearchResults( props.params.query, props.uri_schemes )
if( props.mopidy_connected ) this.props.mopidyActions.getSearchResults( props.params.query, props.uri_schemes )
}
loadMore(type){
if( !this.props.search_results[type] ||
!this.props.search_results[type+'_more'] ){
return
if( this.props[type+'_more'] ){
this.props.spotifyActions.getURL( this.props[type+'_more'], 'SPOTIFY_SEARCH_RESULTS_LOADED_MORE_'+type.toUpperCase());
}
this.props.spotifyActions.getURL(
this.props.search_results[type+'_more'],
'SPOTIFY_SEARCH_RESULTS_LOADED_MORE_'+ type.toUpperCase()
);
}
renderResults(){
@ -186,6 +180,7 @@ const mapStateToProps = (state, ownProps) => {
mopidy_connected: state.mopidy.connected,
uri_schemes: state.mopidy.uri_schemes,
tracks: (state.ui.search_results ? state.ui.search_results.tracks : []),
tracks_more: (state.ui.search_results && state.ui.search_results.tracks_more ? state.ui.search_results.tracks_more : null),
artists: state.ui.artists,
artists_uris: (state.ui.search_results ? state.ui.search_results.artists_uris : []),
artists_more: (state.ui.search_results ? state.ui.search_results.artists_more : null),