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

Buildout

Browse Source
This commit is contained in:
James Barnsley
2020-12-19 21:17:04 +13:00
parent 924df5b7a6
commit 10e831821a
9 changed files with 107 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
IRIS_VERSION
View File

@ -1 +1 @@
3.55.4 3.55.5

2
mopidy_iris/__init__.py
View File

@ -3,7 +3,7 @@ import pathlib
from mopidy import config, ext from mopidy import config, ext
__version__ = "3.55.4" __version__ = "3.55.5"
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

412
mopidy_iris/static/app.js
View File

@ -92575,29 +92575,6 @@ function isPlainEnoughObject(o) {
/***/ }), /***/ }),
/***/ "./node_modules/redux-persist/lib/stateReconciler/hardSet.js":
/*!*******************************************************************!*\
!*** ./node_modules/redux-persist/lib/stateReconciler/hardSet.js ***!
\*******************************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
exports.__esModule = true;
exports.default = hardSet;
/*
hardSet:
- hard set incoming state
*/
function hardSet(inboundState) {
return inboundState;
}
/***/ }),
/***/ "./node_modules/redux-thunk/es/index.js": /***/ "./node_modules/redux-thunk/es/index.js":
/*!**********************************************!*\ /*!**********************************************!*\
!*** ./node_modules/redux-thunk/es/index.js ***! !*** ./node_modules/redux-thunk/es/index.js ***!
@ -114835,9 +114812,10 @@ function set(data) {
data: data data: data
}; };
} }
function resetState() { function resetState(stateKeysToReset) {
return { return {
type: 'RESET_STATE' type: 'RESET_STATE',
stateKeysToReset: stateKeysToReset
}; };
} }
function clearCurrentTrack() { function clearCurrentTrack() {
@ -116535,6 +116513,14 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findTrackLyrics", function() { return findTrackLyrics; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findTrackLyrics", function() { return findTrackLyrics; });
/* harmony import */ var _util_helpers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../util/helpers */ "./src/js/util/helpers.js"); /* harmony import */ var _util_helpers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../util/helpers */ "./src/js/util/helpers.js");
/* harmony import */ var _util_selectors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../util/selectors */ "./src/js/util/selectors.js"); /* harmony import */ var _util_selectors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../util/selectors */ "./src/js/util/selectors.js");
/* harmony import */ var _util_format__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../util/format */ "./src/js/util/format.js");
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@ -116657,9 +116643,12 @@ function importAuthorization(authorization) {
function getMe() { function getMe() {
return function (dispatch, getState) { return function (dispatch, getState) {
sendRequest(dispatch, getState, 'account').then(function (response) { sendRequest(dispatch, getState, 'account').then(function (response) {
var me = Object(_util_format__WEBPACK_IMPORTED_MODULE_2__["formatUser"])(response.user);
dispatch({ dispatch({
type: 'GENIUS_ME_LOADED', type: 'GENIUS_ME_LOADED',
me: response.user me: _objectSpread(_objectSpread({}, me), {}, {
uri: "genius:user:".concat(me.id)
})
}); });
}, function (error) { }, function (error) {
dispatch(coreActions.handleException('Could not load your Genius profile', error)); dispatch(coreActions.handleException('Could not load your Genius profile', error));
@ -116788,9 +116777,6 @@ function findTrackLyrics(uri) {
"use strict"; "use strict";
__webpack_require__.r(__webpack_exports__); __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _util_format__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../util/format */ "./src/js/util/format.js");
var coreActions = __webpack_require__(/*! ../core/actions */ "./src/js/services/core/actions.js"); var coreActions = __webpack_require__(/*! ../core/actions */ "./src/js/services/core/actions.js");
var geniusActions = __webpack_require__(/*! ./actions */ "./src/js/services/genius/actions.js"); var geniusActions = __webpack_require__(/*! ./actions */ "./src/js/services/genius/actions.js");
@ -116799,29 +116785,9 @@ var GeniusMiddleware = function () {
return function (store) { return function (store) {
return function (next) { return function (next) {
return function (action) { return function (action) {
var state = store.getState();
switch (action.type) { switch (action.type) {
case 'GENIUS_ME_LOADED': case 'GENIUS_ME_LOADED':
var me = Object(_util_format__WEBPACK_IMPORTED_MODULE_0__["formatUser"])(action.me); store.dispatch(coreActions.userLoaded(action.me));
Object.assign(me, {
uri: "genius:user:".concat(me.id)
});
store.dispatch({
type: 'GENIUS_USER_LOADED',
user: action.me
});
action.me = me;
next(action);
break;
case 'GENIUS_USER_LOADED':
var user = Object(_util_format__WEBPACK_IMPORTED_MODULE_0__["formatUser"])(action.user);
Object.assign(user, {
uri: "genius:user:".concat(user.id)
});
store.dispatch(coreActions.userLoaded(user));
action.user = user;
next(action); next(action);
break; break;
@ -116952,216 +116918,6 @@ function clearLibraryAlbums() {
/***/ }), /***/ }),
/***/ "./src/js/services/google/middleware.js":
/*!**********************************************!*\
!*** ./src/js/services/google/middleware.js ***!
\**********************************************/
/*! exports provided: default */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! lodash */ "./node_modules/lodash/lodash.js");
/* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(lodash__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var _util_arrays__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../util/arrays */ "./src/js/util/arrays.js");
/* harmony import */ var _util_format__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../util/format */ "./src/js/util/format.js");
/* harmony import */ var _locale__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../locale */ "./src/js/locale/index.js");
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
var coreActions = __webpack_require__(/*! ../core/actions */ "./src/js/services/core/actions.js");
var mopidyActions = __webpack_require__(/*! ../mopidy/actions */ "./src/js/services/mopidy/actions.js");
var uiActions = __webpack_require__(/*! ../ui/actions */ "./src/js/services/ui/actions.js");
var GoogleMiddleware = function () {
// A Google request is an alias of the Mopidy request
var request = function request(store, method) {
var params = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
var response_callback = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
var error_callback = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
store.dispatch(mopidyActions.request(method, params, response_callback, error_callback));
};
return function (store) {
return function (next) {
return function (action) {
switch (action.type) {
case 'GOOGLE_GET_LIBRARY_ALBUMS':
{
store.dispatch(uiActions.startProcess(action.type, {
notification: false
}));
request(store, 'library.browse', {
uri: 'gmusic:album'
}, function (browseResponse) {
var allUris = Object(_util_arrays__WEBPACK_IMPORTED_MODULE_1__["arrayOf"])('uri', browseResponse);
store.dispatch(uiActions.updateProcess(action.type, {
remaining: allUris.length,
total: allUris.length
}));
var run = function run() {
if (allUris.length) {
var uris = allUris.splice(0, 5);
var processor = store.getState().ui.processes[action.type];
if (processor && processor.status === 'cancelling') {
store.dispatch(uiActions.processCancelled(action.type));
store.dispatch(uiActions.stopLoading('google:library:artists'));
return;
}
store.dispatch(uiActions.updateProcess(action.type, {
remaining: allUris.length
}));
request(store, 'library.lookup', {
uris: uris
}, function (lookupResponse) {
var libraryAlbums = Object(lodash__WEBPACK_IMPORTED_MODULE_0__["compact"])(Object(_util_arrays__WEBPACK_IMPORTED_MODULE_1__["indexToArray"])(lookupResponse).map(function (tracks) {
if (tracks.length) {
return _objectSpread({
artists: tracks[0].artists ? Object(_util_format__WEBPACK_IMPORTED_MODULE_2__["formatArtists"])(tracks[0].artists) : null,
tracks: Object(_util_format__WEBPACK_IMPORTED_MODULE_2__["formatTracks"])(tracks),
last_modified: tracks[0].last_modified
}, Object(_util_format__WEBPACK_IMPORTED_MODULE_2__["formatAlbum"])(tracks[0].album));
}
}));
if (libraryAlbums.length) {
store.dispatch(coreActions.itemsLoaded(libraryAlbums));
}
run();
});
} else {
store.dispatch(uiActions.processFinished(action.type));
store.dispatch(coreActions.libraryLoaded({
uri: 'google:library:albums',
items_uris: Object(_util_arrays__WEBPACK_IMPORTED_MODULE_1__["arrayOf"])('uri', browseResponse)
}));
}
};
run();
});
break;
}
case 'GOOGLE_GET_LIBRARY_ARTISTS':
{
store.dispatch(uiActions.startProcess(action.type, {
notification: false
}));
request(store, 'library.browse', {
uri: 'gmusic:artist'
}, function (browseResponse) {
store.dispatch(uiActions.updateProcess(action.type, {
remaining: browseResponse.length,
total: browseResponse.length
}));
var allUris = Object(_util_arrays__WEBPACK_IMPORTED_MODULE_1__["arrayOf"])('uri', browseResponse);
var run = function run() {
var uris = allUris.splice(0, 5);
var processor = store.getState().ui.processes[action.type];
if (processor && processor.status === 'cancelling') {
store.dispatch(uiActions.processCancelled(action.type));
store.dispatch(uiActions.stopLoading('google:library:artists'));
return;
}
store.dispatch(uiActions.updateProcess(action.type, {
remaining: allUris.length
}));
if (uris.length) {
request(store, 'library.lookup', {
uris: uris
}, function (lookupResponse) {
var libraryArtists = Object(lodash__WEBPACK_IMPORTED_MODULE_0__["compact"])(Object(_util_arrays__WEBPACK_IMPORTED_MODULE_1__["indexToArray"])(lookupResponse).map(function (tracks) {
if (tracks.length) {
return _objectSpread({
artists: tracks[0].artists ? Object(_util_format__WEBPACK_IMPORTED_MODULE_2__["formatArtists"])(tracks[0].artists) : null,
tracks: Object(_util_format__WEBPACK_IMPORTED_MODULE_2__["formatTracks"])(tracks),
last_modified: tracks[0].last_modified
}, Object(_util_format__WEBPACK_IMPORTED_MODULE_2__["formatAlbum"])(tracks[0].album));
}
}));
if (libraryArtists.length) {
store.dispatch(coreActions.itemsLoaded(libraryArtists));
}
run();
});
} else {
store.dispatch(uiActions.processFinished(action.type));
store.dispatch(coreActions.libraryLoaded({
uri: 'google:library:artists',
items_uris: Object(_util_arrays__WEBPACK_IMPORTED_MODULE_1__["arrayOf"])('uri', browseResponse)
}));
}
};
run();
});
break;
}
default:
return next(action);
}
};
};
};
}();
/* harmony default export */ __webpack_exports__["default"] = (GoogleMiddleware);
/***/ }),
/***/ "./src/js/services/google/reducer.js":
/*!*******************************************!*\
!*** ./src/js/services/google/reducer.js ***!
\*******************************************/
/*! exports provided: default */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return reducer; });
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
function reducer() {
var google = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
var action = arguments.length > 1 ? arguments[1] : undefined;
switch (action.type) {
case 'GOOGLE_SET':
return _objectSpread(_objectSpread({}, google), action.data);
default:
return google;
}
}
/***/ }),
/***/ "./src/js/services/lastfm/actions.js": /***/ "./src/js/services/lastfm/actions.js":
/*!*******************************************!*\ /*!*******************************************!*\
!*** ./src/js/services/lastfm/actions.js ***! !*** ./src/js/services/lastfm/actions.js ***!
@ -125661,35 +125417,33 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var localforage__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(localforage__WEBPACK_IMPORTED_MODULE_2__); /* harmony import */ var localforage__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(localforage__WEBPACK_IMPORTED_MODULE_2__);
/* harmony import */ var redux_thunk__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! redux-thunk */ "./node_modules/redux-thunk/es/index.js"); /* harmony import */ var redux_thunk__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! redux-thunk */ "./node_modules/redux-thunk/es/index.js");
/* harmony import */ var _util_helpers__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../util/helpers */ "./src/js/util/helpers.js"); /* harmony import */ var _util_helpers__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../util/helpers */ "./src/js/util/helpers.js");
/* harmony import */ var redux_persist_lib_stateReconciler_hardSet__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! redux-persist/lib/stateReconciler/hardSet */ "./node_modules/redux-persist/lib/stateReconciler/hardSet.js"); /* harmony import */ var _services_core_reducer__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../services/core/reducer */ "./src/js/services/core/reducer.js");
/* harmony import */ var redux_persist_lib_stateReconciler_hardSet__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(redux_persist_lib_stateReconciler_hardSet__WEBPACK_IMPORTED_MODULE_5__); /* harmony import */ var _services_ui_reducer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../services/ui/reducer */ "./src/js/services/ui/reducer.js");
/* harmony import */ var _services_core_reducer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../services/core/reducer */ "./src/js/services/core/reducer.js"); /* harmony import */ var _services_pusher_reducer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../services/pusher/reducer */ "./src/js/services/pusher/reducer.js");
/* harmony import */ var _services_ui_reducer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../services/ui/reducer */ "./src/js/services/ui/reducer.js"); /* harmony import */ var _services_mopidy_reducer__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../services/mopidy/reducer */ "./src/js/services/mopidy/reducer.js");
/* harmony import */ var _services_pusher_reducer__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../services/pusher/reducer */ "./src/js/services/pusher/reducer.js"); /* harmony import */ var _services_lastfm_reducer__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../services/lastfm/reducer */ "./src/js/services/lastfm/reducer.js");
/* harmony import */ var _services_mopidy_reducer__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../services/mopidy/reducer */ "./src/js/services/mopidy/reducer.js"); /* harmony import */ var _services_spotify_reducer__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../services/spotify/reducer */ "./src/js/services/spotify/reducer.js");
/* harmony import */ var _services_lastfm_reducer__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../services/lastfm/reducer */ "./src/js/services/lastfm/reducer.js"); /* harmony import */ var _services_snapcast_reducer__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../services/snapcast/reducer */ "./src/js/services/snapcast/reducer.js");
/* harmony import */ var _services_spotify_reducer__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../services/spotify/reducer */ "./src/js/services/spotify/reducer.js"); /* harmony import */ var _services_genius_reducer__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../services/genius/reducer */ "./src/js/services/genius/reducer.js");
/* harmony import */ var _services_snapcast_reducer__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../services/snapcast/reducer */ "./src/js/services/snapcast/reducer.js"); /* harmony import */ var _migration__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./migration */ "./src/js/store/migration.js");
/* harmony import */ var _services_google_reducer__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../services/google/reducer */ "./src/js/services/google/reducer.js"); /* harmony import */ var _services_core_middleware__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../services/core/middleware */ "./src/js/services/core/middleware.js");
/* harmony import */ var _services_genius_reducer__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../services/genius/reducer */ "./src/js/services/genius/reducer.js"); /* harmony import */ var _services_ui_middleware__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../services/ui/middleware */ "./src/js/services/ui/middleware.js");
/* harmony import */ var _migration__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./migration */ "./src/js/store/migration.js"); /* harmony import */ var _services_pusher_middleware__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../services/pusher/middleware */ "./src/js/services/pusher/middleware.js");
/* harmony import */ var _services_core_middleware__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../services/core/middleware */ "./src/js/services/core/middleware.js"); /* harmony import */ var _services_mopidy_middleware__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../services/mopidy/middleware */ "./src/js/services/mopidy/middleware.js");
/* harmony import */ var _services_ui_middleware__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../services/ui/middleware */ "./src/js/services/ui/middleware.js"); /* harmony import */ var _services_lastfm_middleware__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../services/lastfm/middleware */ "./src/js/services/lastfm/middleware.js");
/* harmony import */ var _services_pusher_middleware__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../services/pusher/middleware */ "./src/js/services/pusher/middleware.js"); /* harmony import */ var _services_genius_middleware__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../services/genius/middleware */ "./src/js/services/genius/middleware.js");
/* harmony import */ var _services_mopidy_middleware__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../services/mopidy/middleware */ "./src/js/services/mopidy/middleware.js"); /* harmony import */ var _services_spotify_middleware__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../services/spotify/middleware */ "./src/js/services/spotify/middleware.js");
/* harmony import */ var _services_lastfm_middleware__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../services/lastfm/middleware */ "./src/js/services/lastfm/middleware.js"); /* harmony import */ var _services_snapcast_middleware__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../services/snapcast/middleware */ "./src/js/services/snapcast/middleware.js");
/* harmony import */ var _services_genius_middleware__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../services/genius/middleware */ "./src/js/services/genius/middleware.js"); function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
/* harmony import */ var _services_spotify_middleware__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../services/spotify/middleware */ "./src/js/services/spotify/middleware.js");
/* harmony import */ var _services_google_middleware__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../services/google/middleware */ "./src/js/services/google/middleware.js"); function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
/* harmony import */ var _services_snapcast_middleware__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../services/snapcast/middleware */ "./src/js/services/snapcast/middleware.js");
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
//import storage from '../util/storage';
@ -125783,9 +125537,6 @@ var initialState = {
autocomplete_results: {}, autocomplete_results: {},
authorization_url: 'https://jamesbarnsley.co.nz/iris/auth_spotify.php' authorization_url: 'https://jamesbarnsley.co.nz/iris/auth_spotify.php'
}, },
google: {
enabled: false
},
snapcast: { snapcast: {
enabled: false, enabled: false,
connected: false, connected: false,
@ -125798,28 +125549,9 @@ var initialState = {
server: null, server: null,
commands: {} commands: {}
} }
}; }; // Run any migrations
/*
// load all our stored values from LocalStorage
state.core = { ...state.core, ...storage.get('core') };
state.ui = { ...state.ui, ...storage.get('ui') };
state.mopidy = { ...state.mopidy, ...storage.get('mopidy') };
state.pusher = { ...state.pusher, ...storage.get('pusher') };
state.spotify = { ...state.spotify, ...storage.get('spotify') };
state.lastfm = { ...state.lastfm, ...storage.get('lastfm') };
state.genius = { ...state.genius, ...storage.get('genius') };
state.google = { ...state.google, ...storage.get('google') };
state.snapcast = { ...state.snapcast, ...storage.get('snapcast') };
*/
// Run any migrations
initialState = Object(_migration__WEBPACK_IMPORTED_MODULE_15__["default"])(initialState); initialState = Object(_migration__WEBPACK_IMPORTED_MODULE_13__["default"])(initialState);
var rootPersistConfig = {
key: 'root',
storage: localforage__WEBPACK_IMPORTED_MODULE_2___default.a,
blacklist: ['ui', 'core', 'spotify', 'pusher'],
debug: window.test_mode
};
var corePersistConfig = { var corePersistConfig = {
key: 'core', key: 'core',
storage: localforage__WEBPACK_IMPORTED_MODULE_2___default.a, storage: localforage__WEBPACK_IMPORTED_MODULE_2___default.a,
@ -125827,6 +125559,21 @@ var corePersistConfig = {
blacklist: ['items', 'albums', 'artists', 'playlists', 'search_results', 'users', 'tracks', 'libraries' // We manually hydrate this, so we can handle the rehydration of library items blacklist: ['items', 'albums', 'artists', 'playlists', 'search_results', 'users', 'tracks', 'libraries' // We manually hydrate this, so we can handle the rehydration of library items
] ]
}; };
var geniusPersistConfig = {
key: 'genius',
storage: localforage__WEBPACK_IMPORTED_MODULE_2___default.a,
debug: window.test_mode
};
var lastfmPersistConfig = {
key: 'lastfm',
storage: localforage__WEBPACK_IMPORTED_MODULE_2___default.a,
debug: window.test_mode
};
var snapcastPersistConfig = {
key: 'snapcast',
storage: localforage__WEBPACK_IMPORTED_MODULE_2___default.a,
debug: window.test_mode
};
var pusherPersistConfig = { var pusherPersistConfig = {
key: 'pusher', key: 'pusher',
storage: localforage__WEBPACK_IMPORTED_MODULE_2___default.a, storage: localforage__WEBPACK_IMPORTED_MODULE_2___default.a,
@ -125852,27 +125599,33 @@ var uiPersistConfig = {
debug: window.test_mode debug: window.test_mode
}; };
var appReducer = Object(redux__WEBPACK_IMPORTED_MODULE_0__["combineReducers"])({ var appReducer = Object(redux__WEBPACK_IMPORTED_MODULE_0__["combineReducers"])({
core: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(corePersistConfig, _services_core_reducer__WEBPACK_IMPORTED_MODULE_6__["default"]), core: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(corePersistConfig, _services_core_reducer__WEBPACK_IMPORTED_MODULE_5__["default"]),
ui: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(uiPersistConfig, _services_ui_reducer__WEBPACK_IMPORTED_MODULE_7__["default"]), ui: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(uiPersistConfig, _services_ui_reducer__WEBPACK_IMPORTED_MODULE_6__["default"]),
mopidy: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(mopidyPersistConfig, _services_mopidy_reducer__WEBPACK_IMPORTED_MODULE_9__["default"]), mopidy: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(mopidyPersistConfig, _services_mopidy_reducer__WEBPACK_IMPORTED_MODULE_8__["default"]),
spotify: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(spotifyPersistConfig, _services_spotify_reducer__WEBPACK_IMPORTED_MODULE_11__["default"]), spotify: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(spotifyPersistConfig, _services_spotify_reducer__WEBPACK_IMPORTED_MODULE_10__["default"]),
pusher: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(pusherPersistConfig, _services_pusher_reducer__WEBPACK_IMPORTED_MODULE_8__["default"]), pusher: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(pusherPersistConfig, _services_pusher_reducer__WEBPACK_IMPORTED_MODULE_7__["default"]),
lastfm: _services_lastfm_reducer__WEBPACK_IMPORTED_MODULE_10__["default"], genius: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(geniusPersistConfig, _services_genius_reducer__WEBPACK_IMPORTED_MODULE_12__["default"]),
genius: _services_genius_reducer__WEBPACK_IMPORTED_MODULE_14__["default"], lastfm: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(lastfmPersistConfig, _services_lastfm_reducer__WEBPACK_IMPORTED_MODULE_9__["default"]),
google: _services_google_reducer__WEBPACK_IMPORTED_MODULE_13__["default"], snapcast: Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(snapcastPersistConfig, _services_snapcast_reducer__WEBPACK_IMPORTED_MODULE_11__["default"])
snapcast: _services_snapcast_reducer__WEBPACK_IMPORTED_MODULE_12__["default"]
}); });
var rootReducer = function rootReducer(state, action) { var rootReducer = function rootReducer(state, action) {
var nextState = state;
if (action.type === 'RESET_STATE') { if (action.type === 'RESET_STATE') {
state = initialState; console.log(action);
var stateKeysToReset = action.stateKeysToReset;
var resetStates = {};
stateKeysToReset.forEach(function (key) {
resetStates[key] = initialState[key];
});
nextState = _objectSpread(_objectSpread({}, state), resetStates);
} }
return appReducer(state, action); return appReducer(nextState, action);
}; };
var persistedReducer = Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistReducer"])(rootPersistConfig, rootReducer); var store = Object(redux__WEBPACK_IMPORTED_MODULE_0__["createStore"])(rootReducer, initialState, Object(redux__WEBPACK_IMPORTED_MODULE_0__["applyMiddleware"])(redux_thunk__WEBPACK_IMPORTED_MODULE_3__["default"], _services_core_middleware__WEBPACK_IMPORTED_MODULE_14__["default"], _services_ui_middleware__WEBPACK_IMPORTED_MODULE_15__["default"], _services_mopidy_middleware__WEBPACK_IMPORTED_MODULE_17__["default"], _services_pusher_middleware__WEBPACK_IMPORTED_MODULE_16__["default"], _services_spotify_middleware__WEBPACK_IMPORTED_MODULE_20__["default"], _services_lastfm_middleware__WEBPACK_IMPORTED_MODULE_18__["default"], _services_genius_middleware__WEBPACK_IMPORTED_MODULE_19__["default"], _services_snapcast_middleware__WEBPACK_IMPORTED_MODULE_21__["default"]));
var store = Object(redux__WEBPACK_IMPORTED_MODULE_0__["createStore"])(persistedReducer, initialState, Object(redux__WEBPACK_IMPORTED_MODULE_0__["applyMiddleware"])(redux_thunk__WEBPACK_IMPORTED_MODULE_3__["default"], _services_core_middleware__WEBPACK_IMPORTED_MODULE_16__["default"], _services_ui_middleware__WEBPACK_IMPORTED_MODULE_17__["default"], _services_mopidy_middleware__WEBPACK_IMPORTED_MODULE_19__["default"], _services_pusher_middleware__WEBPACK_IMPORTED_MODULE_18__["default"], _services_spotify_middleware__WEBPACK_IMPORTED_MODULE_22__["default"], _services_lastfm_middleware__WEBPACK_IMPORTED_MODULE_20__["default"], _services_genius_middleware__WEBPACK_IMPORTED_MODULE_21__["default"], _services_google_middleware__WEBPACK_IMPORTED_MODULE_23__["default"], _services_snapcast_middleware__WEBPACK_IMPORTED_MODULE_24__["default"]));
var persistor = Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistStore"])(store); var persistor = Object(redux_persist__WEBPACK_IMPORTED_MODULE_1__["persistStore"])(store);
/* harmony default export */ __webpack_exports__["default"] = ({ /* harmony default export */ __webpack_exports__["default"] = ({
store: store, store: store,
@ -131278,7 +131031,7 @@ var Album = /*#__PURE__*/function (_React$Component) {
})) : null, !slim_mode && album.listeners ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("li", { })) : null, !slim_mode && album.listeners ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("li", {
"data-qa-node": "li", "data-qa-node": "li",
"data-qa-file": "Album" "data-qa-file": "Album"
}, Object(_locale__WEBPACK_IMPORTED_MODULE_15__["i18n"])('specs.plays', { }, Object(_locale__WEBPACK_IMPORTED_MODULE_15__["i18n"])('specs.listeners', {
count: Object(_components_NiceNumber__WEBPACK_IMPORTED_MODULE_9__["nice_number"])(album.listeners) count: Object(_components_NiceNumber__WEBPACK_IMPORTED_MODULE_9__["nice_number"])(album.listeners)
})) : null)), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", { })) : null)), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
className: "actions", className: "actions",
@ -144943,10 +144696,16 @@ var Reset = /*#__PURE__*/function (_React$Component) {
e.preventDefault(); e.preventDefault();
var tasks = []; var tasks = [];
var stateKeysToReset = [];
var stateKeys = ['mopidy', 'pusher', 'ui', 'spotify', 'snapcast', 'lastfm', 'genius'];
if (preferences) { if (preferences) {
tasks.push(new Promise(function (resolve) { tasks.push(new Promise(function (resolve) {
var keysToRemove = ['persist:root', 'persist:ui', 'persist:spotify', 'persist:pusher']; var keysToRemove = [];
stateKeys.forEach(function (key) {
keysToRemove.push("persist:".concat(key));
stateKeysToReset.push(key);
});
keysToRemove.forEach(function (key, index) { keysToRemove.forEach(function (key, index) {
localforage__WEBPACK_IMPORTED_MODULE_3___default.a.removeItem(key).then(function () { localforage__WEBPACK_IMPORTED_MODULE_3___default.a.removeItem(key).then(function () {
console.debug("Removed ".concat(key)); console.debug("Removed ".concat(key));
@ -144962,9 +144721,8 @@ var Reset = /*#__PURE__*/function (_React$Component) {
if (database) { if (database) {
tasks.push(new Promise(function (resolve) { tasks.push(new Promise(function (resolve) {
localforage__WEBPACK_IMPORTED_MODULE_3___default.a.keys().then(function (keys) { localforage__WEBPACK_IMPORTED_MODULE_3___default.a.keys().then(function (keys) {
var keysToKeep = ['persist:root', 'persist:ui', 'persist:spotify', 'persist:pusher'];
var keysToRemove = keys.filter(function (key) { var keysToRemove = keys.filter(function (key) {
return keysToKeep.indexOf(key) < 0; return !stateKeys.includes(key.replace('persist:', ''));
}); });
keysToRemove.forEach(function (key, index) { keysToRemove.forEach(function (key, index) {
localforage__WEBPACK_IMPORTED_MODULE_3___default.a.removeItem(key).then(function () { localforage__WEBPACK_IMPORTED_MODULE_3___default.a.removeItem(key).then(function () {
@ -145024,9 +144782,9 @@ var Reset = /*#__PURE__*/function (_React$Component) {
Promise.all(tasks).then(function () { Promise.all(tasks).then(function () {
console.log('Reset complete, refreshing...'); console.log('Reset complete, refreshing...');
resetState(); resetState(stateKeysToReset);
setTimeout(function () { setTimeout(function () {
return window.location = "/iris".concat(test_mode ? '?test_mode=0' : ''); return window.location = "/iris/settings".concat(test_mode ? '?test_mode=0' : '');
}, 1000); }, 1000);
}); });
}); });

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

28
mopidy_iris/static/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
mopidy_iris/static/index.html
View File

@ -106,8 +106,8 @@
// Release details // Release details
// These are automatically injected to built HTML // These are automatically injected to built HTML
var build = "1608281618"; var build = "1608365705";
var version = "3.55.4"; var version = "3.55.5";
// Construct the script tag // Construct the script tag
var js = document.createElement("script"); var js = document.createElement("script");

2
mopidy_iris/static/manifest.json
View File

@ -1,5 +1,5 @@
{ {
"manifest_version": "3.55.4", "manifest_version": "3.55.5",
"short_name": "Iris", "short_name": "Iris",
"name": "Iris", "name": "Iris",
"icons": [ "icons": [

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mopidy-iris", "name": "mopidy-iris",
"version": "3.55.4", "version": "3.55.5",
"description": "Mopidy HTTP interface", "description": "Mopidy HTTP interface",
"repository": "https://github.com/jaedb/iris", "repository": "https://github.com/jaedb/iris",
"author": "James Barnsley <james@barnsley.nz>", "author": "James Barnsley <james@barnsley.nz>",

2
setup.cfg
View File

@ -1,6 +1,6 @@
[metadata] [metadata]
name = Mopidy-Iris name = Mopidy-Iris
version = 3.55.4 version = 3.55.5
url = https://github.com/jaedb/iris url = https://github.com/jaedb/iris
author = James Barnsley author = James Barnsley
author_email = james@barnsley.nz author_email = james@barnsley.nz