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

Fixing New Releases and Featured loaders; Exploring expensive API calls load on JS thread (eg Tiesto with >300 albums)

Browse Source
This commit is contained in:
James Barnsley
2020-09-17 20:58:30 +12:00
parent 7fde458926
commit 5e019200fd
13 changed files with 155 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/js/services/spotify/actions.js
View File

@ -18,12 +18,10 @@ import {
formatArtist,
formatArtists,
formatAlbums,
formatPlaylists,
formatImages,
formatTrack,
} from '../../util/format';
import URILink from '../../components/URILink';
import { i18n } from '../../locale';
const coreActions = require('../../services/core/actions');
const uiActions = require('../../services/ui/actions');
@ -361,7 +359,7 @@ export function getLibraryTracks() {
};
}
export function getFeaturedPlaylists() {
export function getFeaturedPlaylists(forceRefetch = false) {
return (dispatch, getState) => {
dispatch({ type: 'SPOTIFY_FEATURED_PLAYLISTS_LOADED', data: false });
@ -380,8 +378,13 @@ export function getFeaturedPlaylists() {
if (sec < 10) sec = `0${sec}`;
const timestamp = `${year}-${month}-${day}T${hour}:${min}:${sec}`;
let endpoint = 'browse/featured-playlists?limit=50';
endpoint += `&country=${getState().spotify.country}`;
endpoint += `&locale=${getState().spotify.locale}`;
endpoint += `&timestamp=${timestamp}`;
if (forceRefetch) endpoint += `&refetch=${Date.now()}`;
request(dispatch, getState, `browse/featured-playlists?limit=50&country=${getState().spotify.country}&locale=${getState().spotify.locale}timestamp=${timestamp}`)
request(dispatch, getState, endpoint)
.then(
(response) => {
const playlists = response.playlists.items.map(
@ -432,9 +435,14 @@ export function getCategories() {
};
}
export function getCategory(id) {
export function getCategory(id, forceRefetch = false) {
return (dispatch, getState) => {
request(dispatch, getState, `browse/categories/${id}?country=${getState().spotify.country}&locale=${getState().spotify.locale}`)
let endpoint = `browse/categories/${id}`;
endpoint += `?country=${getState().spotify.country}`;
endpoint += `&locale=${getState().spotify.locale}`;
if (forceRefetch) endpoint += `&refetch=${Date.now()}`;
request(dispatch, getState, endpoint)
.then(
(response) => {
dispatch({
@ -456,9 +464,15 @@ export function getCategory(id) {
};
}
export function getCategoryPlaylists(id) {
export function getCategoryPlaylists(id, forceRefetch = false) {
return (dispatch, getState) => {
request(dispatch, getState, `browse/categories/${id}/playlists?limit=50&country=${getState().spotify.country}&locale=${getState().spotify.locale}`)
let endpoint = `browse/categories/${id}/playlists`;
endpoint += '?limit=50';
endpoint += `&country=${getState().spotify.country}`;
endpoint += `&locale=${getState().spotify.locale}`;
if (forceRefetch) endpoint += `&refetch=${Date.now()}`;
request(dispatch, getState, endpoint)
.then(
(response) => {
dispatch({
@ -477,9 +491,15 @@ export function getCategoryPlaylists(id) {
};
}
export function getNewReleases() {
export function getNewReleases(forceRefetch = false) {
return (dispatch, getState) => {
request(dispatch, getState, `browse/new-releases?country=${getState().spotify.country}&limit=50`)
let endpoint = 'browse/new-releases';
endpoint += '?limit=50';
endpoint += '&offset=0';
endpoint += `&country=${getState().spotify.country}`;
if (forceRefetch) endpoint += `&refetch=${Date.now()}`;
request(dispatch, getState, endpoint)
.then(
(response) => {
dispatch({
@ -1030,7 +1050,9 @@ export function getGenres() {
* */
export function getArtist(uri, { full, forceRefetch }) {
return (dispatch, getState) => {
const endpoint = `artists/${getFromUri('artistid', uri)}${forceRefetch ? `?refetch=${Date.now()}` : ''}`;
let endpoint = `artists/${getFromUri('artistid', uri)}`;
if (forceRefetch) endpoint += `?refetch=${Date.now()}`;
request(dispatch, getState, endpoint, 'GET', false, true)
.then(
(response) => {
@ -1198,7 +1220,9 @@ export function getUserPlaylists(uri) {
* */
export function getAlbum(uri, { full, forceRefetch }) {
return (dispatch, getState) => {
const endpoint = `albums/${getFromUri('albumid', uri)}${forceRefetch ? `?refetch=${Date.now()}` : ''}`;
let endpoint = `albums/${getFromUri('albumid', uri)}`;
if (forceRefetch) endpoint += `?refetch=${Date.now()}`;
request(dispatch, getState, endpoint)
.then(
(response) => {
@ -1345,7 +1369,10 @@ export function savePlaylist(uri, name, description, is_public, is_collaborative
export function getPlaylist(uri, { full, forceRefetch, callbackAction }) {
return (dispatch, getState) => {
const endpoint = `playlists/${getFromUri('playlistid', uri)}?market=${getState().spotify.country}${forceRefetch ? `&refetch=${Date.now()}` : ''}`;
let endpoint = `playlists/${getFromUri('playlistid', uri)}`;
endpoint += `?market=${getState().spotify.country}`;
if (forceRefetch) endpoint += `&refetch=${Date.now()}`;
request(dispatch, getState, endpoint)
.then(
(response) => {

25
src/js/services/spotify/middleware.js
View File

@ -8,6 +8,7 @@ import {
formatTracks,
formatImages,
formatUser,
formatAlbums,
} from '../../util/format';
const coreActions = require('../core/actions');
const uiActions = require('../ui/actions');
@ -106,22 +107,20 @@ const SpotifyMiddleware = (function () {
store.dispatch(spotifyActions.savePlaylist(action.key, action.name, action.description, action.is_public, action.is_collaborative, action.image));
break;
case 'SPOTIFY_NEW_RELEASES_LOADED':
store.dispatch({
type: 'ALBUMS_LOADED',
albums: action.data.albums.items,
case 'SPOTIFY_NEW_RELEASES_LOADED': {
const albums = formatAlbums(action.data.albums.items);
store.dispatch(coreActions.itemsLoaded(albums));
next({
...action,
uris: arrayOf('uri', albums),
more: action.data.albums.next,
total: action.data.albums.total,
});
// Collate result into the three key values we want
action.uris = arrayOf('uri', action.data.albums.items);
action.more = action.data.albums.next;
action.total = action.data.albums.total;
// And pass on to our reducer
next(action);
break;
}
// TODO: This can go
// TODO: This can go
case 'SPOTIFY_ARTIST_ALBUMS_LOADED':
store.dispatch(coreActions.albumsLoaded(action.data.items));
store.dispatch({