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

Releasing 3.34.2

Browse Source
This commit is contained in:
James Barnsley
2019-04-10 15:25:40 +12:00
parent 944a863031 bd3bf89150
commit 8d50291497
19 changed files with 188 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.md
View File

@ -1 +1 @@
3.34.1
3.34.2

2
mopidy_iris/__init__.py
View File

@ -12,7 +12,7 @@ from handlers import WebsocketHandler, HttpHandler
from core import IrisCore
logger = logging.getLogger(__name__)
__version__ = '3.34.1'
__version__ = '3.34.2'
##
# Core extension class

140
mopidy_iris/static/app/app.js
View File

@ -1708,9 +1708,13 @@ var sortItems = exports.sortItems = function sortItems(array, property) {
// Apply sort on a property of the first item of an array
if (property_element == 'first' && Array.isArray(value) && value.length > 0) {
value = value[0];
continue;
if (property_element == 'first') {
if (Array.isArray(value) && value.length > 0) {
value = value[0];
continue;
} else {
return null;
}
// Just need the length of an array
} else if (property_element == 'length') {
@ -1760,33 +1764,34 @@ var sortItems = exports.sortItems = function sortItems(array, property) {
// Map sorting
// Use the index of the string as a sorting mechanism
if (sort_map) {
var a_index = sort_map.indexOf(a_value + ':');
var b_index = sort_map.indexOf(b_value + ':');
if (a_index < b_index) return 1;
if (a_index > b_index) return -1;
// Boolean sorting
} else if (typeof a_value === 'boolean') {
} else if (typeof a_value == 'boolean' && typeof b_value == 'boolean') {
if (a_value && !b_value) return -1;
if (!a_value && b_value) return 1;
return 0;
// Alphabetic sorting
} else if (typeof a_value === 'string') {
if (!a_value || !b_value) return 0;
if (a_value.toLowerCase() > b_value.toLowerCase()) return 1;
if (a_value.toLowerCase() < b_value.toLowerCase()) return -1;
return 0;
// Numeric sorting
} else {
} else if (typeof a_value == 'number' && typeof b_value == 'number') {
if (a_value == null && b_value == null) return 0;
if (a_value == null) return -1;
if (b_value == null) return 1;
if (parseInt(a_value) > parseInt(b_value)) return 1;
if (parseInt(a_value) < parseInt(b_value)) return -1;
return 0;
// Alphabetic sorting
} else {
if (a_value && !b_value) return -1;
if (!a_value && b_value) return 1;
if (!a_value && !b_value) return 0;
if (a_value.toLowerCase() > b_value.toLowerCase()) return 1;
if (a_value.toLowerCase() < b_value.toLowerCase()) return -1;
return 0;
}
}
@ -3088,6 +3093,10 @@ var Icon = function (_React$Component) {
value: function render() {
var _this2 = this;
if (!this.props.name || this.props.name === "") {
return null;
}
var className = "icon icon--" + (this.props.type ? this.props.type : 'material');
if (this.props.className) {
className += ' ' + this.props.className;
@ -7848,9 +7857,8 @@ function getImages(context, uri) {
if (params) {
sendRequest(dispatch, getState, params).then(function (response) {
if (response.album) {
record = Object.assign({}, record, { images: response.album.image });
dispatch(coreActions.trackLoaded(record));
dispatch(coreActions.albumLoaded(response.album));
var images = helpers.formatImages(response.album.image);
dispatch(coreActions.trackLoaded({ uri: uri, images: images }));
}
});
}
@ -57344,7 +57352,7 @@ var PusherMiddleware = function () {
break;
case 'local_scan_error':
store.dispatch(uiActions.processFinished('local_scan'));
store.dispatch(uiActions.createNotification({ key: 'local_scan', type: 'bad', content: 'Local scan failed' }));
store.dispatch(uiActions.createNotification({ type: 'bad', content: message.params.message, description: message.params.description }));
break;
// Upgrade
@ -57356,7 +57364,7 @@ var PusherMiddleware = function () {
break;
case 'upgrade_error':
store.dispatch(uiActions.processFinished('upgrade'));
store.dispatch(uiActions.createNotification({ type: 'bad', content: 'Upgrade failed' }));
store.dispatch(uiActions.createNotification({ type: 'bad', content: message.params.message, description: message.params.description }));
break;
// Restart
@ -57364,6 +57372,10 @@ var PusherMiddleware = function () {
store.dispatch(uiActions.processFinished('upgrade'));
store.dispatch(uiActions.createNotification({ type: 'info', content: 'Restarting server...' }));
break;
case 'restart_error':
store.dispatch(uiActions.processFinished('upgrade'));
store.dispatch(uiActions.createNotification({ type: 'bad', content: message.params.message, description: message.params.description }));
break;
// Test
case 'test_started':
@ -57375,7 +57387,7 @@ var PusherMiddleware = function () {
break;
case 'test_error':
store.dispatch(uiActions.processFinished('test'));
store.dispatch(uiActions.createNotification({ type: 'bad', content: 'Test failed' }));
store.dispatch(uiActions.createNotification({ type: 'bad', content: message.params.message, description: message.params.description }));
break;
}
@ -64731,10 +64743,10 @@ var App = exports.App = function (_React$Component) {
}, {
key: 'shouldTriggerShortcut',
value: function shouldTriggerShortcut(e) {
if (!this.props.shortkeys_enabled) {
return false;
}
var keyCode = e.keyCode || e.which;
// When we're focussed on certian elements, don't fire any shortcuts
// Typically form inputs
@ -64743,23 +64755,20 @@ var App = exports.App = function (_React$Component) {
return false;
}
// Listen for standalone key codes
var keyCodes = [27, 32, 191];
if (keyCodes.indexOf(e.keyCode) > -1) {
var hotkeys = [27, 32, 191];
if (hotkeys.indexOf(keyCode) > -1) {
e.preventDefault();
return true;
}
// Listen for key codes that require ctrl to be held
var keyCodesWithCtrl = [37, 38, 39, 40];
if ((e.ctrlKey || e.metaKey) && keyCodesWithCtrl.indexOf(e.keyCode) > -1) {
var hokeys_with_alt = [37, 38, 39, 40];
if (e.altKey && hokeys_with_alt.indexOf(keyCode) > -1) {
e.preventDefault();
return true;
}
// Listen for key codes that require ctrl to be held
var keyCodesWithCtrlShift = [70];
if ((e.ctrlKey || e.metaKey) && e.shiftKey && keyCodesWithCtrlShift.indexOf(e.keyCode) > -1) {
var hokeys_with_alt_and_shift = [70];
if (e.altKey && e.shiftKey && hokeys_with_alt_and_shift.indexOf(keyCode) > -1) {
e.preventDefault();
return true;
}
@ -64815,7 +64824,7 @@ var App = exports.App = function (_React$Component) {
return;
}
switch (e.keyCode) {
switch (e.keyCode || e.which) {
case 32:
// spacebar
@ -64840,10 +64849,10 @@ var App = exports.App = function (_React$Component) {
case 40:
// down
if ((e.ctrlKey || e.metaKey) && e.shiftKey) {
if (e.altKey && e.shiftKey) {
this.props.mopidyActions.setMute(true);
this.props.uiActions.createNotification({ content: 'volume-off', type: 'shortcut', key: 'shortcut', duration: 1 });
} else if (e.ctrlKey) {
} else if (e.altKey) {
var volume = this.props.volume;
if (volume !== 'false') {
volume -= 5;
@ -64861,13 +64870,13 @@ var App = exports.App = function (_React$Component) {
case 38:
// up
if ((e.ctrlKey || e.metaKey) && e.shiftKey) {
if (e.altKey && e.shiftKey) {
this.props.mopidyActions.setVolume(100);
if (this.props.mute) {
this.props.mopidyActions.setMute(false);
}
this.props.uiActions.createNotification({ content: 'volume-up', type: 'shortcut', key: 'shortcut', duration: 1 });
} else if (e.ctrlKey || e.metaKey) {
} else if (e.altKey) {
var volume = this.props.volume;
if (volume !== 'false') {
volume += 5;
@ -64885,14 +64894,14 @@ var App = exports.App = function (_React$Component) {
case 37:
// left
if ((e.ctrlKey || e.metaKey) && e.shiftKey) {
if (e.altKey && e.shiftKey) {
var new_position = this.props.play_time_position - 30000;
if (new_position < 0) {
new_position = 0;;
}
this.props.mopidyActions.seek(new_position);
this.props.mopidyActions.setTimePosition(new_position);
this.props.uiActions.createNotification({ content: 'fast-backward', type: 'shortcut', key: 'shortcut', duration: 1 });
} else if (e.ctrlKey || e.metaKey) {
} else if (e.altKey) {
this.props.mopidyActions.previous();
this.props.uiActions.createNotification({ content: 'step-backward', type: 'shortcut', key: 'shortcut', duration: 1 });
}
@ -64900,10 +64909,10 @@ var App = exports.App = function (_React$Component) {
case 39:
// right
if ((e.ctrlKey || e.metaKey) && e.shiftKey) {
this.props.mopidyActions.seek(this.props.play_time_position + 30000);
if (e.altKey && e.shiftKey) {
this.props.mopidyActions.setTimePosition(this.props.play_time_position + 30000);
this.props.uiActions.createNotification({ content: 'fast-forward', type: 'shortcut', key: 'shortcut', duration: 1 });
} else if (e.ctrlKey || e.metaKey) {
} else if (e.altKey) {
this.props.mopidyActions.next();
this.props.uiActions.createNotification({ content: 'step-forward', type: 'shortcut', key: 'shortcut', duration: 1 });
}
@ -64911,8 +64920,8 @@ var App = exports.App = function (_React$Component) {
case 70:
// F
if ((e.ctrlKey || e.metaKey) && e.shiftKey) {
window.history.push('/modal/kiosk-mode');
if (e.altKey && e.shiftKey) {
this.props.history.push('/kiosk-mode');
}
break;
}
@ -70655,7 +70664,6 @@ var Playlist = function (_React$Component) {
value: function render() {
var _this3 = this;
var scheme = helpers.uriSource(this.props.uri);
var playlist_id = helpers.getFromUri('playlistid', this.props.uri);
if (!this.props.playlist) {
@ -70687,7 +70695,7 @@ var Playlist = function (_React$Component) {
context = 'editable-playlist';
}
if (!playlist.tracks_uris || playlist.tracks_uris && !playlist.tracks || playlist.tracks_uris.length !== playlist.tracks.length) {
if (playlist.tracks_total !== 0 && (!playlist.tracks_uris || playlist.tracks_uris && !playlist.tracks || playlist.tracks_uris.length !== playlist.tracks.length)) {
var is_loading_tracks = true;
} else {
var is_loading_tracks = false;
@ -70728,13 +70736,13 @@ var Playlist = function (_React$Component) {
playlist.user ? playlist.user.name : helpers.getFromUri('userid', playlist.user_uri)
)
) : null,
playlist.tracks ? _react2.default.createElement(
_react2.default.createElement(
'li',
null,
playlist.tracks_total ? playlist.tracks_total : '0',
' tracks'
) : null,
!this.props.slim_mode && playlist.tracks ? _react2.default.createElement(
),
!this.props.slim_mode && playlist.tracks && playlist.tracks_total > 0 ? _react2.default.createElement(
'li',
null,
_react2.default.createElement(_Dater2.default, { type: 'total-time', data: playlist.tracks })
@ -70786,10 +70794,16 @@ var Playlist = function (_React$Component) {
var mapStateToProps = function mapStateToProps(state, ownProps) {
// Decode the URI, and then re-encode all the spaces
// This is needed as Mopidy encodes spaces in playlist URIs (but not other characters)
// Decode the URI, and then re-encode selected characters
// This is needed as Mopidy encodes *some* characters in playlist URIs (but not other characters)
// We need to retain ":" because this a reserved URI separator
var uri = decodeURIComponent(ownProps.match.params.uri);
uri = uri.replace(/\s/g, '%20');
uri = uri.replace(/\s/g, '%20'); // space
uri = uri.replace(/\[/g, '%5B'); // [
uri = uri.replace(/\]/g, '%5D'); // ]
uri = uri.replace(/\(/g, '%28'); // (
uri = uri.replace(/\)/g, '%29'); // )
uri = uri.replace(/\#/g, '%23'); // #
return {
uri: uri,
@ -83725,7 +83739,7 @@ var ListItem = function (_React$Component) {
value.id
);
if (key_string === 'popularity') return _react2.default.createElement(_Popularity2.default, { full: true, popularity: value });
if (key[0] === 'artists') return _react2.default.createElement(_ArtistSentence2.default, { artists: value });
if (key_string === 'artists') return _react2.default.createElement(_ArtistSentence2.default, { artists: value });
if (value === true) return _react2.default.createElement(_Icon2.default, { name: 'check' });
if (typeof value === 'number') return _react2.default.createElement(
'span',
@ -84355,12 +84369,6 @@ var LibraryAlbums = function (_React$Component) {
return LibraryAlbums;
}(_react2.default.Component);
/**
* Export our component
*
* We also integrate our global store, using connect()
**/
var mapStateToProps = function mapStateToProps(state, ownProps) {
return {
mopidy_connected: state.mopidy.connected,
@ -85690,6 +85698,8 @@ var EditPlaylist = function (_React$Component) {
}, {
key: 'componentWillReceiveProps',
value: function componentWillReceiveProps(nextProps) {
// Playlist just loaded
if (!this.props.playlist && nextProps.playlist) {
this.setState({
name: nextProps.playlist.name,
@ -85697,6 +85707,10 @@ var EditPlaylist = function (_React$Component) {
public: nextProps.playlist.public == true,
collaborative: nextProps.playlist.collaborative == true
});
// Mopidy just connected, and we don't have the playlist yet
} else if (this.props.mopidy_connected != nextProps.mopidy_connected && !nextProps.playlist) {
this.props.mopidyActions.getPlaylist(this.props.uri);
}
}
}, {
@ -85923,10 +85937,16 @@ var EditPlaylist = function (_React$Component) {
var mapStateToProps = function mapStateToProps(state, ownProps) {
// Decode the URI, and then re-encode all the spaces
// This is needed as Mopidy encodes spaces in playlist URIs (but not other characters)
// Decode the URI, and then re-encode selected characters
// This is needed as Mopidy encodes *some* characters in playlist URIs (but not other characters)
// We need to retain ":" because this a reserved URI separator
var uri = decodeURIComponent(ownProps.match.params.uri);
uri = uri.replace(/\s/g, '%20');
uri = uri.replace(/\s/g, '%20'); // space
uri = uri.replace(/\[/g, '%5B'); // [
uri = uri.replace(/\]/g, '%5D'); // ]
uri = uri.replace(/\(/g, '%28'); // (
uri = uri.replace(/\)/g, '%29'); // )
uri = uri.replace(/\#/g, '%23'); // #
return {
uri: uri,

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

4
mopidy_iris/static/index.html
View File

@ -98,8 +98,8 @@
// Release details
// These are automatically injected to built HTML
var build = "1554320245";
var version = "3.34.1";
var build = "1554866701";
var version = "3.34.2";
// Construct the script tag
var js = document.createElement("script");

22
mopidy_iris/system.py
View File

@ -19,7 +19,7 @@ class IrisSystemThread(Thread):
logger.info("Running system action: "+self.action)
try:
self.check_system_access()
self.can_run()
except Exception, e:
logger.error(e)
@ -30,10 +30,10 @@ class IrisSystemThread(Thread):
if self.callback:
self.callback(False, error)
return
# Run the actual task (this is the process-blocking instruction)
output = subprocess.check_output(["sudo "+self.path+"/system.sh "+self.action], shell=True)
output = subprocess.check_output(["sudo -n "+self.path+"/system.sh "+self.action], shell=True)
# And then, when complete, return to our callback
if self.callback:
@ -48,15 +48,13 @@ class IrisSystemThread(Thread):
#
# @return boolean or exception
##
def check_system_access(self, *args, **kwargs):
def can_run(self, *args, **kwargs):
# Attempt an empty call to our system file
process = subprocess.Popen("sudo -n "+self.path+"/system.sh", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
result, error = process.communicate()
exitCode = process.wait()
# Some kind of failure, so we can't run any commands this way
if exitCode > 0:
raise Exception("Password-less access to "+self.path+"/system.sh was refused. Check your /etc/sudoers file.")
else:
# If this fails, we can't run any commands this way
try:
subprocess.check_output("sudo -n "+self.path+"/system.sh", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
return True
except Exception, e:
raise Exception("Password-less access to "+self.path+"/system.sh was refused. Check your /etc/sudoers file.")
return False

7
mopidy_iris/system.sh
View File

@ -17,10 +17,13 @@ elif [[ $1 = "local_scan" ]]; then
elif [[ $1 = "test" ]]; then
sleep 10
sleep 3
TEST="$(echo 'Hello, this is your bash speaking. I was sleeping for 10 seconds.')"
TEST="$(echo 'Hello, this is your bash speaking. I was sleeping for 3 seconds.')"
echo -e "${TEST}"
else;
echo -e "Unsupported system task"
fi
exit 0

2
package.json
View File

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

49
src/js/App.js
View File

@ -169,10 +169,10 @@ export class App extends React.Component{
}
shouldTriggerShortcut(e){
if (!this.props.shortkeys_enabled){
return false;
}
let keyCode = e.keyCode || e.which;
// When we're focussed on certian elements, don't fire any shortcuts
// Typically form inputs
@ -181,23 +181,20 @@ export class App extends React.Component{
return false;
}
// Listen for standalone key codes
let keyCodes = [27,32,191];
if (keyCodes.indexOf(e.keyCode) > -1){
let hotkeys = [27,32,191];
if (hotkeys.indexOf(keyCode) > -1){
e.preventDefault();
return true;
}
// Listen for key codes that require ctrl to be held
let keyCodesWithCtrl = [37,38,39,40];
if ((e.ctrlKey || e.metaKey) && keyCodesWithCtrl.indexOf(e.keyCode) > -1){
let hokeys_with_alt = [37,38,39,40];
if (e.altKey && hokeys_with_alt.indexOf(keyCode) > -1){
e.preventDefault();
return true;
}
// Listen for key codes that require ctrl to be held
let keyCodesWithCtrlShift = [70];
if ((e.ctrlKey || e.metaKey) && e.shiftKey && keyCodesWithCtrlShift.indexOf(e.keyCode) > -1){
let hokeys_with_alt_and_shift = [70];
if (e.altKey && e.shiftKey && hokeys_with_alt_and_shift.indexOf(keyCode) > -1){
e.preventDefault();
return true;
}
@ -241,12 +238,12 @@ export class App extends React.Component{
this.shouldTriggerShortcut(e)
}
handleKeyUp(e){
handleKeyUp(e){
if (!this.shouldTriggerShortcut(e)){
return
}
switch(e.keyCode){
switch(e.keyCode || e.which){
case 32: // spacebar
if (e.ctrlKey || e.metaKey){
@ -268,10 +265,10 @@ export class App extends React.Component{
break;
case 40: // down
if ((e.ctrlKey || e.metaKey) && e.shiftKey){
if (e.altKey && e.shiftKey){
this.props.mopidyActions.setMute(true);
this.props.uiActions.createNotification({content: 'volume-off', type: 'shortcut', key: 'shortcut', duration: 1});
} else if (e.ctrlKey){
} else if (e.altKey){
var volume = this.props.volume;
if (volume !== 'false'){
volume -= 5;
@ -288,13 +285,13 @@ export class App extends React.Component{
break;
case 38: // up
if ((e.ctrlKey || e.metaKey) && e.shiftKey){
if (e.altKey && e.shiftKey){
this.props.mopidyActions.setVolume(100)
if (this.props.mute){
this.props.mopidyActions.setMute(false);
}
this.props.uiActions.createNotification({content: 'volume-up', type: 'shortcut', key: 'shortcut', duration: 1});
} else if (e.ctrlKey || e.metaKey){
} else if (e.altKey){
var volume = this.props.volume
if (volume !== 'false'){
volume += 5;
@ -311,32 +308,32 @@ export class App extends React.Component{
break;
case 37: // left
if ((e.ctrlKey || e.metaKey) && e.shiftKey){
if (e.altKey && e.shiftKey){
var new_position = this.props.play_time_position - 30000;
if (new_position < 0){
new_position = 0;;
}
this.props.mopidyActions.seek(new_position);
this.props.mopidyActions.setTimePosition(new_position);
this.props.uiActions.createNotification({content: 'fast-backward', type: 'shortcut', key: 'shortcut', duration: 1});
} else if (e.ctrlKey || e.metaKey){
} else if (e.altKey){
this.props.mopidyActions.previous();
this.props.uiActions.createNotification({content: 'step-backward', type: 'shortcut', key: 'shortcut', duration: 1});
}
break;
case 39: // right
if ((e.ctrlKey || e.metaKey) && e.shiftKey){
this.props.mopidyActions.seek(this.props.play_time_position + 30000);
if (e.altKey && e.shiftKey){
this.props.mopidyActions.setTimePosition(this.props.play_time_position + 30000);
this.props.uiActions.createNotification({content: 'fast-forward', type: 'shortcut', key: 'shortcut', duration: 1});
} else if (e.ctrlKey || e.metaKey){
} else if (e.altKey){
this.props.mopidyActions.next();
this.props.uiActions.createNotification({content: 'step-forward', type: 'shortcut', key: 'shortcut', duration: 1});
}
break;
case 70: // F
if ((e.ctrlKey || e.metaKey) && e.shiftKey){
window.history.push('/modal/kiosk-mode');
if (e.altKey && e.shiftKey){
this.props.history.push('/kiosk-mode');
}
break;
}

4
src/js/components/Icon.js
View File

@ -15,6 +15,10 @@ export default class Icon extends React.Component{
}
render(){
if (!this.props.name || this.props.name === ""){
return null;
}
var className = "icon icon--"+(this.props.type ? this.props.type : 'material');
if (this.props.className){
className += ' '+this.props.className;

2
src/js/components/ListItem.js
View File

@ -88,7 +88,7 @@ export default class ListItem extends React.Component{
if (key_string === 'added_at') return <span>Added <Dater type="ago" data={value} /> ago</span>
if (key_string === 'owner') return <URILink type="user" uri={value.uri}>{value.id}</URILink>
if (key_string === 'popularity') return <Popularity full popularity={value} />
if (key[0] === 'artists') return <ArtistSentence artists={value} />
if (key_string === 'artists') return <ArtistSentence artists={value} />
if (value === true) return <Icon name="check" />
if (typeof(value) === 'number') return <span>{value.toLocaleString()}</span>
return <span>{value}</span>

31
src/js/helpers.js
View File

@ -1271,9 +1271,13 @@ export let sortItems = function (array, property, reverse = false, sort_map = nu
for (var property_element of split){
// Apply sort on a property of the first item of an array
if (property_element == 'first' && Array.isArray(value) && value.length > 0){
value = value[0];
continue;
if (property_element == 'first'){
if (Array.isArray(value) && value.length > 0){
value = value[0];
continue;
} else {
return null;
}
// Just need the length of an array
} else if (property_element == 'length'){
@ -1309,33 +1313,34 @@ export let sortItems = function (array, property, reverse = false, sort_map = nu
// Map sorting
// Use the index of the string as a sorting mechanism
if (sort_map){
var a_index = sort_map.indexOf(a_value+':');
var b_index = sort_map.indexOf(b_value+':');
if (a_index < b_index) return 1;
if (a_index > b_index) return -1;
// Boolean sorting
} else if (typeof(a_value) === 'boolean'){
} else if (typeof a_value == 'boolean' && typeof b_value == 'boolean'){
if (a_value && !b_value) return -1;
if (!a_value && b_value) return 1;
return 0
// Alphabetic sorting
} else if (typeof(a_value) === 'string'){
if (!a_value || !b_value ) return 0;
if (a_value.toLowerCase() > b_value.toLowerCase()) return 1;
if (a_value.toLowerCase() < b_value.toLowerCase()) return -1;
return 0
// Numeric sorting
} else {
} else if (typeof a_value == 'number' && typeof b_value == 'number'){
if (a_value == null && b_value == null) return 0;
if (a_value == null) return -1;
if (b_value == null) return 1;
if (parseInt(a_value) > parseInt(b_value)) return 1;
if (parseInt(a_value) < parseInt(b_value)) return -1;
return 0
// Alphabetic sorting
} else {
if (a_value && !b_value ) return -1;
if (!a_value && b_value ) return 1;
if (!a_value && !b_value ) return 0;
if (a_value.toLowerCase() > b_value.toLowerCase()) return 1;
if (a_value.toLowerCase() < b_value.toLowerCase()) return -1;
return 0
}
}

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

@ -322,9 +322,8 @@ export function getImages(context, uri){
.then(
response => {
if (response.album){
record = Object.assign({}, record, {images: response.album.image});
dispatch(coreActions.trackLoaded(record));
dispatch(coreActions.albumLoaded(response.album));
let images = helpers.formatImages(response.album.image);
dispatch(coreActions.trackLoaded({uri: uri, images: images}));
}
}
);

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

@ -126,7 +126,7 @@ const PusherMiddleware = (function(){
break;
case 'local_scan_error':
store.dispatch(uiActions.processFinished('local_scan'));
store.dispatch(uiActions.createNotification({key: 'local_scan', type: 'bad', content: 'Local scan failed'}));
store.dispatch(uiActions.createNotification({type: 'bad', content: message.params.message, description: message.params.description}));
break;
// Upgrade
@ -138,7 +138,7 @@ const PusherMiddleware = (function(){
break;
case 'upgrade_error':
store.dispatch(uiActions.processFinished('upgrade'));
store.dispatch(uiActions.createNotification({type: 'bad', content: 'Upgrade failed'}));
store.dispatch(uiActions.createNotification({type: 'bad', content: message.params.message, description: message.params.description}));
break;
// Restart
@ -146,6 +146,10 @@ const PusherMiddleware = (function(){
store.dispatch(uiActions.processFinished('upgrade'));
store.dispatch(uiActions.createNotification({type: 'info', content: 'Restarting server...'}));
break;
case 'restart_error':
store.dispatch(uiActions.processFinished('upgrade'));
store.dispatch(uiActions.createNotification({type: 'bad', content: message.params.message, description: message.params.description}));
break;
// Test
case 'test_started':
@ -157,7 +161,7 @@ const PusherMiddleware = (function(){
break;
case 'test_error':
store.dispatch(uiActions.processFinished('test'));
store.dispatch(uiActions.createNotification({type: 'bad', content: 'Test failed'}));
store.dispatch(uiActions.createNotification({type: 'bad', content: message.params.message, description: message.params.description}));
break;
}

19
src/js/views/Playlist.js
View File

@ -178,7 +178,6 @@ class Playlist extends React.Component{
}
render(){
var scheme = helpers.uriSource(this.props.uri);
var playlist_id = helpers.getFromUri('playlistid',this.props.uri);
if (!this.props.playlist){
@ -204,7 +203,7 @@ class Playlist extends React.Component{
context = 'editable-playlist';
}
if (!playlist.tracks_uris || (playlist.tracks_uris && !playlist.tracks) || (playlist.tracks_uris.length !== playlist.tracks.length)){
if (playlist.tracks_total !== 0 && (!playlist.tracks_uris || (playlist.tracks_uris && !playlist.tracks) || (playlist.tracks_uris.length !== playlist.tracks.length))){
var is_loading_tracks = true;
} else {
var is_loading_tracks = false;
@ -226,8 +225,8 @@ class Playlist extends React.Component{
<ul className="details">
{!this.props.slim_mode ? <li className="source"><Icon type="fontawesome" name={helpers.sourceIcon(playlist.uri)} /></li> : null }
{playlist.user_uri ? <li><URILink type="user" uri={playlist.user_uri}>{playlist.user ? playlist.user.name : helpers.getFromUri('userid',playlist.user_uri)}</URILink></li> : null }
{playlist.tracks ? <li>{playlist.tracks_total ? playlist.tracks_total : '0'} tracks</li> : null }
{!this.props.slim_mode && playlist.tracks ? <li><Dater type="total-time" data={playlist.tracks} /></li> : null }
<li>{playlist.tracks_total ? playlist.tracks_total : '0'} tracks</li>
{!this.props.slim_mode && playlist.tracks && playlist.tracks_total > 0 ? <li><Dater type="total-time" data={playlist.tracks} /></li> : null }
{!this.props.slim_mode && playlist.followers !== undefined ? <li><NiceNumber value={playlist.followers} /> followers</li> : null }
{!this.props.slim_mode && playlist.last_modified_date ? <li>Edited <Dater type="ago" data={playlist.last_modified_date} /></li> : null }
</ul>
@ -257,10 +256,16 @@ class Playlist extends React.Component{
const mapStateToProps = (state, ownProps) => {
// Decode the URI, and then re-encode all the spaces
// This is needed as Mopidy encodes spaces in playlist URIs (but not other characters)
// Decode the URI, and then re-encode selected characters
// This is needed as Mopidy encodes *some* characters in playlist URIs (but not other characters)
// We need to retain ":" because this a reserved URI separator
var uri = decodeURIComponent(ownProps.match.params.uri);
uri = uri.replace(/\s/g, '%20');
uri = uri.replace(/\s/g, '%20'); // space
uri = uri.replace(/\[/g, '%5B'); // [
uri = uri.replace(/\]/g, '%5D'); // ]
uri = uri.replace(/\(/g, '%28'); // (
uri = uri.replace(/\)/g, '%29'); // )
uri = uri.replace(/\#/g, '%23'); // #
return {
uri: uri,

7
src/js/views/library/LibraryAlbums.js
View File

@ -350,13 +350,6 @@ class LibraryAlbums extends React.Component{
}
}
/**
* Export our component
*
* We also integrate our global store, using connect()
**/
const mapStateToProps = (state, ownProps) => {
return {
mopidy_connected: state.mopidy.connected,

18
src/js/views/modals/EditPlaylist.js
View File

@ -56,6 +56,8 @@ class EditPlaylist extends React.Component{
}
componentWillReceiveProps(nextProps){
// Playlist just loaded
if (!this.props.playlist && nextProps.playlist){
this.setState({
name: nextProps.playlist.name,
@ -63,6 +65,10 @@ class EditPlaylist extends React.Component{
public: (nextProps.playlist.public == true),
collaborative: (nextProps.playlist.collaborative == true)
});
// Mopidy just connected, and we don't have the playlist yet
} else if (this.props.mopidy_connected != nextProps.mopidy_connected && !nextProps.playlist){
this.props.mopidyActions.getPlaylist(this.props.uri);
}
}
@ -205,10 +211,16 @@ class EditPlaylist extends React.Component{
const mapStateToProps = (state, ownProps) => {
// Decode the URI, and then re-encode all the spaces
// This is needed as Mopidy encodes spaces in playlist URIs (but not other characters)
// Decode the URI, and then re-encode selected characters
// This is needed as Mopidy encodes *some* characters in playlist URIs (but not other characters)
// We need to retain ":" because this a reserved URI separator
var uri = decodeURIComponent(ownProps.match.params.uri);
uri = uri.replace(/\s/g, '%20');
uri = uri.replace(/\s/g, '%20'); // space
uri = uri.replace(/\[/g, '%5B'); // [
uri = uri.replace(/\]/g, '%5D'); // ]
uri = uri.replace(/\(/g, '%28'); // (
uri = uri.replace(/\)/g, '%29'); // )
uri = uri.replace(/\#/g, '%23'); // #
return {
uri: uri,