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

Resolving track overwrite issue; Repairing queue images; Next is formatImages()

Browse Source
This commit is contained in:
James Barnsley
2018-09-08 21:16:18 +12:00
parent b7914e6c66
commit 1114b9031f
8 changed files with 10688 additions and 14008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/js/views/Track.js
View File

@ -33,7 +33,7 @@ class Track extends React.Component{
}
componentDidMount(){
this.loadTrack();
this.props.coreActions.loadTrack(this.props.params.uri);
}
handleContextMenu(e){
@ -46,12 +46,12 @@ class Track extends React.Component{
// if our URI has changed, fetch new track
if (nextProps.params.uri != this.props.params.uri){
this.loadTrack(nextProps)
this.props.coreActions.loadTrack(nextProps.params.uri);
// if mopidy has just connected AND we're not a Spotify track, go get
} else if (!this.props.mopidy_connected && nextProps.mopidy_connected){
if (helpers.uriSource(this.props.params.uri) != 'spotify'){
this.loadTrack(nextProps);
this.props.coreActions.loadTrack(nextProps.params.uri);
}
}
@ -101,48 +101,6 @@ class Track extends React.Component{
this.props.uiActions.showContextMenu(data)
}
/**
* TODO: Identify why images being loaded breaks the thumbnail. Is there a new image array format
* we need to accommodate?
**/
loadTrack(props = this.props){
switch (helpers.uriSource(props.params.uri)){
case 'spotify':
if (props.track){
console.info('Loading track from index');
} else {
this.props.spotifyActions.getTrack(props.params.uri);
this.props.spotifyActions.following(props.params.uri);
}
break;
default:
if (props.mopidy_connected){
if (props.track){
console.info('Loading track from index');
} else {
this.props.mopidyActions.getTrack(props.params.uri );
}
}
break;
}
// We have artist info already
if (props.track && props.track.artists){
// Get the LastFM version of this track (provided we have artist info)
if (props.lastfm_authorized){
this.props.lastfmActions.getTrack(props.track.uri);
}
// Ready for lyrics
if (props.track && !props.track.lyrics_results){
this.props.geniusActions.findTrackLyrics(props.track);
}
}
}
play(){
this.props.mopidyActions.playURIs([this.props.params.uri], this.props.params.uri)
}
@ -226,7 +184,7 @@ class Track extends React.Component{
if (!this.props.track){
return null
} else {
var track = this.props.track
var track = this.props.track;
}
return (
@ -268,7 +226,7 @@ class Track extends React.Component{
<div className="actions">
<button className="primary" onClick={e => this.play()}>Play</button>
<LastfmLoveButton uri={this.props.params.uri} artist={this.props.track.artists[0].name} track={this.props.track.name} addText="Love" removeText="Unlove" is_loved={this.props.track.userloved} />
<LastfmLoveButton uri={this.props.params.uri} artist={(this.props.track.artists ? this.props.track.artists[0].name : null)} track={this.props.track.name} addText="Love" removeText="Unlove" is_loved={this.props.track.userloved} />
<ContextMenuTrigger onTrigger={e => this.handleContextMenu(e)} />
</div>