Removing all but Search mopidy_connected checks
This commit is contained in:
@ -52,12 +52,10 @@ class Playlist extends React.Component {
|
||||
componentDidUpdate = ({
|
||||
uri: prevUri,
|
||||
playlist: prevPlaylist,
|
||||
mopidy_connected: prev_mopidy_connected,
|
||||
}) => {
|
||||
const {
|
||||
uri,
|
||||
playlist,
|
||||
mopidy_connected,
|
||||
coreActions: {
|
||||
loadPlaylist,
|
||||
},
|
||||
@ -401,7 +399,6 @@ const mapStateToProps = (state, ownProps) => {
|
||||
me = {},
|
||||
} = {},
|
||||
mopidy: {
|
||||
connected: mopidy_connected,
|
||||
library_playlists: local_library_playlists,
|
||||
} = {},
|
||||
} = state;
|
||||
@ -419,7 +416,6 @@ const mapStateToProps = (state, ownProps) => {
|
||||
playlist: (playlists[uri] !== undefined ? playlists[uri] : false),
|
||||
spotify_library_playlists,
|
||||
local_library_playlists,
|
||||
mopidy_connected,
|
||||
spotify_authorized,
|
||||
spotify_userid: (me && me.id) || null,
|
||||
};
|
||||
|
||||
@ -18,9 +18,8 @@ class QueueHistory extends React.Component {
|
||||
this.loadHistory();
|
||||
}
|
||||
|
||||
componentDidUpdate = ({ mopidy_connected: prev_mopidy_connected }) => {
|
||||
const { mopidy_connected } = this.props;
|
||||
if (!prev_mopidy_connected && mopidy_connected) this.loadHistory();
|
||||
componentDidUpdate = () => {
|
||||
this.loadHistory();
|
||||
}
|
||||
|
||||
loadHistory = () => {
|
||||
@ -82,7 +81,6 @@ class QueueHistory extends React.Component {
|
||||
}
|
||||
|
||||
const mapStateToProps = (state) => ({
|
||||
mopidy_connected: state.mopidy.connected,
|
||||
tracks: (state.core.tracks ? state.core.tracks : {}),
|
||||
queue_history: (state.mopidy.queue_history ? state.mopidy.queue_history : []),
|
||||
});
|
||||
|
||||
@ -52,14 +52,12 @@ class Track extends React.Component {
|
||||
componentDidUpdate = ({
|
||||
uri: prevUri,
|
||||
track: prevTrack,
|
||||
mopidy_connected: prev_mopidy_connected,
|
||||
}) => {
|
||||
const {
|
||||
uri,
|
||||
track,
|
||||
genius_authorized,
|
||||
lastfm_authorized,
|
||||
mopidy_connected,
|
||||
coreActions: {
|
||||
loadTrack,
|
||||
},
|
||||
@ -70,14 +68,13 @@ class Track extends React.Component {
|
||||
getTrack,
|
||||
},
|
||||
} = this.props;
|
||||
// if our URI has changed, fetch new track
|
||||
|
||||
if (prevUri !== uri) {
|
||||
loadTrack(uri);
|
||||
if (genius_authorized && track.artists) findTrackLyrics(track);
|
||||
|
||||
// if mopidy has just connected AND we're not a Spotify track, go get
|
||||
} else if (!prev_mopidy_connected && mopidy_connected) {
|
||||
if (uriSource(uri) !== 'spotify') loadTrack(uri);
|
||||
if (genius_authorized && track.artists) {
|
||||
findTrackLyrics(track);
|
||||
}
|
||||
}
|
||||
|
||||
// We have just received our full track or our track artists
|
||||
@ -370,7 +367,6 @@ const mapStateToProps = (state, ownProps) => {
|
||||
lastfm_authorized: state.lastfm.authorization,
|
||||
spotify_authorized: state.spotify.authorization,
|
||||
genius_authorized: state.genius.authorization,
|
||||
mopidy_connected: state.mopidy.connected,
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -279,7 +279,6 @@ class AddToQueue extends React.Component {
|
||||
}
|
||||
|
||||
const mapStateToProps = (state) => ({
|
||||
mopidy_connected: state.mopidy.connected,
|
||||
albums: state.core.albums,
|
||||
tracks: state.core.tracks,
|
||||
view: state.core.view ? state.core.view : {},
|
||||
|
||||
@ -43,9 +43,7 @@ class EditPlaylist extends React.Component {
|
||||
break;
|
||||
|
||||
default:
|
||||
if (this.props.mopidy_connected) {
|
||||
this.props.mopidyActions.getPlaylist(this.props.uri);
|
||||
}
|
||||
this.props.mopidyActions.getPlaylist(this.props.uri);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -248,7 +246,6 @@ const mapStateToProps = (state, ownProps) => {
|
||||
|
||||
return {
|
||||
uri,
|
||||
mopidy_connected: state.mopidy.connected,
|
||||
playlist: (state.core.playlists[uri] !== undefined ? state.core.playlists[uri] : null),
|
||||
playlists: state.core.playlists,
|
||||
};
|
||||
|
||||
@ -308,7 +308,6 @@ class EditRadio extends React.Component {
|
||||
}
|
||||
|
||||
const mapStateToProps = (state, ownProps) => ({
|
||||
mopidy_connected: state.mopidy.connected,
|
||||
radio: state.core.radio,
|
||||
artists: state.core.artists,
|
||||
tracks: state.core.tracks,
|
||||
|
||||
Reference in New Issue
Block a user