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

Code syntax consistency; Tooltips for asset types

Browse Source
This commit is contained in:
James Barnsley
2017-10-10 13:32:04 +13:00
parent 362e2cb17a
commit c8c3a38656
21 changed files with 64 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,10 +71,17 @@ export default function reducer(core = {}, action){
var tracks = Object.assign({}, core.tracks)
if (tracks[action.key]){
var track = Object.assign({}, tracks[action.key], action.track)
}else{
} else {
var track = Object.assign({}, action.track)
}
// Standardise components
if (!track.track_number && track.track_no) track.track_number = track.track_no;
if (!track.disc_number && track.disc_no) track.disc_number = track.disc_no;
if (!track.duration && track.duration_ms) track.duration = track.duration_ms;
if (!track.duration && track.length) track.duration = track.length;
if (!track.date && track.release_date) track.date = track.release_date;
tracks[action.key] = track
return Object.assign({}, core, { tracks: tracks });
@ -129,7 +136,7 @@ export default function reducer(core = {}, action){
if (categories[action.key]){
var category = Object.assign({}, categories[action.key], action.category)
}else{
} else {
var category = Object.assign({}, action.category)
}
@ -143,7 +150,7 @@ export default function reducer(core = {}, action){
var key = 'category:'+action.categories[i].id
if (categories[key]){
var category = Object.assign({}, categories[key], action.categories[i])
}else{
} else {
var category = Object.assign({}, action.categories[i])
}
categories[key] = category
@ -180,7 +187,7 @@ export default function reducer(core = {}, action){
if (albums[action.key]){
var album = Object.assign({}, albums[action.key], action.album)
}else{
} else {
var album = Object.assign({}, action.album)
}
@ -237,7 +244,7 @@ export default function reducer(core = {}, action){
}
var artist = Object.assign({}, artists[action.key], action.artist)
}else{
} else {
var artist = Object.assign({}, action.artist)
}
@ -284,7 +291,7 @@ export default function reducer(core = {}, action){
if (users[action.key]){
var user = Object.assign({}, users[action.key], action.user)
}else{
} else {
var user = Object.assign({}, action.user)
}
@ -340,7 +347,7 @@ export default function reducer(core = {}, action){
tracks: tracks
}
)
}else{
} else {
var merged_playlist = Object.assign({}, action.playlist)
}
@ -461,7 +468,7 @@ export default function reducer(core = {}, action){
case 'LIBRARY_PLAYLISTS_LOADED':
if (core.library_playlists){
var library_playlists = [...core.library_playlists, ...action.uris]
}else{
} else {
var library_playlists = action.uris
}
@ -500,7 +507,7 @@ export default function reducer(core = {}, action){
// artists
if (core.search_results && core.search_results.artists_uris){
var artists_uris = core.search_results.artists_uris
}else{
} else {
var artists_uris = []
}
if (action.artists_uris) artists_uris = [...artists_uris, ...action.artists_uris]
@ -514,7 +521,7 @@ export default function reducer(core = {}, action){
// albums
if (core.search_results && core.search_results.albums_uris){
var albums_uris = core.search_results.albums_uris
}else{
} else {
var albums_uris = []
}
if (action.albums_uris) albums_uris = [...albums_uris, ...action.albums_uris]
@ -528,7 +535,7 @@ export default function reducer(core = {}, action){
// playlists
if (core.search_results && core.search_results.playlists_uris){
var playlists_uris = core.search_results.playlists_uris
}else{
} else {
var playlists_uris = []
}
if (action.playlists_uris) playlists_uris = [...playlists_uris, ...action.playlists_uris]
@ -542,7 +549,7 @@ export default function reducer(core = {}, action){
// tracks
if (core.search_results && core.search_results.tracks){
var tracks = core.search_results.tracks
}else{
} else {
var tracks = []
}
if (action.tracks) tracks = [...tracks, ...action.tracks]

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

@ -63,7 +63,7 @@ export function getArtist(uri, artist, mbid = false){
return (dispatch, getState) => {
if (mbid){
var params = 'method=artist.getInfo&mbid='+mbid
}else{
} else {
artist = encodeURIComponent(artist );
var params = 'method=artist.getInfo&artist='+artist
}
@ -95,7 +95,7 @@ export function getAlbum(artist, album, mbid = false){
if (mbid){
var params = 'method=album.getInfo&mbid='+mbid
}else{
} else {
artist = encodeURIComponent(artist )
album = encodeURIComponent(album )
var params = 'method=album.getInfo&album='+album+'&artist='+artist

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

@ -50,7 +50,7 @@ const MopidyMiddleware = (function(){
store.dispatch(mopidyActions.getTimePosition())
// otherwise we just assume to add 1000ms every 1000ms of play time
}else{
} else {
store.dispatch(mopidyActions.setTimePosition(store.getState().mopidy.time_position + 1000 ))
}
@ -133,7 +133,7 @@ const MopidyMiddleware = (function(){
if (method in ws[model]){
var mopidyObject = ws[model][method]
var property = method;
}else{
} else {
var mopidyObject = ws[model]
var property = model;
}
@ -1178,7 +1178,7 @@ const MopidyMiddleware = (function(){
var playlist = Object.assign({}, response)
if (playlist.tracks){
playlist.tracks = [...playlist.tracks, ...tracks]
}else{
} else {
playlist.tracks = tracks
}
@ -1628,7 +1628,7 @@ const MopidyMiddleware = (function(){
if (!artist.images || artist.images.length <= 0){
if (artist.musicbrainz_id){
store.dispatch(lastfmActions.getArtist(artist.uri, false, artist.musicbrainz_id ) )
}else{
} else {
store.dispatch(lastfmActions.getArtist(artist.uri, artist.name.replace('&','and') ) )
}
}

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

@ -259,7 +259,7 @@ const PusherMiddleware = (function(){
if (response.upgrade_successful){
store.dispatch(uiActions.createNotification('Upgrade complete') )
}else{
} else {
store.dispatch(uiActions.createNotification('Upgrade failed, please upgrade manually','bad') )
}

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

@ -703,14 +703,14 @@ export function following(uri, method = 'GET'){
case 'album':
if (method == 'GET'){
endpoint = 'me/albums/contains/?ids='+ helpers.getFromUri('albumid', uri)
}else{
} else {
endpoint = 'me/albums/?ids='+ helpers.getFromUri('albumid', uri)
}
break
case 'artist':
if (method == 'GET'){
endpoint = 'me/following/contains?type=artist&ids='+ helpers.getFromUri('artistid', uri)
}else{
} else {
endpoint = 'me/following?type=artist&ids='+ helpers.getFromUri('artistid', uri)
data = {}
}
@ -718,7 +718,7 @@ export function following(uri, method = 'GET'){
case 'user':
if (method == 'GET'){
endpoint = 'me/following/contains?type=user&ids='+ helpers.getFromUri('userid', uri)
}else{
} else {
endpoint = 'me/following?type=user&ids='+ helpers.getFromUri('userid', uri)
data = {}
}
@ -726,7 +726,7 @@ export function following(uri, method = 'GET'){
case 'playlist':
if (method == 'GET'){
endpoint = 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'/followers/contains?ids='+ getState().spotify.me.id
}else{
} else {
endpoint = 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'/followers'
}
break