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

Track loading of lyrics; Version bump

Browse Source
This commit is contained in:
James Barnsley
2018-09-20 16:29:16 +12:00
parent cc71f2b113
commit 98c47ef535
13 changed files with 14053 additions and 10744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,13 +219,13 @@ class Playlist extends React.Component{
</ul>
</div>
{ this.renderActions() }
{this.renderActions()}
<section className="list-wrapper">
<TrackList uri={playlist.uri} className="playlist-track-list" context={context} tracks={playlist.tracks} removeTracks={ tracks_indexes => this.removeTracks(tracks_indexes) } reorderTracks={ (indexes, index) => this.reorderTracks(indexes, index) } />
<LazyLoadListener
loadKey={playlist.tracks_more}
showLoader={is_loading_tracks}
showLoader={is_loading_tracks || playlist.tracks_more}
loadMore={() => this.loadMore()}
/>
</section>

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

@ -34,6 +34,15 @@ class Track extends React.Component{
componentDidMount(){
this.props.coreActions.loadTrack(this.props.params.uri);
// We already have the track in our index, so it won't fire componentWillReceiveProps
if (this.props.track){
this.setWindowTitle(this.props.track);
if (this.props.track.artists && !this.props.track.lyrics_results){
this.props.geniusActions.findTrackLyrics(this.props.track);
}
}
}
handleContextMenu(e){
@ -48,8 +57,8 @@ class Track extends React.Component{
if (nextProps.params.uri != this.props.params.uri){
this.props.coreActions.loadTrack(nextProps.params.uri);
if (this.props.tracks.artists){
this.props.geniusActions.findTrackLyrics(this.props.track);
if (nextProps.tracks.artists){
this.props.geniusActions.findTrackLyrics(nextProps.track);
}
// if mopidy has just connected AND we're not a Spotify track, go get
@ -59,10 +68,10 @@ class Track extends React.Component{
}
}
// We have just received our full track info (with artists)
if (!this.props.track.artists && nextProps.track.artists){
// We have just received our full track or our track artists
if ((!this.props.track && nextProps.track) || (!this.props.track.artists && nextProps.track.artists)){
this.props.uiActions.setWindowTitle(nextProps.track);
this.setWindowTitle(nextProps.track);
// Ready to load LastFM
if (nextProps.lastfm_authorized){