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

Simplifying processes

Browse Source
This commit is contained in:
James Barnsley
2020-10-20 21:34:43 +13:00
parent 870407c168
commit eca594e9e5
13 changed files with 446 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/js/views/library/LibraryAlbums.js
View File

@ -21,6 +21,7 @@ import Loader from '../../components/Loader';
import {
makeLibrarySelector,
makeLoadingSelector,
makeProcessProgressSelector,
} from '../../util/selectors';
class LibraryAlbums extends React.Component {
@ -175,6 +176,7 @@ class LibraryAlbums extends React.Component {
sort_reverse,
view,
loading,
loading_progress,
} = this.props;
const {
limit,
@ -183,7 +185,8 @@ class LibraryAlbums extends React.Component {
let { albums } = this.props;
if (loading) {
return <Loader body loading />;
console.log(loading_progress);
return <Loader body loading progress={loading_progress} />
}
if (sort) {
@ -376,9 +379,15 @@ const mapStateToProps = (state) => {
if (source === 'all' || source === 'spotify') libraryUris.push('spotify:library:albums');
if (source === 'all' || source === 'google') libraryUris.push('google:library:albums');
const librarySelector = makeLibrarySelector(libraryUris);
const processProgressSelector = makeProcessProgressSelector([
'MOPIDY_GET_LIBRARY_ALBUMS',
'SPOTIFY_GET_LIBRARY_ALBUMS',
'GOOGLE_GET_LIBRARY_ALBUMS',
]);
return {
loading: loadingSelector(state),
loading_progress: processProgressSelector(state),
mopidy_uri_schemes: state.mopidy.uri_schemes,
albums: librarySelector(state),
google_available: (state.mopidy.uri_schemes && state.mopidy.uri_schemes.includes('gmusic:')),

10
src/js/views/library/LibraryArtists.js
View File

@ -18,6 +18,7 @@ import Loader from '../../components/Loader';
import {
makeLibrarySelector,
makeLoadingSelector,
makeProcessProgressSelector,
} from '../../util/selectors';
class LibraryArtists extends React.Component {
@ -151,6 +152,7 @@ class LibraryArtists extends React.Component {
sort_reverse,
view,
loading,
loading_progress,
} = this.props;
const {
limit,
@ -159,7 +161,7 @@ class LibraryArtists extends React.Component {
let { artists } = this.props;
if (loading) {
return <Loader body loading />;
return <Loader body loading progress={loading_progress} />
}
if (sort) {
@ -335,8 +337,14 @@ const mapStateToProps = (state) => {
if (source === 'all' || source === 'spotify') libraryUris.push('spotify:library:artists');
if (source === 'all' || source === 'google') libraryUris.push('google:library:artists');
const librarySelector = makeLibrarySelector(libraryUris);
const processProgressSelector = makeProcessProgressSelector([
'MOPIDY_GET_LIBRARY_ARTISTS',
'SPOTIFY_GET_LIBRARY_ARTISTS',
'GOOGLE_GET_LIBRARY_ARTISTS',
]);
return {
loading_progress: processProgressSelector(state),
mopidy_uri_schemes: state.mopidy.uri_schemes,
google_available: (state.mopidy.uri_schemes && state.mopidy.uri_schemes.includes('gmusic:')),
spotify_available: (state.spotify.access_token),