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

Local assets

Browse Source
This commit is contained in:
James Barnsley
2017-01-15 21:06:24 +13:00
parent 8b15e024cd
commit 838255b34b
9 changed files with 120 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/js/views/library/LibraryLocalAlbums.js
View File

@ -15,7 +15,6 @@ class LibraryLocalAlbums extends React.Component{
super(props);
}
// on render
componentDidMount(){
this.loadAlbums()
}
@ -33,13 +32,21 @@ class LibraryLocalAlbums extends React.Component{
}
render(){
if( !this.props.albums ) return null
var albums = []
if (this.props.albums && this.props.local_albums){
for (var i = 0; i < this.props.local_albums.length; i++){
var uri = this.props.local_albums[i]
if (this.props.albums.hasOwnProperty(uri)){
albums.push(this.props.albums[uri])
}
}
}
return (
<div className="view library-local-view">
<Header icon="music" title="Local albums" />
<div>
<List columns={[{ name: 'name', width: '100'}]} rows={this.props.albums} link_prefix={global.baseURL+"album/"} />
<List columns={[{ name: 'name', width: '100'}]} rows={albums} link_prefix={global.baseURL+"album/"} />
</div>
</div>
);
@ -56,7 +63,8 @@ class LibraryLocalAlbums extends React.Component{
const mapStateToProps = (state, ownProps) => {
return {
mopidy_connected: state.mopidy.connected,
albums: state.mopidy.albums
local_albums: state.ui.local_albums,
albums: state.ui.albums
}
}

17
src/js/views/library/LibraryLocalArtists.js
View File

@ -27,19 +27,27 @@ class LibraryLocalArtists extends React.Component{
}
loadArtists(props = this.props){
if( props.mopidy_connected ){
if( props.mopidy_connected && !props.local_artists ){
this.props.mopidyActions.getArtists();
}
}
render(){
if( !this.props.artists ) return null
var artists = []
if (this.props.artists && this.props.local_artists){
for (var i = 0; i < this.props.local_artists.length; i++){
var uri = this.props.local_artists[i]
if (this.props.artists.hasOwnProperty(uri)){
artists.push(this.props.artists[uri])
}
}
}
return (
<div className="view library-local-view">
<Header icon="music" title="Local artists" />
<section className="list-wrapper">
<List columns={[{ name: 'name', width: '100'}]} rows={this.props.artists} link_prefix={global.baseURL+"artist/"} />
<List columns={[{ name: 'name', width: '100'}]} rows={artists} link_prefix={global.baseURL+"artist/"} />
</section>
</div>
);
@ -56,7 +64,8 @@ class LibraryLocalArtists extends React.Component{
const mapStateToProps = (state, ownProps) => {
return {
mopidy_connected: state.mopidy.connected,
artists: state.mopidy.artists
local_artists: state.ui.local_artists,
artists: state.ui.artists
}
}