From 759f4ef37ff896197f2d0beb7f9e0b845ac0f740 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Thu, 26 Jan 2017 09:15:54 +1300 Subject: [PATCH] Renaming album/artist fetchers --- mopidy_iris/__init__.py | 2 +- src/js/services/mopidy/actions.js | 8 ++++---- src/js/services/mopidy/middleware.js | 4 ++-- src/js/views/library/LibraryLocalAlbums.js | 2 +- src/js/views/library/LibraryLocalArtists.js | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mopidy_iris/__init__.py b/mopidy_iris/__init__.py index 3064c0bf..25120350 100755 --- a/mopidy_iris/__init__.py +++ b/mopidy_iris/__init__.py @@ -8,7 +8,7 @@ from frontend import IrisFrontend from http import RequestHandler logger = logging.getLogger(__name__) -__version__ = '2.11.0' +__version__ = '2.11.1' ## # Core extension class diff --git a/src/js/services/mopidy/actions.js b/src/js/services/mopidy/actions.js index 48b48b09..1df3fb96 100755 --- a/src/js/services/mopidy/actions.js +++ b/src/js/services/mopidy/actions.js @@ -186,9 +186,9 @@ export function getArtist( uri ){ } } -export function getArtists(){ +export function getLibraryArtists(){ return { - type: 'MOPIDY_GET_ARTISTS' + type: 'MOPIDY_GET_LIBRARY_ARTISTS' } } @@ -206,9 +206,9 @@ export function getAlbums( uris ){ } } -export function getLocalAlbums(){ +export function getLibraryAlbums(){ return { - type: 'MOPIDY_GET_LOCAL_ALBUMS' + type: 'MOPIDY_GET_LIBRARY_ALBUMS' } } diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js index 205caa7e..c19bea99 100755 --- a/src/js/services/mopidy/middleware.js +++ b/src/js/services/mopidy/middleware.js @@ -544,7 +544,7 @@ const MopidyMiddleware = (function(){ * ====================================================================================== **/ - case 'MOPIDY_GET_LOCAL_ALBUMS': + case 'MOPIDY_GET_LIBRARY_ALBUMS': instruct( socket, store, 'library.browse', { uri: 'local:directory?type=album' } ) .then( response => { @@ -658,7 +658,7 @@ const MopidyMiddleware = (function(){ * ====================================================================================== **/ - case 'MOPIDY_GET_ARTISTS': + case 'MOPIDY_GET_LIBRARY_ARTISTS': store.dispatch({ type: 'LOCAL_ARTISTS_LOADED', data: false }); instruct( socket, store, 'library.browse', { uri: 'local:directory?type=artist' } ) .then( response => { diff --git a/src/js/views/library/LibraryLocalAlbums.js b/src/js/views/library/LibraryLocalAlbums.js index 33852112..7cfafc82 100755 --- a/src/js/views/library/LibraryLocalAlbums.js +++ b/src/js/views/library/LibraryLocalAlbums.js @@ -32,7 +32,7 @@ class LibraryLocalAlbums extends React.Component{ loadAlbums(props = this.props){ if (props.mopidy_connected && !this.props.local_albums){ - this.props.mopidyActions.getLocalAlbums(); + this.props.mopidyActions.getLibraryAlbums(); } } diff --git a/src/js/views/library/LibraryLocalArtists.js b/src/js/views/library/LibraryLocalArtists.js index 156d54d7..09626f66 100755 --- a/src/js/views/library/LibraryLocalArtists.js +++ b/src/js/views/library/LibraryLocalArtists.js @@ -28,7 +28,7 @@ class LibraryLocalArtists extends React.Component{ loadArtists(props = this.props){ if( props.mopidy_connected && !props.local_artists ){ - this.props.mopidyActions.getArtists(); + this.props.mopidyActions.getLibraryArtists(); } }