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

Merge pull request #772 from jaedb/develop

Browse Source 
Develop
This commit is contained in:
James Barnsley
2021-10-02 20:34:06 +13:00
committed by GitHub
parent 07f9b163fb 75b6f090e8
commit 45cb8367a7
12 changed files with 82 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
IRIS_VERSION
View File

@ -1 +1 @@
3.59.0
3.59.1

2
mopidy_iris/__init__.py
View File

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

59
mopidy_iris/static/app.js
View File

@ -147972,37 +147972,46 @@ var App = /*#__PURE__*/function (_React$Component) {
var message = _hint$originalExcepti.message; // Filter out issues that destroy our quota and that are not informative enough to
// actually resolve.
if (message && (message.match(/Websocket/i) || message.match(/NotSupportedError/i) || message.match(/Non-Error promise rejection captured with keys: call, message, value/i) || message.match(/Cannot read property 'addChunk' of undefined/i))) {
if (message && (message.match(/Websocket/i) || message.match(/NotSupportedError/i) || message.match(/NotSupportedError: The element has no supported sources./i) || message.match(/Non-Error promise rejection captured with keys: call, message, value/i) || message.match(/Cannot read property 'addChunk' of undefined/i))) {
return null;
}
return event;
}
});
} // Load query param settings
} // Accept incoming preconfiguration via URL parameters and inject into application state.
// For example: iris?snapcast={"enabled":true,"host":"myserver.local"}
var configs = ['ui', 'spotify', 'pusher', 'snapcast', 'mopidy', 'google', 'lastfm', 'genius'];
var params = new URLSearchParams(window.location.search);
var changed = [];
var urlParams = params.forEach(function (v, k) {
if (!configs.includes(k)) return;
try {
_util_storage__WEBPACK_IMPORTED_MODULE_51__["default"].set(k, JSON.parse(v));
changed.push(k);
} catch (error) {
console.error(error);
}
});
if (params) {
params.forEach(function (value, key) {
try {
var json = JSON.parse(value);
if (changed.length > 0) {
changed.forEach(function (k) {
return params["delete"](k);
switch (key) {
case 'ui':
case 'spotify':
case 'pusher':
case 'snapcast':
case 'mopidy':
_this.props["".concat(key, "Actions")].set(json);
break;
default:
break;
}
} catch (e) {
console.error('Preconfiguration failed', {
e: e,
key: key,
value: value
});
return;
}
});
var url = window.location.toString().replace(window.location.search, params.toString());
console.log("Settings changed, redirecting to ".concat(url), changed);
window.location.assign(url);
}
_this.handleInstallPrompt = _this.handleInstallPrompt.bind(_assertThisInitialized(_this));
@ -169754,11 +169763,12 @@ function reducer() {
/*!*******************************************!*\
!*** ./src/js/services/pusher/actions.js ***!
\*******************************************/
/*! exports provided: setPort, setUsername, connect, disconnect, upgrade, reload, restart, localScan, getConnections, connectionAdded, updateConnection, connectionChanged, connectionRemoved, request, getConfig, getVersion, deliverBroadcast, deliverMessage, getRadio, startRadio, updateRadio, stopRadio, radioStarted, radioChanged, radioStopped, debug, getQueueMetadata, queueMetadataChanged, addQueueMetadata, getPinned, addPinned, removePinned, setPinned, pinnedUpdated, getCommands, setCommand, setCommands, removeCommand, runCommand, commandsUpdated */
/*! exports provided: set, setPort, setUsername, connect, disconnect, upgrade, reload, restart, localScan, getConnections, connectionAdded, updateConnection, connectionChanged, connectionRemoved, request, getConfig, getVersion, deliverBroadcast, deliverMessage, getRadio, startRadio, updateRadio, stopRadio, radioStarted, radioChanged, radioStopped, debug, getQueueMetadata, queueMetadataChanged, addQueueMetadata, getPinned, addPinned, removePinned, setPinned, pinnedUpdated, getCommands, setCommand, setCommands, removeCommand, runCommand, commandsUpdated */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "set", function() { return set; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setPort", function() { return setPort; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setUsername", function() { return setUsername; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "connect", function() { return connect; });
@ -169799,6 +169809,12 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "removeCommand", function() { return removeCommand; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runCommand", function() { return runCommand; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "commandsUpdated", function() { return commandsUpdated; });
function set(data) {
return {
type: 'PUSHER_SET',
data: data
};
}
function setPort(port) {
return {
type: 'PUSHER_SET_PORT',
@ -170945,6 +170961,9 @@ function reducer() {
connecting: false
});
case 'PUSHER_SET':
return _objectSpread(_objectSpread({}, pusher), action.data);
case 'PUSHER_SET_PORT':
return _objectSpread(_objectSpread({}, pusher), {}, {
port: action.port

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

File diff suppressed because one or more lines are too long

4
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

@ -115,8 +115,8 @@
// Release details
// These are automatically injected to built HTML
var build = "1633137695";
var version = "3.59.0";
var build = "1633159406";
var version = "3.59.1";
// Construct the script tag
var js = document.createElement("script");

2
mopidy_iris/static/manifest.json
View File

@ -1,5 +1,5 @@
{
"manifest_version": "3.59.0",
"manifest_version": "3.59.1",
"short_name": "Iris",
"name": "Iris",
"icons": [

2
package.json
View File

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

2
setup.cfg
View File

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

40
src/js/App.js
View File

@ -94,6 +94,7 @@ export class App extends React.Component {
&& (
message.match(/Websocket/i)
|| message.match(/NotSupportedError/i)
|| message.match(/NotSupportedError: The element has no supported sources./i)
|| message.match(/Non-Error promise rejection captured with keys: call, message, value/i)
|| message.match(/Cannot read property 'addChunk' of undefined/i)
)
@ -106,24 +107,29 @@ export class App extends React.Component {
});
}
// Load query param settings
const configs = ['ui', 'spotify', 'pusher', 'snapcast', 'mopidy', 'google', 'lastfm', 'genius'];
// Accept incoming preconfiguration via URL parameters and inject into application state.
// For example: iris?snapcast={"enabled":true,"host":"myserver.local"}
const params = new URLSearchParams(window.location.search);
const changed = [];
const urlParams = params.forEach((v, k) => {
if (!configs.includes(k)) return;
try {
storage.set(k, JSON.parse(v));
changed.push(k);
} catch (error) {
console.error(error);
}
});
if (changed.length > 0) {
changed.forEach((k) => params.delete(k));
const url = window.location.toString().replace(window.location.search, params.toString());
console.log(`Settings changed, redirecting to ${url}`, changed);
window.location.assign(url);
if (params) {
params.forEach((value, key) => {
try {
const json = JSON.parse(value);
switch (key) {
case 'ui':
case 'spotify':
case 'pusher':
case 'snapcast':
case 'mopidy':
this.props[`${key}Actions`].set(json);
break;
default:
break;
}
} catch (e) {
console.error('Preconfiguration failed', { e, key, value })
return;
}
});
}
this.handleInstallPrompt = this.handleInstallPrompt.bind(this);

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

@ -1,3 +1,10 @@
export function set(data) {
return {
type: 'PUSHER_SET',
data,
};
}
export function setPort(port) {
return {
type: 'PUSHER_SET_PORT',

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

@ -17,6 +17,9 @@ export default function reducer(pusher = {}, action) {
case 'PUSHER_DISCONNECTED':
return { ...pusher, connected: false, connecting: false };
case 'PUSHER_SET':
return { ...pusher, ...action.data };
case 'PUSHER_SET_PORT':
return { ...pusher, port: action.port };