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

Local playlists and uri encoding

Browse Source
This commit is contained in:
James Barnsley
2019-01-30 21:30:26 +13:00
parent fb9cea5cde
commit c370ae1699
7 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mopidy_iris/static/app.js
View File

@ -57691,8 +57691,14 @@ var CoreMiddleware = function () {
}
}
// Already have this playlist partially in our index
if (playlists_index[playlist.uri]) {
playlist = Object.assign({}, playlists_index[playlist.uri], playlist);
// Setup placeholder tracks_uris
if (playlist.tracks_uris === undefined) {
playlist.tracks_uris = [];
}
}
// Load our tracks
@ -61079,7 +61085,7 @@ var MopidyMiddleware = function () {
is_completely_loaded: true,
provider: 'mopidy',
tracks: response.tracks ? response.tracks : [],
tracks_total: response.tracks ? response.tracks.length : []
tracks_total: response.tracks ? response.tracks.length : 0
});
// tracks? get the full track objects
@ -74981,8 +74987,10 @@ var Playlist = function (_React$Component) {
_react2.default.createElement(
'li',
null,
playlist.tracks_total ? playlist.tracks_total : playlist.tracks ? playlist.tracks.length : '0',
' tracks,\xA0',
playlist.tracks_total ? playlist.tracks_total : '0',
' tracks',
playlist.tracks_total && playlist.tracks_total > 0 ? ',' : null,
'\xA0',
_react2.default.createElement(_Dater2.default, { type: 'total-time', data: playlist.tracks })
),
!this.props.slim_mode && playlist.followers !== undefined ? _react2.default.createElement(
@ -75040,7 +75048,12 @@ var Playlist = function (_React$Component) {
}(_react2.default.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)
var uri = decodeURIComponent(ownProps.match.params.uri);
uri = uri.replace(/\s/g, '%20');
return {
uri: uri,
allow_reporting: state.ui.allow_reporting,
@ -89627,7 +89640,12 @@ var EditPlaylist = function (_React$Component) {
}(_react2.default.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)
var uri = decodeURIComponent(ownProps.match.params.uri);
uri = uri.replace(/\s/g, '%20');
return {
uri: uri,
mopidy_connected: state.mopidy.connected,

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

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/index.html
View File

@ -98,7 +98,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1548829761";
var build = "1548834862";
var version = "3.32.1";
// Construct the script tag

6
src/js/services/core/middleware.js
View File

@ -696,8 +696,14 @@ const CoreMiddleware = (function(){
}
}
// Already have this playlist partially in our index
if (playlists_index[playlist.uri]){
playlist = Object.assign({}, playlists_index[playlist.uri], playlist);
// Setup placeholder tracks_uris
if (playlist.tracks_uris === undefined){
playlist.tracks_uris = [];
}
}
// Load our tracks

2
src/js/services/mopidy/middleware.js
View File

@ -1546,7 +1546,7 @@ const MopidyMiddleware = (function(){
is_completely_loaded: true,
provider: 'mopidy',
tracks: (response.tracks ? response.tracks : []),
tracks_total: (response.tracks ? response.tracks.length : [])
tracks_total: (response.tracks ? response.tracks.length : 0)
}
)

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

@ -219,7 +219,7 @@ class Playlist extends React.Component{
<ul className="details">
{!this.props.slim_mode ? <li><Icon type="fontawesome" name={helpers.sourceIcon(playlist.uri)} /></li> : null }
<li>
{playlist.tracks_total ? playlist.tracks_total : (playlist.tracks ? playlist.tracks.length : '0')} tracks,&nbsp;
{playlist.tracks_total ? playlist.tracks_total : '0'} tracks{playlist.tracks_total && playlist.tracks_total > 0 ? ',' : null}&nbsp;
<Dater type="total-time" data={playlist.tracks} />
</li>
{!this.props.slim_mode && playlist.followers !== undefined ? <li>{playlist.followers.toLocaleString()} followers</li> : null }
@ -251,7 +251,12 @@ 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)
var uri = decodeURIComponent(ownProps.match.params.uri);
uri = uri.replace(/\s/g, '%20');
return {
uri: uri,
allow_reporting: state.ui.allow_reporting,

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

@ -204,7 +204,12 @@ 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)
var uri = decodeURIComponent(ownProps.match.params.uri);
uri = uri.replace(/\s/g, '%20');
return {
uri: uri,
mopidy_connected: state.mopidy.connected,