Customising artist and album library URIs

mopidy_iris/static/app.js

@@ -3372,7 +3372,7 @@ function getLibraryAlbumsProcessor(data) {
 Object.defineProperty(exports, "__esModule", {
 	value: true
 });
-exports.setConfig = setConfig;
+exports.set = set;
 exports.connect = connect;
 exports.connecting = connecting;
 exports.upgrading = upgrading;
@@ -3422,11 +3422,13 @@ exports.getPlaylists = getPlaylists;
 exports.getDirectory = getDirectory;
 exports.getTrack = getTrack;
 exports.getLibraryArtists = getLibraryArtists;
+exports.clearLibraryArtists = clearLibraryArtists;
 exports.getArtist = getArtist;
 exports.getArtists = getArtists;
 exports.getAlbum = getAlbum;
 exports.getAlbums = getAlbums;
 exports.getLibraryAlbums = getLibraryAlbums;
+exports.clearLibraryAlbums = clearLibraryAlbums;
 exports.runProcessor = runProcessor;
 exports.cancelProcessor = cancelProcessor;
 exports.clearSearchResults = clearSearchResults;
@@ -3439,10 +3441,10 @@ var helpers = _interopRequireWildcard(_helpers);
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
-function setConfig(config) {
+function set(data) {
 	return {
-		type: 'MOPIDY_SET_CONFIG',
+		type: 'MOPIDY_SET',
-		config: config
+		data: data
 	};
 }
 
@@ -3795,6 +3797,12 @@ function getLibraryArtists() {
 	};
 }
 
+function clearLibraryArtists() {
+	return {
+		type: 'MOPIDY_CLEAR_LIBRARY_ARTISTS'
+	};
+}
+
 function getArtist(uri) {
 	return {
 		type: 'MOPIDY_GET_ARTIST',
@@ -3835,6 +3843,12 @@ function getLibraryAlbums() {
 	};
 }
 
+function clearLibraryAlbums() {
+	return {
+		type: 'MOPIDY_CLEAR_LIBRARY_ALBUMS'
+	};
+}
+
 function runProcessor(processor) {
 	return {
 		type: processor
@@ -49283,7 +49297,9 @@ var initialState = {
 		volume: 0,
 		progress: 0,
 		play_state: false,
-		uri_schemes: []
+		uri_schemes: [],
+		library_albums_uri: 'local:directory?type=album',
+		library_artists_uri: 'local:directory?type=artist'
 	},
 	pusher: {
 		connected: false,
@@ -49957,13 +49973,6 @@ function reducer() {
         case 'MOPIDY_DISCONNECTED':
             return Object.assign({}, mopidy, { connected: false, connecting: false });
 
-        case 'MOPIDY_SET_CONFIG':
-            return Object.assign({}, mopidy, {
-                host: action.config.host,
-                port: action.config.port,
-                ssl: action.config.ssl
-            });
-
         case 'MOPIDY_CHANGE_TRACK':
             return Object.assign({}, mopidy, {
                 tlid: action.tlid
@@ -49974,6 +49983,9 @@ function reducer() {
                 uri_schemes: action.uri_schemes
             });
 
+        case 'MOPIDY_SET':
+            return Object.assign({}, mopidy, action.data);
+
         /**
          * State-oriented actions
          **/
@@ -50072,6 +50084,9 @@ function reducer() {
             }
             return Object.assign({}, mopidy, { library_artists: helpers.removeDuplicates(uris) });
 
+        case 'MOPIDY_CLEAR_LIBRARY_ARTISTS':
+            return Object.assign({}, mopidy, { library_artists: null });
+
         case 'MOPIDY_LIBRARY_ALBUMS_LOADED':
             if (mopidy.library_albums) {
                 var uris = [].concat(_toConsumableArray(mopidy.library_albums), _toConsumableArray(action.uris));
@@ -50080,6 +50095,9 @@ function reducer() {
             }
             return Object.assign({}, mopidy, { library_albums: helpers.removeDuplicates(uris) });
 
+        case 'MOPIDY_CLEAR_LIBRARY_ALBUMS':
+            return Object.assign({}, mopidy, { library_albums: null });
+
         /**
          * Searching
          **/
@@ -53632,7 +53650,7 @@ var MopidyMiddleware = function () {
                         var last_run = store.getState().ui.processes.MOPIDY_LIBRARY_ALBUMS_PROCESSOR;
 
                         if (!last_run) {
-                            request(socket, store, 'library.browse', { uri: 'local:directory?type=album' }).then(function (response) {
+                            request(socket, store, 'library.browse', { uri: store.getState().mopidy.library_albums_uri }).then(function (response) {
                                 if (response.length <= 0) return;
 
                                 var uris = helpers.arrayOf('uri', response);
@@ -53777,10 +53795,17 @@ var MopidyMiddleware = function () {
                      * ======================================================================================
                      **/
                     case 'MOPIDY_GET_LIBRARY_ARTISTS':
-                        request(socket, store, 'library.browse', { uri: 'local:directory?type=artist' }).then(function (response) {
+                        request(socket, store, 'library.browse', { uri: store.getState().mopidy.library_artists_uri }).then(function (response) {
                             if (response.length <= 0) return;
 
-                            var uris = helpers.arrayOf('uri', response);
+                            var uris = [];
+                            for (var i = 0; i < response.length; i++) {
+
+                                // Convert local URI to actual artist URI
+                                // See https://github.com/mopidy/mopidy-local-sqlite/issues/39
+                                response[i].uri = response[i].uri.replace('local:directory?albumartist=', '');
+                                uris.push(response[i].uri);
+                            }
 
                             store.dispatch({
                                 type: 'ARTISTS_LOADED',
@@ -57543,24 +57568,12 @@ var localstorageMiddleware = function () {
                         });
                         break;
 
-                    case 'MOPIDY_SET_CONFIG':
-                        helpers.setStorage('mopidy', {
-                            host: action.config.host,
-                            port: action.config.port,
-                            ssl: action.config.ssl
-                        });
-                        break;
-
                     case 'MOPIDY_URISCHEMES_FILTERED':
                         helpers.setStorage('mopidy', {
                             uri_schemes: action.data
                         });
                         break;
 
-                    case 'SPOTIFY_SET':
-                        helpers.setStorage('spotify', action.data);
-                        break;
-
                     case 'SPOTIFY_IMPORT_AUTHORIZATION':
                     case 'SPOTIFY_AUTHORIZATION_GRANTED':
                         if (action.authorization !== undefined) {
@@ -57607,6 +57620,14 @@ var localstorageMiddleware = function () {
                         helpers.setStorage('ui', action.data);
                         break;
 
+                    case 'MOPIDY_SET':
+                        helpers.setStorage('mopidy', action.data);
+                        break;
+
+                    case 'SPOTIFY_SET':
+                        helpers.setStorage('spotify', action.data);
+                        break;
+
                     case 'SUPPRESS_BROADCAST':
                         var ui = helpers.getStorage('ui');
                         if (ui.suppressed_broadcasts !== undefined) {
@@ -57806,7 +57827,7 @@ var App = function (_React$Component) {
 			// Check for url-parsed configuration values
 			var url_vars = this.props.location.query;
 			if (url_vars !== undefined && url_vars.host !== undefined && url_vars.port !== undefined) {
-				this.props.mopidyActions.setConfig({
+				this.props.mopidyActions.set({
 					host: url_vars.host,
 					port: url_vars.port
 				});
@@ -62445,7 +62466,7 @@ var InitialSetupModal = function (_React$Component) {
 				initial_setup_complete: true,
 				allow_reporting: this.state.allow_reporting
 			});
-			this.props.mopidyActions.setConfig({
+			this.props.mopidyActions.set({
 				host: this.state.host,
 				port: this.state.port,
 				ssl: this.state.ssl
@@ -67635,6 +67656,8 @@ var Settings = function (_React$Component) {
 			mopidy_host: _this.props.mopidy.host,
 			mopidy_port: _this.props.mopidy.port,
 			mopidy_ssl: _this.props.mopidy.ssl,
+			mopidy_library_artists_uri: _this.props.mopidy.library_artists_uri,
+			mopidy_library_albums_uri: _this.props.mopidy.library_albums_uri,
 			pusher_username: _this.props.pusher.username,
 			input_in_focus: null
 		};
@@ -67670,7 +67693,7 @@ var Settings = function (_React$Component) {
 			this.setState({ input_in_focus: null });
 			e.preventDefault();
 
-			this.props.mopidyActions.setConfig({
+			this.props.mopidyActions.set({
 				host: this.state.mopidy_host,
 				port: this.state.mopidy_port,
 				ssl: this.state.mopidy_ssl
@@ -67681,11 +67704,21 @@ var Settings = function (_React$Component) {
 		}
 	}, {
 		key: 'handleBlur',
-		value: function handleBlur(name, value) {
+		value: function handleBlur(service, name, value) {
 			this.setState({ input_in_focus: null });
 			var data = {};
 			data[name] = value;
-			this.props.coreActions.set(data);
+			this.props[service + 'Actions'].set(data);
+
+			// Any per-field actions
+			switch (name) {
+				case 'library_albums_uri':
+					this.props.mopidyActions.clearLibraryAlbums();
+					break;
+				case 'library_artists_uri':
+					this.props.mopidyActions.clearLibraryArtists();
+					break;
+			}
 		}
 	}, {
 		key: 'handleUsernameChange',
@@ -68045,6 +68078,62 @@ var Settings = function (_React$Component) {
 							)
 						)
 					),
+					_react2.default.createElement(
+						'div',
+						{ className: 'field' },
+						_react2.default.createElement(
+							'div',
+							{ className: 'name' },
+							'Artist library URI'
+						),
+						_react2.default.createElement(
+							'div',
+							{ className: 'input' },
+							_react2.default.createElement('input', {
+								type: 'text',
+								value: this.state.mopidy_library_artists_uri,
+								onChange: function onChange(e) {
+									return _this2.setState({ mopidy_library_artists_uri: e.target.value });
+								},
+								onBlur: function onBlur(e) {
+									return _this2.handleBlur('mopidy', 'library_artists_uri', e.target.value);
+								}
+							}),
+							_react2.default.createElement(
+								'div',
+								{ className: 'description' },
+								'URI used for collecting library artists'
+							)
+						)
+					),
+					_react2.default.createElement(
+						'div',
+						{ className: 'field' },
+						_react2.default.createElement(
+							'div',
+							{ className: 'name' },
+							'Album library URI'
+						),
+						_react2.default.createElement(
+							'div',
+							{ className: 'input' },
+							_react2.default.createElement('input', {
+								type: 'text',
+								value: this.state.mopidy_library_albums_uri,
+								onChange: function onChange(e) {
+									return _this2.setState({ mopidy_library_albums_uri: e.target.value });
+								},
+								onBlur: function onBlur(e) {
+									return _this2.handleBlur('mopidy', 'library_albums_uri', e.target.value);
+								}
+							}),
+							_react2.default.createElement(
+								'div',
+								{ className: 'description' },
+								'URI used for collecting library albums'
+							)
+						)
+					),
 					_react2.default.createElement(
 						'div',
 						{ className: 'field sources-priority' },

src/js/App.js

@@ -84,7 +84,7 @@ class App extends React.Component{
 		// Check for url-parsed configuration values
 		var url_vars = this.props.location.query;
 		if (url_vars !== undefined && url_vars.host !== undefined && url_vars.port !== undefined){
-			this.props.mopidyActions.setConfig({
+			this.props.mopidyActions.set({
 				host: url_vars.host,
 				port: url_vars.port
 			});

src/js/bootstrap.js

@@ -63,7 +63,9 @@ var initialState = {
 		volume: 0,
 		progress: 0,
 		play_state: false,
-		uri_schemes: []
+		uri_schemes: [],
+		library_albums_uri: 'local:directory?type=album',
+		library_artists_uri: 'local:directory?type=artist'
 	},
 	pusher: {
 		connected: false,

src/js/components/Modal/InitialSetupModal.js

@@ -31,7 +31,7 @@ export default class InitialSetupModal extends React.Component{
 			initial_setup_complete: true,
 			allow_reporting: this.state.allow_reporting
 		});
-		this.props.mopidyActions.setConfig({
+		this.props.mopidyActions.set({
 			host: this.state.host,
 			port: this.state.port,
 			ssl: this.state.ssl

src/js/services/localstorage/middleware.js

@@ -58,17 +58,6 @@ const localstorageMiddleware = (function(){
                 );
                 break;
 
-            case 'MOPIDY_SET_CONFIG':
-                helpers.setStorage(
-                    'mopidy', 
-                    {
-                        host: action.config.host,
-                        port: action.config.port,
-                        ssl: action.config.ssl
-                    }
-                );
-                break;
-
             case 'MOPIDY_URISCHEMES_FILTERED':
                 helpers.setStorage(
                     'mopidy', 
@@ -78,13 +67,6 @@ const localstorageMiddleware = (function(){
                 );
                 break;
 
-            case 'SPOTIFY_SET':
-                helpers.setStorage(
-                    'spotify', 
-                    action.data
-                );
-                break;
-
             case 'SPOTIFY_IMPORT_AUTHORIZATION':
             case 'SPOTIFY_AUTHORIZATION_GRANTED':
                 if (action.authorization !== undefined){
@@ -149,6 +131,20 @@ const localstorageMiddleware = (function(){
                 );
                 break
 
+            case 'MOPIDY_SET':
+                helpers.setStorage(
+                    'mopidy', 
+                    action.data
+                );
+                break;
+
+            case 'SPOTIFY_SET':
+                helpers.setStorage(
+                    'spotify', 
+                    action.data
+                );
+                break;
+
             case 'SUPPRESS_BROADCAST':
                 var ui = helpers.getStorage('ui');
                 if (ui.suppressed_broadcasts !== undefined){

src/js/services/mopidy/actions.js

@@ -1,10 +1,10 @@
 
 import * as helpers from '../../helpers'
 
-export function setConfig(config){
+export function set(data){
     return {
-		type: 'MOPIDY_SET_CONFIG',
+        type: 'MOPIDY_SET',
-		config: config
+        data: data
     }
 }
 
@@ -352,6 +352,12 @@ export function getLibraryArtists(){
 	}
 }
 
+export function clearLibraryArtists(){
+	return { 
+		type: 'MOPIDY_CLEAR_LIBRARY_ARTISTS' 
+	}
+}
+
 export function getArtist(uri){
 	return { 
 		type: 'MOPIDY_GET_ARTIST', 
@@ -388,6 +394,12 @@ export function getLibraryAlbums(){
 	}
 }
 
+export function clearLibraryAlbums(){
+	return { 
+		type: 'MOPIDY_CLEAR_LIBRARY_ALBUMS' 
+	}
+}
+
 export function runProcessor(processor){
 	return {
 		type: processor

src/js/services/mopidy/middleware.js

@@ -1640,7 +1640,7 @@ const MopidyMiddleware = (function(){
                 var last_run = store.getState().ui.processes.MOPIDY_LIBRARY_ALBUMS_PROCESSOR
 
                 if (!last_run){
-                    request(socket, store, 'library.browse', { uri: 'local:directory?type=album' } )
+                    request(socket, store, 'library.browse', { uri: store.getState().mopidy.library_albums_uri } )
                         .then(response => {
                             if (response.length <= 0) return
 
@@ -1811,11 +1811,18 @@ const MopidyMiddleware = (function(){
              * ======================================================================================
              **/
             case 'MOPIDY_GET_LIBRARY_ARTISTS':
-                request(socket, store, 'library.browse', { uri: 'local:directory?type=artist' } )
+                request(socket, store, 'library.browse', { uri: store.getState().mopidy.library_artists_uri } )
                     .then(response => {
                         if (response.length <= 0) return
 
-                        var uris = helpers.arrayOf('uri',response)
+                        var uris = [];
+                        for (var i = 0; i < response.length; i++){ 
+
+                            // Convert local URI to actual artist URI
+                            // See https://github.com/mopidy/mopidy-local-sqlite/issues/39
+                            response[i].uri = response[i].uri.replace('local:directory?albumartist=','');
+                            uris.push(response[i].uri);
+                        }
 
                         store.dispatch({ 
                             type: 'ARTISTS_LOADED', 

src/js/services/mopidy/reducer.js

@@ -20,13 +20,6 @@ export default function reducer(mopidy = {}, action){
         case 'MOPIDY_DISCONNECTED':
             return Object.assign({}, mopidy, { connected: false, connecting: false });
 
-        case 'MOPIDY_SET_CONFIG':
-            return Object.assign({}, mopidy, {
-                host: action.config.host, 
-                port: action.config.port,
-                ssl: action.config.ssl
-            });
-
         case 'MOPIDY_CHANGE_TRACK':
             return Object.assign({}, mopidy, {
                 tlid: action.tlid
@@ -37,6 +30,9 @@ export default function reducer(mopidy = {}, action){
                 uri_schemes: action.uri_schemes
             });
 
+        case 'MOPIDY_SET':
+            return Object.assign({}, mopidy, action.data);
+
 
         /**
          * State-oriented actions
@@ -142,6 +138,9 @@ export default function reducer(mopidy = {}, action){
             }
             return Object.assign({}, mopidy, { library_artists: helpers.removeDuplicates(uris) })
 
+        case 'MOPIDY_CLEAR_LIBRARY_ARTISTS':
+            return Object.assign({}, mopidy, { library_artists: null })
+
         case 'MOPIDY_LIBRARY_ALBUMS_LOADED':
             if (mopidy.library_albums){
                 var uris = [...mopidy.library_albums,...action.uris]
@@ -150,6 +149,9 @@ export default function reducer(mopidy = {}, action){
             }
             return Object.assign({}, mopidy, { library_albums: helpers.removeDuplicates(uris) })
 
+        case 'MOPIDY_CLEAR_LIBRARY_ALBUMS':
+            return Object.assign({}, mopidy, { library_albums: null })
+
 
         /**
          * Searching

src/js/views/Settings.js

@@ -29,6 +29,8 @@ class Settings extends React.Component {
 			mopidy_host: this.props.mopidy.host,
 			mopidy_port: this.props.mopidy.port,
 			mopidy_ssl: this.props.mopidy.ssl,
+			mopidy_library_artists_uri: this.props.mopidy.library_artists_uri,
+			mopidy_library_albums_uri: this.props.mopidy.library_albums_uri,
 			pusher_username: this.props.pusher.username,
 			input_in_focus: null
 		}
@@ -59,7 +61,7 @@ class Settings extends React.Component {
 		this.setState({input_in_focus: null});
 		e.preventDefault();
 		
-		this.props.mopidyActions.setConfig({
+		this.props.mopidyActions.set({
 			host: this.state.mopidy_host,
 			port: this.state.mopidy_port,
 			ssl: this.state.mopidy_ssl
@@ -69,11 +71,21 @@ class Settings extends React.Component {
 		return false;
 	}
 
-	handleBlur(name, value){
+	handleBlur(service, name, value){
-		this.setState({input_in_focus: null})
+		this.setState({input_in_focus: null});
-		var data = {}
+		var data = {};
-		data[name] = value
+		data[name] = value;
-		this.props.coreActions.set(data)
+		this.props[service+'Actions'].set(data);
+
+		// Any per-field actions
+		switch (name){
+			case 'library_albums_uri':
+				this.props.mopidyActions.clearLibraryAlbums();
+				break;
+			case 'library_artists_uri':
+				this.props.mopidyActions.clearLibraryArtists();
+				break;
+		}
 	}
 
 	handleUsernameChange(username){
@@ -277,6 +289,36 @@ class Settings extends React.Component {
 						</div>
 					</div>
 
+					<div className="field">
+						<div className="name">Artist library URI</div>
+						<div className="input">
+							<input 
+								type="text"
+								value={this.state.mopidy_library_artists_uri}
+								onChange={e => this.setState({mopidy_library_artists_uri: e.target.value})}
+								onBlur={e => this.handleBlur('mopidy', 'library_artists_uri', e.target.value)}
+							/>
+							<div className="description">
+								URI used for collecting library artists
+							</div>
+						</div>
+					</div>
+
+					<div className="field">
+						<div className="name">Album library URI</div>
+						<div className="input">
+							<input 
+								type="text"
+								value={this.state.mopidy_library_albums_uri}
+								onChange={e => this.setState({mopidy_library_albums_uri: e.target.value})}
+								onBlur={e => this.handleBlur('mopidy', 'library_albums_uri', e.target.value)}
+							/>
+							<div className="description">
+								URI used for collecting library albums
+							</div>
+						</div>
+					</div>
+
 					<div className="field sources-priority">
 						<div className="name has-tooltip">
 							Sources priority