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

Standardizing bracket syntax

Browse Source
This commit is contained in:
James Barnsley
2017-10-10 13:05:28 +13:00
parent 0ca37b0f62
commit 2ffa337ffa
116 changed files with 7451 additions and 3246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/js/services/core/actions.js
View File

@ -10,7 +10,7 @@ export function getBroadcasts(){
timeout: 15000,
url: 'https://gist.githubusercontent.com/jaedb/b677dccf80daf3ccb2ef12e96e495677/raw'
}
$.ajax(config).then(
$.ajax(config).then(
response => {
dispatch({
type: 'BROADCASTS_LOADED',
@ -65,7 +65,7 @@ export function startServices(){
}
}
export function set( data ){
export function set(data){
return {
type: 'CORE_SET',
data: data
@ -79,9 +79,9 @@ export function set( data ){
* Playlist manipulation
**/
export function reorderPlaylistTracks( uri, indexes, insert_before, snapshot_id = false ){
var range = helpers.createRange( indexes );
switch( helpers.uriSource( uri ) ){
export function reorderPlaylistTracks(uri, indexes, insert_before, snapshot_id = false){
var range = helpers.createRange(indexes );
switch(helpers.uriSource(uri )){
case 'spotify':
return {
@ -134,7 +134,7 @@ export function createPlaylist(scheme, name, description = '', is_public = false
if (description == ''){
description = null
}
return spotifyActions.createPlaylist( name, description, is_public, is_collaborative )
return spotifyActions.createPlaylist(name, description, is_public, is_collaborative )
default:
return mopidyActions.createPlaylist(name, scheme)
@ -154,8 +154,8 @@ export function deletePlaylist(uri){
return false
}
export function removeTracksFromPlaylist( uri, tracks_indexes ){
switch( helpers.uriSource( uri ) ){
export function removeTracksFromPlaylist(uri, tracks_indexes){
switch(helpers.uriSource(uri )){
case 'spotify':
return {
@ -173,8 +173,8 @@ export function removeTracksFromPlaylist( uri, tracks_indexes ){
}
}
export function addTracksToPlaylist( uri, tracks_uris ){
switch( helpers.uriSource( uri ) ){
export function addTracksToPlaylist(uri, tracks_uris){
switch(helpers.uriSource(uri )){
case 'spotify':
return {

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

@ -196,7 +196,7 @@ const CoreMiddleware = (function(){
store.dispatch(spotifyActions.getPlaylist(action.key))
break
case 'm3u':
if( store.getState().mopidy.connected ) store.dispatch(mopidyActions.getPlaylist(action.key))
if (store.getState().mopidy.connected ) store.dispatch(mopidyActions.getPlaylist(action.key))
break
}
next(action)
@ -251,7 +251,7 @@ const CoreMiddleware = (function(){
break
case 'MOPIDY_CURRENTTLTRACK':
if (action.data && action.data.track ){
if (action.data && action.data.track){
helpers.setWindowTitle(action.data.track, store.getState().mopidy.play_state)
// make sure our images use mopidy host:port

26
src/js/services/core/reducer.js
View File

@ -2,7 +2,7 @@
import * as helpers from '../../helpers'
export default function reducer(core = {}, action){
switch (action.type) {
switch (action.type){
case 'CORE_SET':
return Object.assign({}, core, action.data)
@ -12,10 +12,10 @@ export default function reducer(core = {}, action){
**/
case 'MOPIDY_TLTRACKS':
if( !action.data ) return core
if (!action.data ) return core
var tracklist = []
for( var i = 0; i < action.data.length; i++ ){
for(var i = 0; i < action.data.length; i++){
var tltrack = action.data[i]
@ -32,9 +32,9 @@ export default function reducer(core = {}, action){
metadata,
{
tlid: tltrack.tlid,
playing: ( core.current_track && tltrack.tlid == core.current_track.tlid )
playing: (core.current_track && tltrack.tlid == core.current_track.tlid )
})
tracklist.push( track )
tracklist.push(track )
}
return Object.assign({}, core, { current_tracklist: tracklist });
@ -48,7 +48,7 @@ export default function reducer(core = {}, action){
for (var i = 0; i < current_tracklist.length; i++){
Object.assign(
current_tracklist[i],
{ playing: ( current_tracklist[i].tlid == action.data.tlid ) }
{ playing: (current_tracklist[i].tlid == action.data.tlid ) }
)
}
@ -94,7 +94,7 @@ export default function reducer(core = {}, action){
case 'PUSHER_QUEUE_METADATA':
case 'PUSHER_QUEUE_METADATA_CHANGED':
var tracklist = Object.assign([], core.current_tracklist)
for( var i = 0; i < tracklist.length; i++ ){
for(var i = 0; i < tracklist.length; i++){
// load our metadata (if we have any for that tlid)
if (typeof(action.queue_metadata['tlid_'+tracklist[i].tlid]) !== 'undefined'){
@ -419,11 +419,11 @@ export default function reducer(core = {}, action){
var playlist = Object.assign({}, playlists[action.key])
var tracks = Object.assign([], playlist.tracks)
var indexes = action.tracks_indexes.reverse()
for( var i = 0; i < indexes.length; i++ ){
tracks.splice( indexes[i], 1 )
for(var i = 0; i < indexes.length; i++){
tracks.splice(indexes[i], 1 )
}
var snapshot_id = null
if( action.snapshot_id ) snapshot_id = action.snapshot_id
if (action.snapshot_id ) snapshot_id = action.snapshot_id
Object.assign(playlist, { tracks: tracks, snapshot_id: snapshot_id })
playlists[action.key] = playlist
return Object.assign({}, core, { playlists: playlists });
@ -442,18 +442,18 @@ export default function reducer(core = {}, action){
// handle insert_before offset if we're moving BENEATH where we're slicing tracks
var insert_before = action.insert_before
if( insert_before > action.range_start ) insert_before = insert_before - action.range_length
if (insert_before > action.range_start ) insert_before = insert_before - action.range_length
// cut our moved tracks into a new array
var tracks_to_move = tracks.splice(action.range_start, action.range_length)
tracks_to_move.reverse()
for( i = 0; i < tracks_to_move.length; i++ ){
for(i = 0; i < tracks_to_move.length; i++){
tracks.splice(insert_before, 0, tracks_to_move[i])
}
var snapshot_id = null
if( action.snapshot_id ) snapshot_id = action.snapshot_id
if (action.snapshot_id ) snapshot_id = action.snapshot_id
Object.assign(playlist, { tracks: tracks, snapshot_id: snapshot_id })
playlists[action.key] = playlist
return Object.assign({}, core, { playlists: playlists });

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

@ -11,7 +11,7 @@ var helpers = require('../../helpers')
* @param endpoint params = the url params to send
**/
const sendRequest = (dispatch, getState, endpoint) => {
return new Promise( (resolve, reject) => {
return new Promise((resolve, reject) => {
var loader_key = helpers.generateGuid();
dispatch(uiActions.startLoading(loader_key, 'genius_'+endpoint));
@ -29,7 +29,7 @@ const sendRequest = (dispatch, getState, endpoint) => {
url: '//'+getState().mopidy.host+':'+getState().mopidy.port+'/iris/http/proxy_request'
};
$.ajax(config).then(
$.ajax(config).then(
response => {
dispatch(uiActions.stopLoading(loader_key));
resolve(response.response);

2
src/js/services/genius/reducer.js
View File

@ -1,6 +1,6 @@
export default function reducer(genius = {}, action){
switch (action.type) {
switch (action.type){
case 'GENIUS_CONNECT':
case 'GENIUS_CONNECTING':

30
src/js/services/lastfm/actions.js
View File

@ -10,8 +10,8 @@ var helpers = require('../../helpers')
* @param getState obj
* @param endpoint params = the url params to send
**/
const sendRequest = ( dispatch, getState, params ) => {
return new Promise( (resolve, reject) => {
const sendRequest = (dispatch, getState, params ) => {
return new Promise((resolve, reject) => {
var loader_key = helpers.generateGuid()
dispatch(uiActions.startLoading(loader_key, 'lastfm_'+params))
@ -23,7 +23,7 @@ const sendRequest = ( dispatch, getState, params ) => {
url: '//ws.audioscrobbler.com/2.0/?format=json&api_key=4320a3ef51c9b3d69de552ac083c55e3&'+params
}
$.ajax(config).then(
$.ajax(config).then(
response => {
dispatch(uiActions.stopLoading(loader_key))
resolve(response)
@ -59,18 +59,18 @@ export function connect(){
}
}
export function getArtist( uri, artist, mbid = false ){
export function getArtist(uri, artist, mbid = false){
return (dispatch, getState) => {
if( mbid ){
if (mbid){
var params = 'method=artist.getInfo&mbid='+mbid
}else{
artist = encodeURIComponent( artist );
artist = encodeURIComponent(artist );
var params = 'method=artist.getInfo&artist='+artist
}
sendRequest(dispatch, getState, params)
.then(
response => {
if( response.artist ){
if (response.artist){
dispatch({
type: 'ARTIST_LOADED',
key: uri,
@ -88,22 +88,22 @@ export function getArtist( uri, artist, mbid = false ){
}
}
export function getAlbum( artist, album, mbid = false ){
export function getAlbum(artist, album, mbid = false){
return (dispatch, getState) => {
dispatch({ type: 'LASTFM_ALBUM_LOADED', data: false });
if( mbid ){
if (mbid){
var params = 'method=album.getInfo&mbid='+mbid
}else{
artist = encodeURIComponent( artist )
album = encodeURIComponent( album )
artist = encodeURIComponent(artist )
album = encodeURIComponent(album )
var params = 'method=album.getInfo&album='+album+'&artist='+artist
}
sendRequest(dispatch, getState, params)
.then(
response => {
if( response.album ){
if (response.album){
dispatch({
type: 'LASTFM_ALBUM_LOADED',
data: response.album
@ -114,16 +114,16 @@ export function getAlbum( artist, album, mbid = false ){
}
}
export function getTrack( artist, track ){
export function getTrack(artist, track){
return (dispatch, getState) => {
dispatch({ type: 'LASTFM_TRACK_LOADED', data: false });
artist = encodeURIComponent( artist );
artist = encodeURIComponent(artist );
sendRequest(dispatch, getState, 'method=track.getInfo&track='+track+'&artist='+artist)
.then(
response => {
if( response.track ){
if (response.track){
dispatch({
type: 'LASTFM_TRACK_LOADED',
data: response.track

2
src/js/services/lastfm/reducer.js
View File

@ -1,6 +1,6 @@
export default function reducer(lastfm = {}, action){
switch (action.type) {
switch (action.type){
case 'LASTFM_CONNECT':
case 'LASTFM_CONNECTING':

48
src/js/services/localstorage/middleware.js
View File

@ -27,11 +27,11 @@ const localstorageMiddleware = (function(){
}
}
switch( action.type ){
switch(action.type){
case 'PUSHER_CONNECTED':
var pusher = JSON.parse( localStorage.getItem('pusher') );
if( !pusher ) pusher = {};
var pusher = JSON.parse(localStorage.getItem('pusher') );
if (!pusher ) pusher = {};
Object.assign(
pusher,{
connection_id: action.connection_id
@ -41,14 +41,14 @@ const localstorageMiddleware = (function(){
break;
case 'PUSHER_SET_PORT':
var pusher = JSON.parse( localStorage.getItem('pusher') );
if( !pusher ) pusher = {};
Object.assign( pusher, { port: action.port } );
var pusher = JSON.parse(localStorage.getItem('pusher') );
if (!pusher ) pusher = {};
Object.assign(pusher, { port: action.port } );
localStorage.setItem('pusher', JSON.stringify(pusher));
break;
case 'PUSHER_USERNAME_CHANGED':
var stored_pusher = JSON.parse( localStorage.getItem('pusher') )
var stored_pusher = JSON.parse(localStorage.getItem('pusher') )
var pusher = Object.assign({}, stored_pusher, { username: action.username })
localStorage.setItem('pusher', JSON.stringify(pusher))
break;
@ -62,15 +62,15 @@ const localstorageMiddleware = (function(){
break;
case 'MOPIDY_URISCHEMES_FILTERED':
var mopidy = JSON.parse( localStorage.getItem('mopidy') );
if( !mopidy ) mopidy = {};
Object.assign( mopidy, { uri_schemes: action.data });
var mopidy = JSON.parse(localStorage.getItem('mopidy') );
if (!mopidy ) mopidy = {};
Object.assign(mopidy, { uri_schemes: action.data });
localStorage.setItem('mopidy', JSON.stringify(mopidy));
break;
case 'SPOTIFY_SET_CONFIG':
var spotify = JSON.parse( localStorage.getItem('spotify') );
if( !spotify ) spotify = {};
var spotify = JSON.parse(localStorage.getItem('spotify') );
if (!spotify ) spotify = {};
Object.assign(
spotify,{
authentication_provider: action.config.authentication_provider,
@ -88,7 +88,7 @@ const localstorageMiddleware = (function(){
} else if (action.data){
var authorization = action.data;
}
var spotify = JSON.parse( localStorage.getItem('spotify') );
var spotify = JSON.parse(localStorage.getItem('spotify') );
spotify = Object.assign(
{},
(spotify ? spotify : {}),
@ -103,7 +103,7 @@ const localstorageMiddleware = (function(){
break;
case 'SPOTIFY_AUTHORIZATION_REVOKED':
var spotify = JSON.parse( localStorage.getItem('spotify') );
var spotify = JSON.parse(localStorage.getItem('spotify') );
spotify = Object.assign(
{},
(spotify ? spotify : {}),
@ -118,8 +118,8 @@ const localstorageMiddleware = (function(){
break;
case 'SPOTIFY_TOKEN_REFRESHED':
var spotify = JSON.parse( localStorage.getItem('spotify') );
if( !spotify ) spotify = {};
var spotify = JSON.parse(localStorage.getItem('spotify') );
if (!spotify ) spotify = {};
Object.assign(
spotify,{
access_token: action.data.access_token,
@ -131,8 +131,8 @@ const localstorageMiddleware = (function(){
break;
case 'SPOTIFY_ME_LOADED':
var spotify = JSON.parse( localStorage.getItem('spotify') );
if( !spotify ) spotify = {};
var spotify = JSON.parse(localStorage.getItem('spotify') );
if (!spotify ) spotify = {};
Object.assign(
spotify,
{ me: action.data }
@ -141,16 +141,16 @@ const localstorageMiddleware = (function(){
break;
case 'CORE_SET':
var core = JSON.parse( localStorage.getItem('core') );
if( !core ) core = {};
Object.assign( core, action.data );
var core = JSON.parse(localStorage.getItem('core') );
if (!core ) core = {};
Object.assign(core, action.data );
localStorage.setItem('core', JSON.stringify(core));
break
case 'UI_SET':
var ui = JSON.parse( localStorage.getItem('ui') );
if( !ui ) ui = {};
Object.assign( ui, action.data );
var ui = JSON.parse(localStorage.getItem('ui') );
if (!ui ) ui = {};
Object.assign(ui, action.data );
localStorage.setItem('ui', JSON.stringify(ui));
break

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

@ -41,7 +41,7 @@ export function debug(call, value){
* Playback-oriented actions
**/
export function changeTrack( tlid ){
export function changeTrack(tlid){
return instruct('playback.play', {tlid: tlid})
}
@ -84,13 +84,13 @@ export function playAlbum(uri){
}
}
export function removeTracks( tlids ){
export function removeTracks(tlids){
return instruct('tracklist.remove', {tlid: tlids})
}
export function reorderTracklist( indexes, insert_before ){
var range = helpers.createRange( indexes );
if( insert_before > range.start ) insert_before = insert_before - range.length
export function reorderTracklist(indexes, insert_before){
var range = helpers.createRange(indexes );
if (insert_before > range.start ) insert_before = insert_before - range.length
return {
type: 'MOPIDY_REORDER_TRACKLIST',
range_start: range.start,
@ -152,7 +152,7 @@ export function setTimePosition(time_position){
* Asset-oriented actions
**/
export function getImages( context, uris ){
export function getImages(context, uris){
return {
type: 'MOPIDY_GET_IMAGES',
context: context,
@ -168,7 +168,7 @@ export function createPlaylist(name, scheme){
}
}
export function deletePlaylist( uri ){
export function deletePlaylist(uri){
return {
type: 'MOPIDY_DELETE_PLAYLIST',
uri: uri
@ -179,7 +179,7 @@ export function getLibraryPlaylists(){
return { type: 'MOPIDY_GET_LIBRARY_PLAYLISTS' }
}
export function getPlaylist( uri ){
export function getPlaylist(uri){
return {
type: 'MOPIDY_GET_PLAYLIST',
data: { uri: uri }
@ -194,14 +194,14 @@ export function getPlaylists(uris, processor = null){
}
}
export function getDirectory( uri ){
export function getDirectory(uri){
return {
type: 'MOPIDY_GET_DIRECTORY',
data: { uri: uri }
}
}
export function getTrack( uri ){
export function getTrack(uri){
return {
type: 'MOPIDY_GET_TRACK',
data: { uri: uri }
@ -214,7 +214,7 @@ export function getLibraryArtists(){
}
}
export function getArtist( uri ){
export function getArtist(uri){
return {
type: 'MOPIDY_GET_ARTIST',
data: { uri: uri }
@ -229,7 +229,7 @@ export function getArtists(uris, processor = null){
}
}
export function getAlbum( uri ){
export function getAlbum(uri){
return {
type: 'MOPIDY_GET_ALBUM',
data: { uri: uri }

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

@ -26,32 +26,32 @@ const MopidyMiddleware = (function(){
// if debug enabled
if (store.getState().ui.log_mopidy) console.log('Mopidy', type, data)
switch( type ){
switch(type){
case 'state:online':
store.dispatch({ type: 'MOPIDY_CONNECTED' });
instruct( ws, store, 'playback.getState' );
instruct( ws, store, 'playback.getVolume' );
instruct( ws, store, 'mixer.getMute' );
instruct( ws, store, 'tracklist.getConsume' );
instruct( ws, store, 'tracklist.getRandom' );
instruct( ws, store, 'tracklist.getRepeat' );
instruct( ws, store, 'tracklist.getTlTracks' );
instruct( ws, store, 'playback.getCurrentTlTrack' );
instruct( ws, store, 'playback.getTimePosition' );
instruct( ws, store, 'getUriSchemes' );
instruct(ws, store, 'playback.getState' );
instruct(ws, store, 'playback.getVolume' );
instruct(ws, store, 'mixer.getMute' );
instruct(ws, store, 'tracklist.getConsume' );
instruct(ws, store, 'tracklist.getRandom' );
instruct(ws, store, 'tracklist.getRepeat' );
instruct(ws, store, 'tracklist.getTlTracks' );
instruct(ws, store, 'playback.getCurrentTlTrack' );
instruct(ws, store, 'playback.getTimePosition' );
instruct(ws, store, 'getUriSchemes' );
// every 1000s update our play position (when playing)
progress_interval = setInterval(() => {
if (store.getState().mopidy.play_state == 'playing'){
// every 10s get real position from server
if( progress_interval_counter % 10 == 0 ){
if (progress_interval_counter % 10 == 0){
store.dispatch(mopidyActions.getTimePosition())
// otherwise we just assume to add 1000ms every 1000ms of play time
}else{
store.dispatch(mopidyActions.setTimePosition( store.getState().mopidy.time_position + 1000 ))
store.dispatch(mopidyActions.setTimePosition(store.getState().mopidy.time_position + 1000 ))
}
progress_interval_counter++
@ -69,12 +69,12 @@ const MopidyMiddleware = (function(){
break;
case 'event:tracklistChanged':
instruct( ws, store, 'tracklist.getTlTracks' );
instruct(ws, store, 'tracklist.getTlTracks' );
break;
case 'event:playbackStateChanged':
instruct( ws, store, 'playback.getState' );
instruct( ws, store, 'playback.getTimePosition' );
instruct(ws, store, 'playback.getState' );
instruct(ws, store, 'playback.getTimePosition' );
break;
case 'event:seeked':
@ -82,11 +82,11 @@ const MopidyMiddleware = (function(){
break;
case 'event:trackPlaybackEnded':
instruct( ws, store, 'playback.getTimePosition' );
instruct(ws, store, 'playback.getTimePosition' );
break;
case 'event:trackPlaybackStarted':
instruct( ws, store, 'playback.getCurrentTlTrack' );
instruct(ws, store, 'playback.getCurrentTlTrack' );
break;
case 'event:volumeChanged':
@ -98,13 +98,13 @@ const MopidyMiddleware = (function(){
break;
case 'event:optionsChanged':
instruct( ws, store, 'tracklist.getConsume' );
instruct( ws, store, 'tracklist.getRandom' );
instruct( ws, store, 'tracklist.getRepeat' );
instruct(ws, store, 'tracklist.getConsume' );
instruct(ws, store, 'tracklist.getRandom' );
instruct(ws, store, 'tracklist.getRepeat' );
break;
default:
//console.log( 'MopidyService: Unhandled message', type, message );
//console.log('MopidyService: Unhandled message', type, message );
}
}
@ -128,9 +128,9 @@ const MopidyMiddleware = (function(){
var model = callParts[0];
var method = callParts[1];
return new Promise( (resolve, reject) => {
return new Promise((resolve, reject) => {
if (model in ws){
if( method in ws[model] ){
if (method in ws[model]){
var mopidyObject = ws[model][method]
var property = method;
}else{
@ -194,11 +194,11 @@ const MopidyMiddleware = (function(){
* it just proceeds to the next middleware, or default functionality
**/
return store => next => action => {
switch(action.type) {
switch(action.type){
case 'MOPIDY_CONNECT':
if(socket != null) socket.close()
if (socket != null) socket.close()
store.dispatch({ type: 'MOPIDY_CONNECTING' })
var state = store.getState()
@ -207,7 +207,7 @@ const MopidyMiddleware = (function(){
callingConvention: 'by-position-or-by-name'
})
socket.on( (type, data) => handleMessage( socket, store, type, data ) )
socket.on((type, data) => handleMessage(socket, store, type, data ) )
break
case 'MOPIDY_CONNECTED':
@ -216,19 +216,19 @@ const MopidyMiddleware = (function(){
break
case 'MOPIDY_DISCONNECT':
if(socket != null) socket.close()
if (socket != null) socket.close()
socket = null
store.dispatch({ type: 'MOPIDY_DISCONNECTED' })
break
// send an instruction to the websocket
case 'MOPIDY_INSTRUCT':
instruct( socket, store, action.call, action.value )
instruct(socket, store, action.call, action.value )
break
case 'MOPIDY_DEBUG':
instruct( socket, store, action.call, action.value )
.then( response => {
instruct(socket, store, action.call, action.value )
.then(response => {
store.dispatch({ type: 'DEBUG', response: response })
})
break
@ -238,13 +238,13 @@ const MopidyMiddleware = (function(){
var remove = ['http','https','mms','rtmp','rtmps','rtsp','sc','yt']
// remove all our ignored types
for( var i = 0; i < remove.length; i++ ){
for(var i = 0; i < remove.length; i++){
var index = uri_schemes.indexOf(remove[i])
if( index > -1 ) uri_schemes.splice(index, 1);
if (index > -1 ) uri_schemes.splice(index, 1);
}
// append with ':' to make them a mopidy URI
for( var i = 0; i < uri_schemes.length; i++ ){
for(var i = 0; i < uri_schemes.length; i++){
uri_schemes[i] = uri_schemes[i] +':'
}
@ -279,7 +279,7 @@ const MopidyMiddleware = (function(){
body: store.getState().pusher.username +' skipped this track',
icon: (store.getState().core.current_track ? helpers.getTrackIcon(store.getState().core.current_track, store.getState().core) : false)
}
store.dispatch( pusherActions.deliverBroadcast(data) )
store.dispatch(pusherActions.deliverBroadcast(data) )
break
case 'MOPIDY_STOP':
@ -289,7 +289,7 @@ const MopidyMiddleware = (function(){
body: store.getState().pusher.username +' stopped playback',
icon: (store.getState().core.current_track ? helpers.getTrackIcon(store.getState().core.current_track, store.getState().core) : false)
}
store.dispatch( pusherActions.deliverBroadcast(data) )
store.dispatch(pusherActions.deliverBroadcast(data) )
break
case 'MOPIDY_PLAY_PLAYLIST':
@ -409,8 +409,8 @@ const MopidyMiddleware = (function(){
var current_track_index = -1
if (current_track !== undefined){
for( var i = 0; i < current_tracklist.length; i++ ){
if( current_tracklist[i].tlid == current_track.tlid ){
for(var i = 0; i < current_tracklist.length; i++){
if (current_tracklist[i].tlid == current_track.tlid){
current_track_index = i
break
}
@ -503,7 +503,7 @@ const MopidyMiddleware = (function(){
// add the rest of our uris (if any)
action.uris.shift();
if( action.uris.length > 0 ){
if (action.uris.length > 0){
// wait 100ms so the server can trigger track_changed etc
// this means our UI feels snappier as the first track shows up quickly
@ -527,7 +527,7 @@ const MopidyMiddleware = (function(){
case 'MOPIDY_REORDER_TRACKLIST':
// add our first track
instruct( socket, store, 'tracklist.move', { start: action.range_start, end: action.range_start + action.range_length, to_position: action.insert_before } )
instruct(socket, store, 'tracklist.move', { start: action.range_start, end: action.range_start + action.range_length, to_position: action.insert_before } )
.then(
response => {
// TODO: when complete, send event to confirm success/failure
@ -629,8 +629,8 @@ const MopidyMiddleware = (function(){
))
}
instruct( socket, store, 'library.search', {query: {album: [action.data.query]}, uris: [action.data.uri_scheme]})
.then(
instruct(socket, store, 'library.search', {query: {album: [action.data.query]}, uris: [action.data.uri_scheme]})
.then(
response => {
if (response.length > 0){
@ -694,8 +694,8 @@ const MopidyMiddleware = (function(){
))
}
instruct( socket, store, 'library.search', {query: {artist: [action.data.query]}, uris: [action.data.uri_scheme]})
.then(
instruct(socket, store, 'library.search', {query: {artist: [action.data.query]}, uris: [action.data.uri_scheme]})
.then(
response => {
if (response.length > 0){
var artists_uris = []
@ -752,7 +752,7 @@ const MopidyMiddleware = (function(){
store.dispatch(uiActions.processFinished('MOPIDY_GET_SEARCH_RESULTS_PROCESSOR'))
}
instruct( socket, store, 'playlists.asList')
instruct(socket, store, 'playlists.asList')
.then(
response => {
if (response.length > 0){
@ -812,7 +812,7 @@ const MopidyMiddleware = (function(){
))
}
instruct( socket, store, 'library.search', {query: {any: [action.data.query]}, uris: [action.data.uri_scheme]})
instruct(socket, store, 'library.search', {query: {any: [action.data.query]}, uris: [action.data.uri_scheme]})
.then(
response => {
if (response.length > 0 && response[0].tracks !== undefined){
@ -847,7 +847,7 @@ const MopidyMiddleware = (function(){
remaining: (action.data.uri_schemes.length) + 1
}
));
instruct( socket, store, 'library.search', {query: {any: [action.data.query]}, uris: [action.data.uri_scheme]})
instruct(socket, store, 'library.search', {query: {any: [action.data.query]}, uris: [action.data.uri_scheme]})
.then(
response => {
if (response.length > 0 && response[0].tracks !== undefined){
@ -879,7 +879,7 @@ const MopidyMiddleware = (function(){
remaining: (action.data.uri_schemes.length) + 0.75
}
));
instruct( socket, store, 'library.search', {query: {album: [action.data.query]}, uris: [action.data.uri_scheme]})
instruct(socket, store, 'library.search', {query: {album: [action.data.query]}, uris: [action.data.uri_scheme]})
.then(
response => {
if (response.length > 0){
@ -931,7 +931,7 @@ const MopidyMiddleware = (function(){
remaining: (action.data.uri_schemes.length) + 0.5
}
));
instruct( socket, store, 'library.search', {query: {artist: [action.data.query]}, uris: [action.data.uri_scheme]})
instruct(socket, store, 'library.search', {query: {artist: [action.data.query]}, uris: [action.data.uri_scheme]})
.then(
response => {
if (response.length > 0){
@ -1001,7 +1001,7 @@ const MopidyMiddleware = (function(){
remaining: (action.data.uri_schemes.length) + 0.25
}
))
instruct( socket, store, 'playlists.asList')
instruct(socket, store, 'playlists.asList')
.then(
response => {
if (response.length > 0){
@ -1054,8 +1054,8 @@ const MopidyMiddleware = (function(){
**/
case 'MOPIDY_GET_LIBRARY_PLAYLISTS':
instruct( socket, store, 'playlists.asList' )
.then( response => {
instruct(socket, store, 'playlists.asList' )
.then(response => {
// drop in our URI list
var playlist_uris = helpers.arrayOf('uri',response)
@ -1072,9 +1072,9 @@ const MopidyMiddleware = (function(){
store.dispatch({ type: 'MOPIDY_LIBRARY_PLAYLISTS_LOADED_ALL' });
// get the full playlist objects
for (var i = 0; i < playlist_uris_filtered.length; i++ ){
instruct( socket, store, 'playlists.lookup', { uri: playlist_uris_filtered[i] })
.then( response => {
for (var i = 0; i < playlist_uris_filtered.length; i++){
instruct(socket, store, 'playlists.lookup', { uri: playlist_uris_filtered[i] })
.then(response => {
var source = helpers.uriSource(response.uri)
var playlist = Object.assign(
{},
@ -1085,7 +1085,7 @@ const MopidyMiddleware = (function(){
source: source,
is_mopidy: true,
last_modified: response.last_modified,
tracks_total: ( response.tracks ? response.tracks.length : 0 )
tracks_total: (response.tracks ? response.tracks.length : 0 )
}
)
@ -1100,21 +1100,21 @@ const MopidyMiddleware = (function(){
break;
case 'MOPIDY_GET_PLAYLIST':
instruct( socket, store, 'playlists.lookup', action.data )
.then( response => {
instruct(socket, store, 'playlists.lookup', action.data )
.then(response => {
var playlist = Object.assign(
{},
response,
{
type: 'playlist',
is_mopidy: true,
tracks: ( response.tracks ? response.tracks : [] ),
tracks_total: ( response.tracks ? response.tracks.length : [] )
tracks: (response.tracks ? response.tracks : [] ),
tracks_total: (response.tracks ? response.tracks.length : [] )
}
)
// tracks? get the full track objects
if( playlist.tracks.length > 0 ) store.dispatch({
if (playlist.tracks.length > 0 ) store.dispatch({
type: 'MOPIDY_RESOLVE_PLAYLIST_TRACKS',
tracks: playlist.tracks,
key: response.uri
@ -1132,23 +1132,23 @@ const MopidyMiddleware = (function(){
var tracks = Object.assign([], action.tracks)
var uris = helpers.arrayOf('uri',tracks)
instruct( socket, store, 'library.lookup', { uris: uris } )
.then( response => {
instruct(socket, store, 'library.lookup', { uris: uris } )
.then(response => {
for(var uri in response){
if (response.hasOwnProperty(uri)) {
if (response.hasOwnProperty(uri)){
var track = response[uri][0]
if( track ){
if (track){
// find the track reference, and drop in the full track data
function getByURI( trackReference ){
function getByURI(trackReference){
return track.uri == trackReference.uri
}
var trackReferences = tracks.filter(getByURI);
// there could be multiple instances of this track, so accommodate this
for( var j = 0; j < trackReferences.length; j++){
var key = tracks.indexOf( trackReferences[j] );
for(var j = 0; j < trackReferences.length; j++){
var key = tracks.indexOf(trackReferences[j] );
tracks[ key ] = track;
}
}
@ -1165,10 +1165,10 @@ const MopidyMiddleware = (function(){
case 'MOPIDY_ADD_PLAYLIST_TRACKS':
instruct( socket, store, 'playlists.lookup', { uri: action.key })
.then( response => {
instruct(socket, store, 'playlists.lookup', { uri: action.key })
.then(response => {
var tracks = [];
for( var i = 0; i < action.tracks_uris.length; i++ ){
for(var i = 0; i < action.tracks_uris.length; i++){
tracks.push({
__model__: "Track",
uri: action.tracks_uris[i]
@ -1176,14 +1176,14 @@ const MopidyMiddleware = (function(){
}
var playlist = Object.assign({}, response)
if( playlist.tracks ){
if (playlist.tracks){
playlist.tracks = [...playlist.tracks, ...tracks]
}else{
playlist.tracks = tracks
}
instruct( socket, store, 'playlists.save', { playlist: playlist } )
.then( response => {
instruct(socket, store, 'playlists.save', { playlist: playlist } )
.then(response => {
store.dispatch({
type: 'PLAYLIST_TRACKS_ADDED',
key: action.key,
@ -1202,14 +1202,14 @@ const MopidyMiddleware = (function(){
var indexes = Object.assign([], action.tracks_indexes)
indexes.sort(descending);
instruct( socket, store, 'playlists.lookup', { uri: action.key })
.then( response => {
instruct(socket, store, 'playlists.lookup', { uri: action.key })
.then(response => {
var playlist = Object.assign({}, response)
for( var i = 0; i < indexes.length; i++ ){
for(var i = 0; i < indexes.length; i++){
playlist.tracks.splice(indexes[i], 1);
}
instruct( socket, store, 'playlists.save', { playlist: playlist } )
.then( response => {
instruct(socket, store, 'playlists.save', { playlist: playlist } )
.then(response => {
store.dispatch({
type: 'PLAYLIST_TRACKS_REMOVED',
key: action.key,
@ -1222,11 +1222,11 @@ const MopidyMiddleware = (function(){
case 'MOPIDY_SAVE_PLAYLIST':
var uri = action.key
instruct( socket, store, 'playlists.lookup', { uri: action.key })
.then( response => {
instruct(socket, store, 'playlists.lookup', { uri: action.key })
.then(response => {
var playlist = Object.assign({}, response, { name: action.name })
instruct( socket, store, 'playlists.save', { playlist: playlist } )
.then( response => {
instruct(socket, store, 'playlists.save', { playlist: playlist } )
.then(response => {
store.dispatch({
type: 'PLAYLIST_UPDATED',
@ -1251,8 +1251,8 @@ const MopidyMiddleware = (function(){
break
case 'MOPIDY_REORDER_PLAYLIST_TRACKS':
instruct( socket, store, 'playlists.lookup', { uri: action.key })
.then( response => {
instruct(socket, store, 'playlists.lookup', { uri: action.key })
.then(response => {
var playlist = Object.assign({}, response)
var tracks = Object.assign([], playlist.tracks)
@ -1262,27 +1262,27 @@ const MopidyMiddleware = (function(){
var range_start = action.range_start
var range_length = action.range_length
var insert_before = action.insert_before
if( insert_before > range_start ) insert_before = insert_before - range_length
if (insert_before > range_start ) insert_before = insert_before - range_length
// collate our tracks to be moved
for( var i = 0; i < range_length; i++ ){
for(var i = 0; i < range_length; i++){
// add to FRONT: we work backwards to avoid screwing up our indexes
tracks_to_move.unshift( tracks[range_start + i] )
tracks_to_move.unshift(tracks[range_start + i] )
}
// remove tracks from their old location
tracks.splice( range_start, range_length )
tracks.splice(range_start, range_length )
// now plug them back in, in their new location
for( var i = 0; i < tracks_to_move.length; i++ ){
tracks.splice( insert_before, 0, tracks_to_move[i] )
for(var i = 0; i < tracks_to_move.length; i++){
tracks.splice(insert_before, 0, tracks_to_move[i] )
}
// update playlist
playlist = Object.assign({}, playlist, { tracks: tracks })
instruct( socket, store, 'playlists.save', { playlist: playlist } )
.then( response => {
instruct(socket, store, 'playlists.save', { playlist: playlist } )
.then(response => {
store.dispatch({
type: 'MOPIDY_RESOLVE_PLAYLIST_TRACKS',
@ -1294,8 +1294,8 @@ const MopidyMiddleware = (function(){
break
case 'MOPIDY_CREATE_PLAYLIST':
instruct( socket, store, 'playlists.create', { name: action.name, uri_scheme: action.scheme })
.then( response => {
instruct(socket, store, 'playlists.create', { name: action.name, uri_scheme: action.scheme })
.then(response => {
store.dispatch(uiActions.createNotification('Created playlist'))
store.dispatch({
@ -1313,8 +1313,8 @@ const MopidyMiddleware = (function(){
break
case 'MOPIDY_DELETE_PLAYLIST':
instruct( socket, store, 'playlists.delete', { uri: action.uri })
.then( response => {
instruct(socket, store, 'playlists.delete', { uri: action.uri })
.then(response => {
store.dispatch(uiActions.createNotification('Deleted playlist'))
store.dispatch({
type: 'MOPIDY_LIBRARY_PLAYLIST_DELETED',
@ -1333,8 +1333,8 @@ const MopidyMiddleware = (function(){
var last_run = store.getState().ui.processes.MOPIDY_LIBRARY_ALBUMS_PROCESSOR
if (!last_run){
instruct( socket, store, 'library.browse', { uri: 'local:directory?type=album' } )
.then( response => {
instruct(socket, store, 'library.browse', { uri: 'local:directory?type=album' } )
.then(response => {
if (response.length <= 0) return
var uris = helpers.arrayOf('uri',response)
@ -1393,14 +1393,14 @@ const MopidyMiddleware = (function(){
break
case 'MOPIDY_GET_ALBUMS':
instruct( socket, store, 'library.lookup', { uris: action.uris } )
.then( response => {
instruct(socket, store, 'library.lookup', { uris: action.uris } )
.then(response => {
if (response.length <= 0) return
var albums = []
for (var uri in response){
if (response.hasOwnProperty(uri) && response[uri].length > 0 && response[uri][0] && response[uri][0].album ){
if (response.hasOwnProperty(uri) && response[uri].length > 0 && response[uri][0] && response[uri][0].album){
var album = Object.assign(
{},
{
@ -1436,8 +1436,8 @@ const MopidyMiddleware = (function(){
break;
case 'MOPIDY_GET_ALBUM':
instruct( socket, store, 'library.lookup', action.data )
.then( response => {
instruct(socket, store, 'library.lookup', action.data )
.then(response => {
if (response.length <= 0) return
var album = Object.assign(
@ -1453,38 +1453,37 @@ const MopidyMiddleware = (function(){
)
var uris = [];
for( var i = 0; i < album.tracks.length; i++ ){
uris.push( album.tracks[i].uri );
for(var i = 0; i < album.tracks.length; i++){
uris.push(album.tracks[i].uri );
}
// load artwork from LastFM
if( album.images.length <= 0 ){
var mbid = helpers.getFromUri('mbid',album.uri)
if( mbid ){
store.dispatch( lastfmActions.getAlbum( false, false, mbid ) )
}else{
store.dispatch( lastfmActions.getAlbum( album.artists[0].name, album.name ) )
if (album.images.length <= 0){
var mbid = helpers.getFromUri('mbid',album.uri);
if (mbid){
store.dispatch(lastfmActions.getAlbum(false, false, mbid));
} else {
store.dispatch(lastfmActions.getAlbum(album.artists[0].name, album.name));
}
}
instruct( socket, store, 'library.lookup', { uris: uris } )
.then( response => {
instruct(socket, store, 'library.lookup', { uris: uris } )
.then(response => {
for(var uri in response){
if (response.hasOwnProperty(uri)) {
if (response.hasOwnProperty(uri)){
var track = response[uri][0];
// find the track reference, and drop in the full track data
function getByURI( trackReference ){
function getByURI(trackReference){
return track.uri == trackReference.uri
}
var trackReferences = album.tracks.filter(getByURI);
// there could be multiple instances of this track, so accommodate this
for( var j = 0; j < trackReferences.length; j++){
var key = album.tracks.indexOf( trackReferences[j] );
for(var j = 0; j < trackReferences.length; j++){
var key = album.tracks.indexOf(trackReferences[j] );
album.tracks[ key ] = track;
}
}
@ -1506,8 +1505,8 @@ const MopidyMiddleware = (function(){
**/
case 'MOPIDY_GET_LIBRARY_ARTISTS':
instruct( socket, store, 'library.browse', { uri: 'local:directory?type=artist' } )
.then( response => {
instruct(socket, store, 'library.browse', { uri: 'local:directory?type=artist' } )
.then(response => {
if (response.length <= 0) return
var uris = helpers.arrayOf('uri',response)
@ -1537,8 +1536,8 @@ const MopidyMiddleware = (function(){
var last_run = store.getState().ui.processes.MOPIDY_LIBRARY_ARTISTS_PROCESSOR
if (!last_run){
instruct( socket, store, 'library.browse', { uri: 'local:directory?type=artist' } )
.then( response => {
instruct(socket, store, 'library.browse', { uri: 'local:directory?type=artist' } )
.then(response => {
if (response.length <= 0) return
var uris = helpers.arrayOf('uri',response)
@ -1585,19 +1584,19 @@ const MopidyMiddleware = (function(){
*/
case 'MOPIDY_GET_ARTIST':
instruct( socket, store, 'library.lookup', action.data )
.then( response => {
instruct(socket, store, 'library.lookup', action.data )
.then(response => {
if (response.length <= 0) return
var albums = []
for( var i = 0; i < response.length; i++ ){
for(var i = 0; i < response.length; i++){
var album = response[i].album;
if (album){
function getByURI( albumToCheck ){
function getByURI(albumToCheck){
return album.uri == albumToCheck.uri
}
var existingAlbum = albums.find(getByURI);
if( !existingAlbum ){
if (!existingAlbum){
albums.push(album)
}
}
@ -1626,19 +1625,19 @@ const MopidyMiddleware = (function(){
})
// load artwork from LastFM
if( !artist.images || artist.images.length <= 0 ){
if( artist.musicbrainz_id ){
store.dispatch( lastfmActions.getArtist( artist.uri, false, artist.musicbrainz_id ) )
if (!artist.images || artist.images.length <= 0){
if (artist.musicbrainz_id){
store.dispatch(lastfmActions.getArtist(artist.uri, false, artist.musicbrainz_id ) )
}else{
store.dispatch( lastfmActions.getArtist( artist.uri, artist.name.replace('&','and') ) )
store.dispatch(lastfmActions.getArtist(artist.uri, artist.name.replace('&','and') ) )
}
}
})
break;
case 'MOPIDY_GET_ARTISTS':
instruct( socket, store, 'library.lookup', {uris: action.uris})
.then( response => {
instruct(socket, store, 'library.lookup', {uris: action.uris})
.then(response => {
if (response.length <= 0) return
var artists = []
@ -1705,7 +1704,7 @@ const MopidyMiddleware = (function(){
break
case 'MOPIDY_GET_TRACK':
instruct( socket, store, 'library.lookup', action.data )
instruct(socket, store, 'library.lookup', action.data )
.then(
response => {
if (response.length > 0){
@ -1733,8 +1732,8 @@ const MopidyMiddleware = (function(){
case 'MOPIDY_GET_IMAGES':
instruct( socket, store, 'library.getImages', {uris: action.uris})
.then( response => {
instruct(socket, store, 'library.getImages', {uris: action.uris})
.then(response => {
let records = []
for (var uri in response){
@ -1768,8 +1767,8 @@ const MopidyMiddleware = (function(){
case 'MOPIDY_GET_DIRECTORY':
store.dispatch({ type: 'MOPIDY_DIRECTORY_LOADED', data: false })
instruct( socket, store, 'library.browse', action.data )
.then( response => {
instruct(socket, store, 'library.browse', action.data )
.then(response => {
store.dispatch({
type: 'MOPIDY_DIRECTORY_LOADED',
data: response

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

@ -2,7 +2,7 @@
import * as helpers from '../../helpers'
export default function reducer(mopidy = {}, action){
switch (action.type) {
switch (action.type){
case 'MOPIDY_CONNECT':
case 'MOPIDY_CONNECTING':

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

@ -3,14 +3,14 @@
* Actions and Action Creators
**/
export function setPort( port ){
export function setPort(port){
return {
type: 'PUSHER_SET_PORT',
port: port
}
}
export function setUsername( username ){
export function setUsername(username){
return {
type: 'PUSHER_SET_USERNAME',
username: username.replace(/[\W_]+/g,'')
@ -41,21 +41,21 @@ export function getConnections(){
}
}
export function instruct( data = null ){
export function instruct(data = null){
return {
type: 'PUSHER_INSTRUCT',
data: data
}
}
export function deliverBroadcast( data = null ){
export function deliverBroadcast(data = null){
return {
type: 'PUSHER_DELIVER_BROADCAST',
data: data
}
}
export function sendAuthorization( recipient_connectionid, authorization, me ){
export function sendAuthorization(recipient_connectionid, authorization, me){
return {
type: 'PUSHER_DELIVER_MESSAGE',
data: {
@ -69,14 +69,14 @@ export function sendAuthorization( recipient_connectionid, authorization, me ){
}
}
export function startRadio( uris ){
export function startRadio(uris){
return {
type: 'PUSHER_START_RADIO',
uris: uris
}
}
export function updateRadio( uris ){
export function updateRadio(uris){
return {
type: 'PUSHER_UPDATE_RADIO',
uris: uris
@ -89,7 +89,7 @@ export function stopRadio(){
}
}
export function debug( message = null ){
export function debug(message = null){
return {
type: 'PUSHER_DEBUG',
message: message
@ -102,7 +102,7 @@ export function getQueueMetadata(){
}
}
export function addQueueMetadata( tlids = [], from_uri = null ){
export function addQueueMetadata(tlids = [], from_uri = null){
return {
type: 'PUSHER_ADD_QUEUE_METADATA',
tlids: tlids,

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

@ -31,9 +31,9 @@ const PusherMiddleware = (function(){
// response to a request [we] made
if (message.request_id !== undefined && message.request_id){
if (typeof( deferredRequests[ message.request_id ]) !== 'undefined' ){
if (typeof(deferredRequests[ message.request_id ]) !== 'undefined'){
store.dispatch(uiActions.stopLoading(message.request_id))
deferredRequests[ message.request_id ].resolve( message )
deferredRequests[ message.request_id ].resolve(message )
} else {
store.dispatch(coreActions.handleException(
@ -51,7 +51,7 @@ const PusherMiddleware = (function(){
}
const request = (store, method, data = {}) => {
return new Promise( (resolve, reject) => {
return new Promise((resolve, reject) => {
var request_id = helpers.generateGuid()
var message = {
@ -59,7 +59,7 @@ const PusherMiddleware = (function(){
data: data,
request_id: request_id
}
socket.send( JSON.stringify(message) )
socket.send(JSON.stringify(message) )
store.dispatch(uiActions.startLoading(request_id, 'pusher_'+method))
@ -81,11 +81,11 @@ const PusherMiddleware = (function(){
}
return store => next => action => {
switch(action.type) {
switch(action.type){
case 'PUSHER_CONNECT':
if(socket != null) socket.close();
if (socket != null) socket.close();
store.dispatch({ type: 'PUSHER_CONNECTING' });
var state = store.getState();
@ -94,7 +94,7 @@ const PusherMiddleware = (function(){
connection_id: helpers.generateGuid(),
username: 'Anonymous'
}
if( state.pusher.username ) connection.username = state.pusher.username;
if (state.pusher.username ) connection.username = state.pusher.username;
connection.username = connection.username.replace(/\W/g, '')
socket = new WebSocket(
@ -104,7 +104,7 @@ const PusherMiddleware = (function(){
socket.onmessage = (message) => {
var message = JSON.parse(message.data);
handleMessage( socket, store, message )
handleMessage(socket, store, message )
};
socket.onclose = () => {
@ -190,7 +190,7 @@ const PusherMiddleware = (function(){
break;
case 'PUSHER_INSTRUCT':
request( action )
request(action )
.then(
response => {
store.dispatch({ type: 'PUSHER_INSTRUCT', data: response.data })
@ -208,7 +208,7 @@ const PusherMiddleware = (function(){
request(store, 'deliver_message', action.data)
.then(
response => {
store.dispatch( uiActions.createNotification('Message delivered') )
store.dispatch(uiActions.createNotification('Message delivered') )
},
error => {
store.dispatch(coreActions.handleException(
@ -258,9 +258,9 @@ const PusherMiddleware = (function(){
}
if (response.upgrade_successful){
store.dispatch( uiActions.createNotification('Upgrade complete') )
store.dispatch(uiActions.createNotification('Upgrade complete') )
}else{
store.dispatch( uiActions.createNotification('Upgrade failed, please upgrade manually','bad') )
store.dispatch(uiActions.createNotification('Upgrade failed, please upgrade manually','bad') )
}
response.type = 'PUSHER_VERSION'
@ -342,16 +342,16 @@ const PusherMiddleware = (function(){
seed_tracks: []
}
for( var i = 0; i < action.uris.length; i++){
switch( helpers.uriType( action.uris[i] ) ){
for(var i = 0; i < action.uris.length; i++){
switch(helpers.uriType(action.uris[i] )){
case 'artist':
data.seed_artists.push( action.uris[i] );
data.seed_artists.push(action.uris[i] );
break;
case 'track':
data.seed_tracks.push( action.uris[i] );
data.seed_tracks.push(action.uris[i] );
break;
case 'genre':
data.seed_genres.push( action.uris[i] );
data.seed_genres.push(action.uris[i] );
break;
}
}
@ -409,9 +409,9 @@ const PusherMiddleware = (function(){
ReactGA.event({ category: 'Pusher', action: 'Version', label: action.version.current })
if (action.version.upgrade_available){
store.dispatch( uiActions.createNotification( 'Version '+action.version.latest+' is available. See settings to upgrade.' ) )
store.dispatch(uiActions.createNotification('Version '+action.version.latest+' is available. See settings to upgrade.' ) )
}
next( action )
next(action )
break
case 'PUSHER_CONFIG':
@ -421,7 +421,7 @@ const PusherMiddleware = (function(){
authorization_url: (action.config.authorization_url ? action.config.authorization_url : null)
}))
next( action )
next(action )
break
case 'PUSHER_DEBUG':

2
src/js/services/pusher/reducer.js
View File

@ -1,6 +1,6 @@
export default function reducer(pusher = {}, action){
switch (action.type) {
switch (action.type){
case 'PUSHER_CONNECT':
case 'PUSHER_CONNECTING':

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

@ -15,10 +15,10 @@ var helpers = require('../../helpers')
* @param data mixed = request payload
* @return Promise
**/
const sendRequest = ( dispatch, getState, endpoint, method = 'GET', data = false) => {
const sendRequest = (dispatch, getState, endpoint, method = 'GET', data = false) => {
return new Promise( (resolve, reject) => {
getToken( dispatch, getState )
return new Promise((resolve, reject) => {
getToken(dispatch, getState )
.then(
response => {
@ -52,7 +52,7 @@ const sendRequest = ( dispatch, getState, endpoint, method = 'GET', data = false
var loader_key = helpers.generateGuid()
dispatch(uiActions.startLoading(loader_key, 'spotify_'+endpoint))
$.ajax(config).then(
$.ajax(config).then(
response => {
dispatch(uiActions.stopLoading(loader_key))
resolve(response)
@ -89,8 +89,8 @@ const sendRequest = ( dispatch, getState, endpoint, method = 'GET', data = false
*
* @return Promise
**/
function getToken( dispatch, getState ){
return new Promise( (resolve, reject) => {
function getToken(dispatch, getState){
return new Promise((resolve, reject) => {
// token is okay for now, so just resolve with the current token
if (getState().spotify.token_expiry && new Date().getTime() < getState().spotify.token_expiry){
@ -111,8 +111,8 @@ function getToken( dispatch, getState ){
});
}
function refreshToken( dispatch, getState ){
return new Promise( (resolve, reject) => {
function refreshToken(dispatch, getState){
return new Promise((resolve, reject) => {
if (getState().spotify.authorization){
@ -126,7 +126,7 @@ function refreshToken( dispatch, getState ){
$.ajax(config)
.then(
response => {
response.token_expiry = new Date().getTime() + ( response.expires_in * 1000 )
response.token_expiry = new Date().getTime() + (response.expires_in * 1000 )
response.source = 'spotify'
dispatch({
type: 'SPOTIFY_TOKEN_REFRESHED',
@ -166,7 +166,7 @@ function refreshToken( dispatch, getState ){
} else {
var token = response.spotify_token
token.token_expiry = new Date().getTime() + ( token.expires_in * 1000 );
token.token_expiry = new Date().getTime() + (token.expires_in * 1000 );
token.source = 'mopidy';
dispatch({
type: 'SPOTIFY_TOKEN_REFRESHED',
@ -206,8 +206,8 @@ export function connect(){
// send a generic request to ensure spotify is up and running
// there is no 'test' or 'ping' endpoint on the Spotify API
sendRequest( dispatch, getState, 'browse/categories?limit=1' )
.then(
sendRequest(dispatch, getState, 'browse/categories?limit=1' )
.then(
response => {
dispatch({
type: 'SPOTIFY_CONNECTED'
@ -228,7 +228,7 @@ export function connect(){
* Handle authorization process
**/
export function authorizationGranted( data ){
export function authorizationGranted(data){
data.token_expiry = new Date().getTime() + data.expires_in;
return { type: 'SPOTIFY_AUTHORIZATION_GRANTED', data: data }
}
@ -240,7 +240,7 @@ export function revokeAuthorization(){
export function refreshingToken(){
return (dispatch, getState) => {
dispatch({ type: 'SPOTIFY_TOKEN_REFRESHING' });
refreshToken( dispatch, getState );
refreshToken(dispatch, getState );
}
}
@ -262,8 +262,8 @@ export function getMe(){
// flush out the previous store value
dispatch({ type: 'SPOTIFY_ME_LOADED', data: false });
sendRequest( dispatch, getState, 'me' )
.then(
sendRequest(dispatch, getState, 'me' )
.then(
response => {
dispatch({
type: 'SPOTIFY_ME_LOADED',
@ -286,14 +286,14 @@ export function getMe(){
*
* @param uri string
**/
export function getTrack( uri ){
export function getTrack(uri){
return (dispatch, getState) => {
// flush out the previous store value
dispatch({ type: 'SPOTIFY_TRACK_LOADED', data: false });
sendRequest( dispatch, getState, 'tracks/'+ helpers.getFromUri('trackid', uri) )
.then(
sendRequest(dispatch, getState, 'tracks/'+ helpers.getFromUri('trackid', uri) )
.then(
response => {
let track = Object.assign(
{},
@ -323,7 +323,7 @@ export function getLibraryTracks(){
dispatch({ type: 'SPOTIFY_LIBRARY_TRACKS_LOADED', data: false });
sendRequest( dispatch, getState, 'me/tracks?limit=50' )
sendRequest(dispatch, getState, 'me/tracks?limit=50' )
.then(
response => {
dispatch({
@ -349,20 +349,20 @@ export function getFeaturedPlaylists(){
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth();
if( month < 10 ) month = '0'+month;
if (month < 10 ) month = '0'+month;
var day = date.getDay();
if( day < 10 ) day = '0'+day;
if (day < 10 ) day = '0'+day;
var hour = date.getHours();
if( hour < 10 ) hour = '0'+hour;
if (hour < 10 ) hour = '0'+hour;
var min = date.getMinutes();
if( min < 10 ) min = '0'+min;
if (min < 10 ) min = '0'+min;
var sec = date.getSeconds();
if( sec < 10 ) sec = '0'+sec;
if (sec < 10 ) sec = '0'+sec;
var timestamp = year+'-'+month+'-'+day+'T'+hour+':'+min+':'+sec;
sendRequest( dispatch, getState, 'browse/featured-playlists?timestamp='+timestamp+'&country='+getState().core.country+'&limit=50&locale='+getState().core.locale )
.then(
sendRequest(dispatch, getState, 'browse/featured-playlists?timestamp='+timestamp+'&country='+getState().core.country+'&limit=50&locale='+getState().core.locale )
.then(
response => {
var playlists = []
for (var i = 0; i < response.playlists.items.length; i++){
@ -405,8 +405,8 @@ export function getFeaturedPlaylists(){
export function getCategories(){
return (dispatch, getState) => {
sendRequest( dispatch, getState, 'browse/categories?limit=50&country='+getState().core.country+'&locale='+getState().core.locale )
.then(
sendRequest(dispatch, getState, 'browse/categories?limit=50&country='+getState().core.country+'&locale='+getState().core.locale )
.then(
response => {
dispatch({
type: 'CATEGORIES_LOADED',
@ -423,7 +423,7 @@ export function getCategories(){
}
}
export function getCategory( id ){
export function getCategory(id){
return (dispatch, getState) => {
dispatch({
@ -435,7 +435,7 @@ export function getCategory( id ){
});
// get the category
sendRequest( dispatch, getState, 'browse/categories/'+id+'?country='+getState().core.country+'&locale='+getState().core.locale )
sendRequest(dispatch, getState, 'browse/categories/'+id+'?country='+getState().core.country+'&locale='+getState().core.locale )
.then(
response => {
var category = Object.assign({}, response)
@ -454,7 +454,7 @@ export function getCategory( id ){
)
// and the category's playlists
sendRequest( dispatch, getState, 'browse/categories/'+id+'/playlists?limit=50&country='+getState().core.country+'&locale='+getState().core.locale )
sendRequest(dispatch, getState, 'browse/categories/'+id+'/playlists?limit=50&country='+getState().core.country+'&locale='+getState().core.locale )
.then(
response => {
var playlists = []
@ -493,8 +493,8 @@ export function getCategory( id ){
export function getNewReleases(){
return (dispatch, getState) => {
sendRequest( dispatch, getState, 'browse/new-releases?country='+getState().core.country+'&limit=50' )
.then(
sendRequest(dispatch, getState, 'browse/new-releases?country='+getState().core.country+'&limit=50' )
.then(
response => {
dispatch({
type: 'SPOTIFY_NEW_RELEASES_LOADED',
@ -511,10 +511,10 @@ export function getNewReleases(){
}
}
export function getURL( url, action_name, key = false ){
export function getURL(url, action_name, key = false){
return (dispatch, getState) => {
sendRequest( dispatch, getState, url )
.then(
sendRequest(dispatch, getState, url )
.then(
response => {
dispatch({
type: action_name,
@ -554,8 +554,8 @@ export function getSearchResults(type, query, limit = 50, offset = 0){
url += '&limit='+limit
url += '&offset='+offset
sendRequest( dispatch, getState, url )
.then(
sendRequest(dispatch, getState, url )
.then(
response => {
if (response.tracks !== undefined){
dispatch({
@ -694,21 +694,21 @@ export function clearAutocompleteResults(field_id = null){
export function following(uri, method = 'GET'){
return (dispatch, getState) => {
if( method == 'PUT' ) var is_following = true
if( method == 'DELETE' ) var is_following = false
if (method == 'PUT' ) var is_following = true
if (method == 'DELETE' ) var is_following = false
var asset_name = helpers.uriType(uri);
var endpoint, data
switch( asset_name ){
switch(asset_name){
case 'album':
if( method == 'GET'){
if (method == 'GET'){
endpoint = 'me/albums/contains/?ids='+ helpers.getFromUri('albumid', uri)
}else{
endpoint = 'me/albums/?ids='+ helpers.getFromUri('albumid', uri)
}
break
case 'artist':
if( method == 'GET' ){
if (method == 'GET'){
endpoint = 'me/following/contains?type=artist&ids='+ helpers.getFromUri('artistid', uri)
}else{
endpoint = 'me/following?type=artist&ids='+ helpers.getFromUri('artistid', uri)
@ -716,7 +716,7 @@ export function following(uri, method = 'GET'){
}
break
case 'user':
if( method == 'GET' ){
if (method == 'GET'){
endpoint = 'me/following/contains?type=user&ids='+ helpers.getFromUri('userid', uri)
}else{
endpoint = 'me/following?type=user&ids='+ helpers.getFromUri('userid', uri)
@ -724,7 +724,7 @@ export function following(uri, method = 'GET'){
}
break
case 'playlist':
if( method == 'GET' ){
if (method == 'GET'){
endpoint = 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'/followers/contains?ids='+ getState().spotify.me.id
}else{
endpoint = 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'/followers'
@ -732,11 +732,11 @@ export function following(uri, method = 'GET'){
break
}
sendRequest( dispatch, getState, endpoint, method, data )
.then(
sendRequest(dispatch, getState, endpoint, method, data )
.then(
response => {
if( response ) is_following = response
if( typeof(is_following) === 'object' ) is_following = is_following[0]
if (response ) is_following = response
if (typeof(is_following) === 'object' ) is_following = is_following[0]
dispatch({
type: 'SPOTIFY_LIBRARY_'+asset_name.toUpperCase()+'_CHECK',
@ -759,7 +759,7 @@ export function following(uri, method = 'GET'){
*
* @param radio object
**/
export function resolveRadioSeeds( radio ){
export function resolveRadioSeeds(radio){
return (dispatch, getState) => {
if (radio.seed_artists.length > 0){
@ -769,8 +769,8 @@ export function resolveRadioSeeds( radio ){
artist_ids += helpers.getFromUri('artistid', radio.seed_artists[i])
}
sendRequest( dispatch, getState, 'artists?ids='+ artist_ids )
.then(
sendRequest(dispatch, getState, 'artists?ids='+ artist_ids )
.then(
response => {
if (response && response.artists){
dispatch({
@ -797,8 +797,8 @@ export function resolveRadioSeeds( radio ){
track_ids += helpers.getFromUri('trackid', radio.seed_tracks[i])
}
sendRequest( dispatch, getState, 'tracks?ids='+ track_ids )
.then(
sendRequest(dispatch, getState, 'tracks?ids='+ track_ids )
.then(
response => {
dispatch({
type: 'TRACKS_LOADED',
@ -903,7 +903,7 @@ export function getRecommendations(uris = [], limit = 20){
endpoint += '&limit='+limit
sendRequest(dispatch, getState, endpoint)
.then(
.then(
response => {
// We only get simple artist objects, so we need to
@ -1013,7 +1013,7 @@ export function getArtist(uri, full = false){
// We need our artist, obviously
var requests = [
sendRequest( dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) )
sendRequest(dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) )
.then(
response => {
Object.assign(artist, response);
@ -1031,7 +1031,7 @@ export function getArtist(uri, full = false){
if (full){
requests.push(
sendRequest( dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/top-tracks?country='+getState().core.country )
sendRequest(dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/top-tracks?country='+getState().core.country )
.then(
response => {
Object.assign(artist, response);
@ -1046,8 +1046,8 @@ export function getArtist(uri, full = false){
);
requests.push(
sendRequest( dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/related-artists' )
.then(
sendRequest(dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/related-artists' )
.then(
response => {
dispatch({
type: 'ARTISTS_LOADED',
@ -1082,7 +1082,7 @@ export function getArtist(uri, full = false){
// Now go get our artist albums
if (full){
sendRequest( dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/albums?market='+getState().core.country )
sendRequest(dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/albums?market='+getState().core.country )
.then(
response => {
dispatch({
@ -1103,18 +1103,18 @@ export function getArtist(uri, full = false){
}
}
export function getArtists( uris ){
export function getArtists(uris){
return (dispatch, getState) => {
// now get all the artists for this album (full objects)
var ids = '';
for( var i = 0; i < uris.length; i++ ){
if( ids != '' ) ids += ','
ids += helpers.getFromUri( 'artistid', uris[i] );
for(var i = 0; i < uris.length; i++){
if (ids != '' ) ids += ','
ids += helpers.getFromUri('artistid', uris[i] );
}
sendRequest( dispatch, getState, 'artists/?ids='+ids )
.then(
sendRequest(dispatch, getState, 'artists/?ids='+ids )
.then(
response => {
for (var i = i; i < response.length; i++){
var artist = response
@ -1154,7 +1154,7 @@ export function playArtistTopTracks(uri){
// We need to load the artist's top tracks first
} else {
sendRequest( dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/top-tracks?country='+getState().core.country )
sendRequest(dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/top-tracks?country='+getState().core.country )
.then(
response => {
const uris = helpers.arrayOf('uri',response.tracks)
@ -1182,8 +1182,8 @@ export function getUser(uri){
return (dispatch, getState) => {
// get the user
sendRequest( dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) )
.then(
sendRequest(dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) )
.then(
response => {
dispatch({
type: 'USER_LOADED',
@ -1207,7 +1207,7 @@ export function getUserPlaylists(user_uri){
return (dispatch, getState) => {
// get the first page of playlists
sendRequest( dispatch, getState, 'users/'+ helpers.getFromUri('userid', user_uri) +'/playlists?limit=40' )
sendRequest(dispatch, getState, 'users/'+ helpers.getFromUri('userid', user_uri) +'/playlists?limit=40' )
.then(
response => {
var playlists = []
@ -1262,11 +1262,11 @@ export function getUserPlaylists(user_uri){
*
* @oaram uri string
**/
export function getAlbum( uri ){
export function getAlbum(uri){
return (dispatch, getState) => {
// get the album
sendRequest( dispatch, getState, 'albums/'+ helpers.getFromUri('albumid', uri) )
sendRequest(dispatch, getState, 'albums/'+ helpers.getFromUri('albumid', uri) )
.then(
response => {
@ -1304,12 +1304,12 @@ export function getAlbum( uri ){
// now get all the artists for this album (full objects)
// we do this to get the artist artwork
var artist_ids = [];
for( var i = 0; i < response.artists.length; i++ ){
artist_ids.push( helpers.getFromUri( 'artistid', response.artists[i].uri ) )
for(var i = 0; i < response.artists.length; i++){
artist_ids.push(helpers.getFromUri('artistid', response.artists[i].uri ) )
}
// get all album artists as full objects
sendRequest( dispatch, getState, 'artists/?ids='+artist_ids )
sendRequest(dispatch, getState, 'artists/?ids='+artist_ids )
.then(
response => {
dispatch({
@ -1336,13 +1336,13 @@ export function getAlbum( uri ){
}
}
export function toggleAlbumInLibrary( uri, method ){
if( method == 'PUT' ) var new_state = 1
if( method == 'DELETE' ) var new_state = 0
export function toggleAlbumInLibrary(uri, method){
if (method == 'PUT' ) var new_state = 1
if (method == 'DELETE' ) var new_state = 0
return (dispatch, getState) => {
sendRequest( dispatch, getState, 'me/albums?ids='+ helpers.getFromUri('albumid',uri), method )
.then(
sendRequest(dispatch, getState, 'me/albums?ids='+ helpers.getFromUri('albumid',uri), method )
.then(
response => {
dispatch({
type: 'SPOTIFY_ALBUM_FOLLOWING',
@ -1369,7 +1369,7 @@ export function toggleAlbumInLibrary( uri, method ){
* ======================================================================================
**/
export function createPlaylist( name, description, is_public, is_collaborative ){
export function createPlaylist(name, description, is_public, is_collaborative){
return (dispatch, getState) => {
var data = {
@ -1380,7 +1380,7 @@ export function createPlaylist( name, description, is_public, is_collaborative )
}
sendRequest(dispatch, getState, 'users/'+ getState().spotify.me.id +'/playlists/', 'POST', data)
.then(
.then(
response => {
dispatch({
type: 'PLAYLIST_LOADED',
@ -1423,8 +1423,8 @@ export function savePlaylist(uri, name, description, is_public, is_collaborative
collaborative: is_collaborative
}
sendRequest( dispatch, getState, 'users/'+ getState().spotify.me.id +'/playlists/'+ helpers.getFromUri('playlistid',uri), 'PUT', data)
.then(
sendRequest(dispatch, getState, 'users/'+ getState().spotify.me.id +'/playlists/'+ helpers.getFromUri('playlistid',uri), 'PUT', data)
.then(
response => {
dispatch({
type: 'PLAYLIST_UPDATED',
@ -1452,8 +1452,8 @@ export function getPlaylist(uri){
return (dispatch, getState) => {
// get the main playlist object
sendRequest( dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'?market='+getState().core.country )
.then(
sendRequest(dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'?market='+getState().core.country )
.then(
response => {
// convert links in description
@ -1574,11 +1574,11 @@ export function getPlaylistTracksForPlayingProcessor(data){
}
export function toggleFollowingPlaylist(uri, method){
if( method == 'PUT' ) var new_state = 1
if( method == 'DELETE' ) var new_state = 0
if (method == 'PUT' ) var new_state = 1
if (method == 'DELETE' ) var new_state = 0
return (dispatch, getState) => {
sendRequest( dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) + '/playlists/'+ helpers.getFromUri('playlistid',uri) + '/followers', method )
sendRequest(dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) + '/playlists/'+ helpers.getFromUri('playlistid',uri) + '/followers', method )
.then(
response => {
dispatch({
@ -1597,10 +1597,10 @@ export function toggleFollowingPlaylist(uri, method){
}
}
export function addTracksToPlaylist( uri, tracks_uris ){
export function addTracksToPlaylist(uri, tracks_uris){
return (dispatch, getState) => {
sendRequest( dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) + '/playlists/'+ helpers.getFromUri('playlistid',uri) + '/tracks', 'POST', { uris: tracks_uris } )
.then(
sendRequest(dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) + '/playlists/'+ helpers.getFromUri('playlistid',uri) + '/tracks', 'POST', { uris: tracks_uris } )
.then(
response => {
dispatch({
type: 'PLAYLIST_TRACKS_ADDED',
@ -1619,10 +1619,10 @@ export function addTracksToPlaylist( uri, tracks_uris ){
}
}
export function deleteTracksFromPlaylist( uri, snapshot_id, tracks_indexes ){
export function deleteTracksFromPlaylist(uri, snapshot_id, tracks_indexes){
return (dispatch, getState) => {
sendRequest( dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) + '/playlists/'+ helpers.getFromUri('playlistid',uri) + '/tracks', 'DELETE', { snapshot_id: snapshot_id, positions: tracks_indexes } )
.then(
sendRequest(dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) + '/playlists/'+ helpers.getFromUri('playlistid',uri) + '/tracks', 'DELETE', { snapshot_id: snapshot_id, positions: tracks_indexes } )
.then(
response => {
dispatch({
type: 'PLAYLIST_TRACKS_REMOVED',
@ -1641,10 +1641,10 @@ export function deleteTracksFromPlaylist( uri, snapshot_id, tracks_indexes ){
}
}
export function reorderPlaylistTracks( uri, range_start, range_length, insert_before, snapshot_id ){
export function reorderPlaylistTracks(uri, range_start, range_length, insert_before, snapshot_id){
return (dispatch, getState) => {
sendRequest( dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) + '/playlists/'+ helpers.getFromUri('playlistid',uri) + '/tracks', 'PUT', { uri: uri, range_start: range_start, range_length: range_length, insert_before: insert_before, snapshot_id: snapshot_id } )
.then(
sendRequest(dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) + '/playlists/'+ helpers.getFromUri('playlistid',uri) + '/tracks', 'PUT', { uri: uri, range_start: range_start, range_length: range_length, insert_before: insert_before, snapshot_id: snapshot_id } )
.then(
response => {
dispatch({
type: 'PLAYLIST_TRACKS_REORDERED',
@ -1773,7 +1773,7 @@ export function getLibraryArtists(){
export function getLibraryArtistsProcessor(data){
return (dispatch, getState) => {
sendRequest(dispatch, getState, data.next)
.then(
.then(
response => {
dispatch({
type: 'SPOTIFY_LIBRARY_ARTISTS_LOADED',

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

@ -84,27 +84,27 @@ const SpotifyMiddleware = (function(){
break;
case 'SPOTIFY_CREATE_PLAYLIST':
store.dispatch( spotifyActions.createPlaylist( action.name, action.description, action.is_private, action.is_collaborative ))
store.dispatch(spotifyActions.createPlaylist(action.name, action.description, action.is_private, action.is_collaborative ))
break;
case 'SPOTIFY_REMOVE_PLAYLIST_TRACKS':
var playlist = Object.assign({},state.core.playlists[action.key]);
store.dispatch( spotifyActions.deleteTracksFromPlaylist( playlist.uri, playlist.snapshot_id, action.tracks_indexes ))
store.dispatch(spotifyActions.deleteTracksFromPlaylist(playlist.uri, playlist.snapshot_id, action.tracks_indexes ))
break;
case 'SPOTIFY_ADD_PLAYLIST_TRACKS':
store.dispatch( spotifyActions.addTracksToPlaylist( action.key, action.tracks_uris ))
store.dispatch(spotifyActions.addTracksToPlaylist(action.key, action.tracks_uris ))
break;
case 'SPOTIFY_REORDER_PLAYLIST_TRACKS':
store.dispatch( spotifyActions.reorderPlaylistTracks( action.key, action.range_start, action.range_length, action.insert_before, action.snapshot_id ))
store.dispatch(spotifyActions.reorderPlaylistTracks(action.key, action.range_start, action.range_length, action.insert_before, action.snapshot_id ))
break;
case 'SPOTIFY_SAVE_PLAYLIST':
store.dispatch( spotifyActions.savePlaylist( action.key, action.name, action.description, action.is_public, action.is_collaborative ))
store.dispatch(spotifyActions.savePlaylist(action.key, action.name, action.description, action.is_public, action.is_collaborative ))
break;
case 'SPOTIFY_NEW_RELEASES_LOADED':
@ -136,7 +136,7 @@ const SpotifyMiddleware = (function(){
case 'SPOTIFY_USER_PLAYLISTS_LOADED':
var playlists = []
for( var i = 0; i < action.data.items.length; i++ ){
for(var i = 0; i < action.data.items.length; i++){
var playlist = Object.assign(
{},
action.data.items[i],
@ -167,7 +167,7 @@ const SpotifyMiddleware = (function(){
case 'SPOTIFY_CATEGORY_PLAYLISTS_LOADED':
var playlists = []
for( var i = 0; i < action.data.playlists.items.length; i++ ){
for(var i = 0; i < action.data.playlists.items.length; i++){
var playlist = Object.assign(
{},
action.data.playlists.items[i],
@ -202,7 +202,7 @@ const SpotifyMiddleware = (function(){
case 'SPOTIFY_LIBRARY_PLAYLISTS_LOADED':
var playlists = []
for( var i = 0; i < action.playlists.length; i++ ){
for(var i = 0; i < action.playlists.length; i++){
var playlist = Object.assign(
{},
action.playlists[i],

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

@ -2,7 +2,7 @@
import * as helpers from '../../helpers'
export default function reducer(spotify = {}, action){
switch (action.type) {
switch (action.type){
case 'SPOTIFY_CONNECT':
case 'SPOTIFY_CONNECTING':
@ -88,7 +88,7 @@ export default function reducer(spotify = {}, action){
}})
case 'SPOTIFY_DISCOVER_LOADED':
if( !action.data ) return Object.assign({}, spotify, { discover: [] })
if (!action.data ) return Object.assign({}, spotify, { discover: [] })
return Object.assign({}, spotify, { discover: [...spotify.discover, ...[action.data]] })
case 'SPOTIFY_RECOMMENDATIONS_LOADED':

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

@ -46,20 +46,20 @@ export function hideTouchContextMenu(){
}
}
export function lazyLoading( start ){
export function lazyLoading(start){
return {
type: 'LAZY_LOADING',
start: start
}
}
export function toggleSidebar( new_state = 'toggle' ){
export function toggleSidebar(new_state = 'toggle'){
var action = { type: 'TOGGLE_SIDEBAR' }
if( new_state != 'toggle' ) action.new_state = new_state
if (new_state != 'toggle' ) action.new_state = new_state
return action
}
export function dragStart( e, context, from_uri = null, victims, victims_indexes = null ){
export function dragStart(e, context, from_uri = null, victims, victims_indexes = null){
return {
type: 'DRAG_START',
context: context,
@ -79,7 +79,7 @@ export function dragEnd(){
return { type: 'DRAG_END' }
}
export function set( data ){
export function set(data){
return {
type: 'UI_SET',
data: data
@ -94,7 +94,7 @@ export function set( data ){
* Immersive full-screen dialog
**/
export function openModal( name, data ){
export function openModal(name, data){
return {
type: 'OPEN_MODAL',
modal: {
@ -117,7 +117,7 @@ export function closeModal(){
* Subtle info/tooltip messages
**/
export function createBrowserNotification( data ){
export function createBrowserNotification(data){
return {
type: 'BROWSER_NOTIFICATION',
data: data

14
src/js/services/ui/middleware.js
View File

@ -41,8 +41,8 @@ const UIMiddleware = (function(){
// handle nested data objects
var data = {}
if( typeof(action.data) ) data = action.data
if( typeof(data.data) ) data = Object.assign({}, data, data.data)
if (typeof(action.data) ) data = action.data
if (typeof(data.data) ) data = Object.assign({}, data, data.data)
// construct our browser notification
var title = '';
@ -52,12 +52,12 @@ const UIMiddleware = (function(){
lang: 'EN',
tag: 'iris'
};
if( data.title ) title = data.title;
if( data.body ) options.body = data.body;
if( data.icon ) options.icon = data.icon;
if (data.title ) title = data.title;
if (data.body ) options.body = data.body;
if (data.icon ) options.icon = data.icon;
// make it so
var notification = new notification( title, options );
var notification = new notification(title, options );
break
case 'CREATE_NOTIFICATION':
@ -78,7 +78,7 @@ const UIMiddleware = (function(){
case 'REMOVE_NOTIFICATION':
var notifications = Object.assign([], store.getState().ui.notifications)
function getByKey( notification ){
function getByKey(notification){
return notification.key === action.key
}
var index = notifications.findIndex(getByKey)

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

@ -2,7 +2,7 @@
import * as helpers from '../../helpers'
export default function reducer(ui = {}, action){
switch (action.type) {
switch (action.type){
case 'LAZY_LOADING':
return Object.assign({}, ui, { lazy_loading: action.start });
@ -18,7 +18,7 @@ export default function reducer(ui = {}, action){
case 'TOGGLE_SIDEBAR':
var new_state = !ui.sidebar_open
if( typeof(action.new_state) !== 'undefined' ) new_state = action.new_state
if (typeof(action.new_state) !== 'undefined' ) new_state = action.new_state
return Object.assign({}, ui, { sidebar_open : new_state })
case 'SET_SELECTED_TRACKS':
@ -100,7 +100,7 @@ export default function reducer(ui = {}, action){
case 'REMOVE_NOTIFICATION':
var notifications = Object.assign([], ui.notifications)
if( action.index > -1 ){
if (action.index > -1){
notifications.splice(action.index, 1)
}