Fixing New Releases and Featured loaders; Exploring expensive API calls load on JS thread (eg Tiesto with >300 albums)
This commit is contained in:
James Barnsley
@ -101147,9 +101147,7 @@ var Sidebar = /*#__PURE__*/function (_React$Component) {
|
||||
"data-qa-file": "Sidebar"
|
||||
}, !mopidy_connected && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_locale__WEBPACK_IMPORTED_MODULE_10__["I18n"], {
|
||||
path: "sidebar.not_connected",
|
||||
params: {
|
||||
name: Object(_locale__WEBPACK_IMPORTED_MODULE_10__["i18n"])('services.mopidy.title')
|
||||
},
|
||||
name: Object(_locale__WEBPACK_IMPORTED_MODULE_10__["i18n"])('services.mopidy.title'),
|
||||
contentAfter: true,
|
||||
"data-qa-node": "I18n",
|
||||
"data-qa-file": "Sidebar"
|
||||
@ -101158,9 +101156,7 @@ var Sidebar = /*#__PURE__*/function (_React$Component) {
|
||||
"data-qa-file": "Sidebar"
|
||||
})), !pusher_connected && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_locale__WEBPACK_IMPORTED_MODULE_10__["I18n"], {
|
||||
path: "sidebar.not_connected",
|
||||
params: {
|
||||
name: Object(_locale__WEBPACK_IMPORTED_MODULE_10__["i18n"])('services.pusher.title')
|
||||
},
|
||||
name: Object(_locale__WEBPACK_IMPORTED_MODULE_10__["i18n"])('services.pusher.title'),
|
||||
contentAfter: true,
|
||||
"data-qa-node": "I18n",
|
||||
"data-qa-file": "Sidebar"
|
||||
@ -101169,9 +101165,7 @@ var Sidebar = /*#__PURE__*/function (_React$Component) {
|
||||
"data-qa-file": "Sidebar"
|
||||
})), !snapcast_connected && snapcast_enabled && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_locale__WEBPACK_IMPORTED_MODULE_10__["I18n"], {
|
||||
path: "sidebar.not_connected",
|
||||
params: {
|
||||
name: Object(_locale__WEBPACK_IMPORTED_MODULE_10__["i18n"])('services.snapcast.title')
|
||||
},
|
||||
name: Object(_locale__WEBPACK_IMPORTED_MODULE_10__["i18n"])('services.snapcast.title'),
|
||||
contentAfter: true,
|
||||
"data-qa-node": "I18n",
|
||||
"data-qa-file": "Sidebar"
|
||||
@ -112526,7 +112520,6 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var _util_helpers__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../util/helpers */ "./src/js/util/helpers.js");
|
||||
/* harmony import */ var _util_format__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../util/format */ "./src/js/util/format.js");
|
||||
/* harmony import */ var _components_URILink__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../components/URILink */ "./src/js/components/URILink.js");
|
||||
/* harmony import */ var _locale__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../locale */ "./src/js/locale/index.js");
|
||||
function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
|
||||
|
||||
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
||||
@ -112553,7 +112546,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
||||
|
||||
|
||||
|
||||
|
||||
var coreActions = __webpack_require__(/*! ../../services/core/actions */ "./src/js/services/core/actions.js");
|
||||
|
||||
var uiActions = __webpack_require__(/*! ../../services/ui/actions */ "./src/js/services/ui/actions.js");
|
||||
@ -112846,6 +112838,7 @@ function getLibraryTracks() {
|
||||
};
|
||||
}
|
||||
function getFeaturedPlaylists() {
|
||||
var forceRefetch = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
||||
return function (dispatch, getState) {
|
||||
dispatch({
|
||||
type: 'SPOTIFY_FEATURED_PLAYLISTS_LOADED',
|
||||
@ -112865,7 +112858,12 @@ function getFeaturedPlaylists() {
|
||||
var sec = date.getSeconds();
|
||||
if (sec < 10) sec = "0".concat(sec);
|
||||
var timestamp = "".concat(year, "-").concat(month, "-").concat(day, "T").concat(hour, ":").concat(min, ":").concat(sec);
|
||||
request(dispatch, getState, "browse/featured-playlists?limit=50&country=".concat(getState().spotify.country, "&locale=").concat(getState().spotify.locale, "timestamp=").concat(timestamp)).then(function (response) {
|
||||
var endpoint = 'browse/featured-playlists?limit=50';
|
||||
endpoint += "&country=".concat(getState().spotify.country);
|
||||
endpoint += "&locale=".concat(getState().spotify.locale);
|
||||
endpoint += "×tamp=".concat(timestamp);
|
||||
if (forceRefetch) endpoint += "&refetch=".concat(Date.now());
|
||||
request(dispatch, getState, endpoint).then(function (response) {
|
||||
var playlists = response.playlists.items.map(function (raw_playlist) {
|
||||
var playlist = Object(_util_format__WEBPACK_IMPORTED_MODULE_3__["formatPlaylist"])(raw_playlist);
|
||||
delete playlist.tracks; // Don't overwrite (we may already have loaded these)
|
||||
@ -112898,8 +112896,13 @@ function getCategories() {
|
||||
};
|
||||
}
|
||||
function getCategory(id) {
|
||||
var forceRefetch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
||||
return function (dispatch, getState) {
|
||||
request(dispatch, getState, "browse/categories/".concat(id, "?country=").concat(getState().spotify.country, "&locale=").concat(getState().spotify.locale)).then(function (response) {
|
||||
var endpoint = "browse/categories/".concat(id);
|
||||
endpoint += "?country=".concat(getState().spotify.country);
|
||||
endpoint += "&locale=".concat(getState().spotify.locale);
|
||||
if (forceRefetch) endpoint += "&refetch=".concat(Date.now());
|
||||
request(dispatch, getState, endpoint).then(function (response) {
|
||||
dispatch({
|
||||
type: 'SPOTIFY_CATEGORY_LOADED',
|
||||
category: _objectSpread({
|
||||
@ -112913,8 +112916,14 @@ function getCategory(id) {
|
||||
};
|
||||
}
|
||||
function getCategoryPlaylists(id) {
|
||||
var forceRefetch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
||||
return function (dispatch, getState) {
|
||||
request(dispatch, getState, "browse/categories/".concat(id, "/playlists?limit=50&country=").concat(getState().spotify.country, "&locale=").concat(getState().spotify.locale)).then(function (response) {
|
||||
var endpoint = "browse/categories/".concat(id, "/playlists");
|
||||
endpoint += '?limit=50';
|
||||
endpoint += "&country=".concat(getState().spotify.country);
|
||||
endpoint += "&locale=".concat(getState().spotify.locale);
|
||||
if (forceRefetch) endpoint += "&refetch=".concat(Date.now());
|
||||
request(dispatch, getState, endpoint).then(function (response) {
|
||||
dispatch({
|
||||
type: 'SPOTIFY_CATEGORY_PLAYLISTS_LOADED',
|
||||
uri: "category:".concat(id),
|
||||
@ -112926,8 +112935,14 @@ function getCategoryPlaylists(id) {
|
||||
};
|
||||
}
|
||||
function getNewReleases() {
|
||||
var forceRefetch = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
||||
return function (dispatch, getState) {
|
||||
request(dispatch, getState, "browse/new-releases?country=".concat(getState().spotify.country, "&limit=50")).then(function (response) {
|
||||
var endpoint = 'browse/new-releases';
|
||||
endpoint += '?limit=50';
|
||||
endpoint += '&offset=0';
|
||||
endpoint += "&country=".concat(getState().spotify.country);
|
||||
if (forceRefetch) endpoint += "&refetch=".concat(Date.now());
|
||||
request(dispatch, getState, endpoint).then(function (response) {
|
||||
dispatch({
|
||||
type: 'SPOTIFY_NEW_RELEASES_LOADED',
|
||||
data: response
|
||||
@ -113444,7 +113459,8 @@ function getArtist(uri, _ref) {
|
||||
var full = _ref.full,
|
||||
forceRefetch = _ref.forceRefetch;
|
||||
return function (dispatch, getState) {
|
||||
var endpoint = "artists/".concat(Object(_util_helpers__WEBPACK_IMPORTED_MODULE_2__["getFromUri"])('artistid', uri)).concat(forceRefetch ? "?refetch=".concat(Date.now()) : '');
|
||||
var endpoint = "artists/".concat(Object(_util_helpers__WEBPACK_IMPORTED_MODULE_2__["getFromUri"])('artistid', uri));
|
||||
if (forceRefetch) endpoint += "?refetch=".concat(Date.now());
|
||||
request(dispatch, getState, endpoint, 'GET', false, true).then(function (response) {
|
||||
var artist = Object(_util_format__WEBPACK_IMPORTED_MODULE_3__["formatArtist"])(response);
|
||||
dispatch(coreActions.itemLoaded(artist));
|
||||
@ -113584,7 +113600,8 @@ function getAlbum(uri, _ref2) {
|
||||
var full = _ref2.full,
|
||||
forceRefetch = _ref2.forceRefetch;
|
||||
return function (dispatch, getState) {
|
||||
var endpoint = "albums/".concat(Object(_util_helpers__WEBPACK_IMPORTED_MODULE_2__["getFromUri"])('albumid', uri)).concat(forceRefetch ? "?refetch=".concat(Date.now()) : '');
|
||||
var endpoint = "albums/".concat(Object(_util_helpers__WEBPACK_IMPORTED_MODULE_2__["getFromUri"])('albumid', uri));
|
||||
if (forceRefetch) endpoint += "?refetch=".concat(Date.now());
|
||||
request(dispatch, getState, endpoint).then(function (response) {
|
||||
dispatch(coreActions.itemLoaded(_objectSpread({}, Object(_util_format__WEBPACK_IMPORTED_MODULE_3__["formatAlbum"])(response))));
|
||||
|
||||
@ -113697,7 +113714,9 @@ function getPlaylist(uri, _ref3) {
|
||||
forceRefetch = _ref3.forceRefetch,
|
||||
callbackAction = _ref3.callbackAction;
|
||||
return function (dispatch, getState) {
|
||||
var endpoint = "playlists/".concat(Object(_util_helpers__WEBPACK_IMPORTED_MODULE_2__["getFromUri"])('playlistid', uri), "?market=").concat(getState().spotify.country).concat(forceRefetch ? "&refetch=".concat(Date.now()) : '');
|
||||
var endpoint = "playlists/".concat(Object(_util_helpers__WEBPACK_IMPORTED_MODULE_2__["getFromUri"])('playlistid', uri));
|
||||
endpoint += "?market=".concat(getState().spotify.country);
|
||||
if (forceRefetch) endpoint += "&refetch=".concat(Date.now());
|
||||
request(dispatch, getState, endpoint).then(function (response) {
|
||||
var tracks = Object(_util_format__WEBPACK_IMPORTED_MODULE_3__["formatTracks"])(response.tracks.items); // convert links in description
|
||||
|
||||
@ -114230,17 +114249,17 @@ var SpotifyMiddleware = function () {
|
||||
break;
|
||||
|
||||
case 'SPOTIFY_NEW_RELEASES_LOADED':
|
||||
store.dispatch({
|
||||
type: 'ALBUMS_LOADED',
|
||||
albums: action.data.albums.items
|
||||
}); // Collate result into the three key values we want
|
||||
{
|
||||
var _albums = Object(_util_format__WEBPACK_IMPORTED_MODULE_4__["formatAlbums"])(action.data.albums.items);
|
||||
|
||||
action.uris = Object(_util_arrays__WEBPACK_IMPORTED_MODULE_2__["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;
|
||||
store.dispatch(coreActions.itemsLoaded(_albums));
|
||||
next(_objectSpread(_objectSpread({}, action), {}, {
|
||||
uris: Object(_util_arrays__WEBPACK_IMPORTED_MODULE_2__["arrayOf"])('uri', _albums),
|
||||
more: action.data.albums.next,
|
||||
total: action.data.albums.total
|
||||
}));
|
||||
break;
|
||||
}
|
||||
// TODO: This can go
|
||||
|
||||
case 'SPOTIFY_ARTIST_ALBUMS_LOADED':
|
||||
@ -117749,6 +117768,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "iconFromKeyword", function() { return iconFromKeyword; });
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "decodeMopidyUri", function() { return decodeMopidyUri; });
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "encodeMopidyUri", function() { return encodeMopidyUri; });
|
||||
/* harmony import */ var _arrays__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./arrays */ "./src/js/util/arrays.js");
|
||||
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
||||
|
||||
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
||||
@ -117763,12 +117783,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
||||
|
||||
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
||||
|
||||
|
||||
/**
|
||||
* Returns a function, that, as long as it continues to be invoked, will not
|
||||
* be triggered. The function will be called after it stops being called for
|
||||
* N milliseconds. If `immediate` is passed, trigger the function on the
|
||||
* leading edge, instead of the trailing.
|
||||
* */
|
||||
|
||||
var debounce = function debounce(fn, wait, immediate) {
|
||||
var timeout;
|
||||
return function () {
|
||||
@ -118174,7 +118196,7 @@ var isLoading = function isLoading() {
|
||||
var load_queue = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
||||
var keys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
||||
if (!load_queue || !keys) return false;
|
||||
var queue_keys = Object.keys(load_queue);
|
||||
var queue_keys = Object(_arrays__WEBPACK_IMPORTED_MODULE_0__["indexToArray"])(load_queue);
|
||||
var matches = keys.reduce(function (acc, key) {
|
||||
var regex = '';
|
||||
|
||||
@ -119827,8 +119849,11 @@ var Artist = /*#__PURE__*/function (_React$Component) {
|
||||
_createClass(Artist, [{
|
||||
key: "componentDidMount",
|
||||
value: function componentDidMount() {
|
||||
var _this$props8 = this.props,
|
||||
uri = _this$props8.uri,
|
||||
loadItem = _this$props8.coreActions.loadItem;
|
||||
this.setWindowTitle();
|
||||
this.props.coreActions.loadItem(this.props.uri, {
|
||||
loadItem(uri, {
|
||||
full: true
|
||||
});
|
||||
}
|
||||
@ -121019,7 +121044,7 @@ var Playlist = /*#__PURE__*/function (_React$Component) {
|
||||
var playlist_id = Object(_util_helpers__WEBPACK_IMPORTED_MODULE_20__["getFromUri"])('playlistid', uri);
|
||||
|
||||
if (!playlist) {
|
||||
if (Object(_util_helpers__WEBPACK_IMPORTED_MODULE_20__["isLoading"])(load_queue, ["(.*)".concat(playlist_id)])) {
|
||||
if (Object(_util_helpers__WEBPACK_IMPORTED_MODULE_20__["isLoading"])(load_queue, ["(.*)".concat(playlist_id, "(.*)")])) {
|
||||
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_12__["default"], {
|
||||
body: true,
|
||||
loading: true,
|
||||
@ -121133,7 +121158,7 @@ var Playlist = /*#__PURE__*/function (_React$Component) {
|
||||
date: Object(_components_Dater__WEBPACK_IMPORTED_MODULE_9__["dater"])('ago', playlist.last_modified_date),
|
||||
"data-qa-node": "I18n",
|
||||
"data-qa-file": "Playlist"
|
||||
})))), _this.renderActions(), Object(_util_helpers__WEBPACK_IMPORTED_MODULE_20__["isLoading"])(load_queue, ["(.*)".concat(playlist_id, "/tracks")]) ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_12__["default"], {
|
||||
})))), _this.renderActions(), Object(_util_helpers__WEBPACK_IMPORTED_MODULE_20__["isLoading"])(load_queue, ["(.*)".concat(playlist_id, "/tracks(.*)")]) ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Loader__WEBPACK_IMPORTED_MODULE_12__["default"], {
|
||||
body: true,
|
||||
loading: true,
|
||||
"data-qa-node": "Loader",
|
||||
@ -124988,7 +125013,7 @@ var DiscoverFeatured = /*#__PURE__*/function (_React$Component) {
|
||||
hideContextMenu = _this$props.uiActions.hideContextMenu,
|
||||
getFeaturedPlaylists = _this$props.spotifyActions.getFeaturedPlaylists;
|
||||
hideContextMenu();
|
||||
getFeaturedPlaylists();
|
||||
getFeaturedPlaylists(true);
|
||||
});
|
||||
|
||||
_defineProperty(_assertThisInitialized(_this), "handleContextMenu", function (e, item) {
|
||||
@ -125010,7 +125035,7 @@ var DiscoverFeatured = /*#__PURE__*/function (_React$Component) {
|
||||
uris = _this$props2.uris,
|
||||
items = _this$props2.items;
|
||||
|
||||
if (Object(_util_helpers__WEBPACK_IMPORTED_MODULE_10__["isLoading"])(load_queue, ['spotify_browse/featured-playlists'])) {
|
||||
if (Object(_util_helpers__WEBPACK_IMPORTED_MODULE_10__["isLoading"])(load_queue, ['(.*)spotify_browse/featured-playlists(.*)'])) {
|
||||
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
|
||||
className: "view discover-featured-view preserve-3d",
|
||||
"data-qa-node": "div",
|
||||
@ -125037,7 +125062,7 @@ var DiscoverFeatured = /*#__PURE__*/function (_React$Component) {
|
||||
}));
|
||||
}
|
||||
|
||||
var playlists = Object(_util_arrays__WEBPACK_IMPORTED_MODULE_13__["indexToArray"])(items, uris);
|
||||
var playlists = Object(_util_arrays__WEBPACK_IMPORTED_MODULE_13__["indexToArray"])(items, uris || []);
|
||||
var options = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Button__WEBPACK_IMPORTED_MODULE_12__["default"], {
|
||||
noHover: true,
|
||||
onClick: _this.onRefresh,
|
||||
@ -125149,14 +125174,9 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var _util_helpers__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../util/helpers */ "./src/js/util/helpers.js");
|
||||
/* harmony import */ var _locale__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../locale */ "./src/js/locale/index.js");
|
||||
/* harmony import */ var _components_Button__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../../components/Button */ "./src/js/components/Button.js");
|
||||
/* harmony import */ var _util_arrays__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../../util/arrays */ "./src/js/util/arrays.js");
|
||||
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
|
||||
|
||||
function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
|
||||
|
||||
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
||||
|
||||
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
||||
|
||||
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
||||
|
||||
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
|
||||
@ -125195,6 +125215,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
||||
|
||||
|
||||
|
||||
|
||||
var DiscoverNewReleases = /*#__PURE__*/function (_React$Component) {
|
||||
_inherits(DiscoverNewReleases, _React$Component);
|
||||
|
||||
@ -125230,7 +125251,7 @@ var DiscoverNewReleases = /*#__PURE__*/function (_React$Component) {
|
||||
hideContextMenu = _this$props2.uiActions.hideContextMenu,
|
||||
getNewReleases = _this$props2.spotifyActions.getNewReleases;
|
||||
hideContextMenu();
|
||||
getNewReleases();
|
||||
getNewReleases(true);
|
||||
});
|
||||
|
||||
_defineProperty(_assertThisInitialized(_this), "renderIntro", function () {
|
||||
@ -125254,12 +125275,12 @@ var DiscoverNewReleases = /*#__PURE__*/function (_React$Component) {
|
||||
_defineProperty(_assertThisInitialized(_this), "render", function () {
|
||||
var _this$props3 = _this.props,
|
||||
load_queue = _this$props3.load_queue,
|
||||
items = _this$props3.items,
|
||||
new_releases = _this$props3.new_releases,
|
||||
albumsProp = _this$props3.albums,
|
||||
new_releases_more = _this$props3.new_releases_more,
|
||||
uiActions = _this$props3.uiActions;
|
||||
|
||||
if (Object(_util_helpers__WEBPACK_IMPORTED_MODULE_12__["isLoading"])(load_queue, ['spotify_browse/new-releases'])) {
|
||||
if (Object(_util_helpers__WEBPACK_IMPORTED_MODULE_12__["isLoading"])(load_queue, ['(.*)new-releases(.*)offset=0(.*)'])) {
|
||||
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
|
||||
className: "view discover-new-releases-view",
|
||||
"data-qa-node": "div",
|
||||
@ -125284,27 +125305,7 @@ var DiscoverNewReleases = /*#__PURE__*/function (_React$Component) {
|
||||
}));
|
||||
}
|
||||
|
||||
var albums = [];
|
||||
|
||||
if (new_releases) {
|
||||
var _iterator = _createForOfIteratorHelper(new_releases),
|
||||
_step;
|
||||
|
||||
try {
|
||||
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
||||
var uri = _step.value;
|
||||
|
||||
if (albumsProp.hasOwnProperty(uri)) {
|
||||
albums.push(albumsProp[uri]);
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
_iterator.e(err);
|
||||
} finally {
|
||||
_iterator.f();
|
||||
}
|
||||
}
|
||||
|
||||
var albums = Object(_util_arrays__WEBPACK_IMPORTED_MODULE_15__["indexToArray"])(items, new_releases || []);
|
||||
var options = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Button__WEBPACK_IMPORTED_MODULE_14__["default"], {
|
||||
noHover: true,
|
||||
onClick: _this.refresh,
|
||||
@ -125395,8 +125396,7 @@ var mapStateToProps = function mapStateToProps(state) {
|
||||
return {
|
||||
theme: state.ui.theme,
|
||||
load_queue: state.ui.load_queue,
|
||||
artists: state.core.artists,
|
||||
albums: state.core.albums,
|
||||
items: state.core.items,
|
||||
new_releases: state.spotify.new_releases ? state.spotify.new_releases : null,
|
||||
new_releases_more: state.spotify.new_releases_more ? state.spotify.new_releases_more : null,
|
||||
new_releases_total: state.spotify.new_releases_total ? state.spotify.new_releases_total : null
|
||||
@ -126496,9 +126496,7 @@ var LibraryAlbums = /*#__PURE__*/function (_React$Component) {
|
||||
}), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_LazyLoadListener__WEBPACK_IMPORTED_MODULE_8__["default"], {
|
||||
loadKey: total_albums > limit ? limit : total_albums,
|
||||
showLoader: limit < total_albums,
|
||||
loadMore: function loadMore() {
|
||||
return _this.loadMore();
|
||||
},
|
||||
loadMore: _this.loadMore,
|
||||
"data-qa-node": "LazyLoadListener",
|
||||
"data-qa-file": "LibraryAlbums"
|
||||
}));
|
||||
|
||||
File diff suppressed because one or more lines are too long
12
mopidy_iris/static/app.min.js
vendored
12
mopidy_iris/static/app.min.js
vendored
File diff suppressed because one or more lines are too long
@ -106,7 +106,7 @@
|
||||
|
||||
// Release details
|
||||
// These are automatically injected to built HTML
|
||||
var build = "1600245321";
|
||||
var build = "1600331332";
|
||||
var version = "3.52.4";
|
||||
|
||||
// Construct the script tag
|
||||
|
||||
@ -59,17 +59,17 @@ class Sidebar extends React.Component {
|
||||
<Icon name="warning" className="red-text" />
|
||||
<span className="tooltip__content">
|
||||
{!mopidy_connected && (
|
||||
<I18n path="sidebar.not_connected" params={{ name: i18n('services.mopidy.title') }} contentAfter>
|
||||
<I18n path="sidebar.not_connected" name={i18n('services.mopidy.title')} contentAfter>
|
||||
<br />
|
||||
</I18n>
|
||||
)}
|
||||
{!pusher_connected && (
|
||||
<I18n path="sidebar.not_connected" params={{ name: i18n('services.pusher.title') }} contentAfter>
|
||||
<I18n path="sidebar.not_connected" name={i18n('services.pusher.title')} contentAfter>
|
||||
<br />
|
||||
</I18n>
|
||||
)}
|
||||
{!snapcast_connected && snapcast_enabled && (
|
||||
<I18n path="sidebar.not_connected" params={{ name: i18n('services.snapcast.title') }} contentAfter>
|
||||
<I18n path="sidebar.not_connected" name={i18n('services.snapcast.title')} contentAfter>
|
||||
<br />
|
||||
</I18n>
|
||||
)}
|
||||
|
||||
@ -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 += `×tamp=${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) => {
|
||||
|
||||
@ -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({
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
import { indexToArray } from "./arrays";
|
||||
|
||||
/**
|
||||
* Returns a function, that, as long as it continues to be invoked, will not
|
||||
* be triggered. The function will be called after it stops being called for
|
||||
@ -372,7 +374,7 @@ let isObject = function (value) {
|
||||
const isLoading = function (load_queue = {}, keys = []) {
|
||||
if (!load_queue || !keys) return false;
|
||||
|
||||
const queue_keys = Object.keys(load_queue);
|
||||
const queue_keys = indexToArray(load_queue);
|
||||
const matches = keys.reduce((acc, key) => {
|
||||
let regex = '';
|
||||
try {
|
||||
|
||||
@ -22,7 +22,6 @@ import * as uiActions from '../services/ui/actions';
|
||||
import * as mopidyActions from '../services/mopidy/actions';
|
||||
import {
|
||||
uriSource,
|
||||
getFromUri,
|
||||
isLoading,
|
||||
sourceIcon,
|
||||
titleCase,
|
||||
@ -35,8 +34,15 @@ import { trackEvent } from '../components/Trackable';
|
||||
|
||||
class Artist extends React.Component {
|
||||
componentDidMount() {
|
||||
const {
|
||||
uri,
|
||||
coreActions: {
|
||||
loadItem,
|
||||
},
|
||||
} = this.props;
|
||||
|
||||
this.setWindowTitle();
|
||||
this.props.coreActions.loadItem(this.props.uri, { full: true });
|
||||
loadItem(uri, { full: true });
|
||||
}
|
||||
|
||||
componentDidUpdate = ({
|
||||
|
||||
@ -279,8 +279,8 @@ class Playlist extends React.Component {
|
||||
const playlist_id = getFromUri('playlistid', uri);
|
||||
|
||||
if (!playlist) {
|
||||
if (isLoading(load_queue, [`(.*)${playlist_id}`])) {
|
||||
return <Loader body loading />
|
||||
if (isLoading(load_queue, [`(.*)${playlist_id}(.*)`])) {
|
||||
return <Loader body loading />;
|
||||
}
|
||||
return (
|
||||
<ErrorMessage type="not-found" title="Not found">
|
||||
@ -349,7 +349,7 @@ class Playlist extends React.Component {
|
||||
|
||||
{this.renderActions()}
|
||||
|
||||
{isLoading(load_queue, [`(.*)${playlist_id}/tracks`]) ? (
|
||||
{isLoading(load_queue, [`(.*)${playlist_id}/tracks(.*)`]) ? (
|
||||
<Loader body loading />
|
||||
) : (
|
||||
<section className="list-wrapper">
|
||||
|
||||
@ -40,7 +40,7 @@ class DiscoverFeatured extends React.Component {
|
||||
},
|
||||
} = this.props;
|
||||
hideContextMenu();
|
||||
getFeaturedPlaylists();
|
||||
getFeaturedPlaylists(true);
|
||||
}
|
||||
|
||||
handleContextMenu = (e, item) => {
|
||||
@ -68,7 +68,7 @@ class DiscoverFeatured extends React.Component {
|
||||
items,
|
||||
} = this.props;
|
||||
|
||||
if (isLoading(load_queue, ['spotify_browse/featured-playlists'])) {
|
||||
if (isLoading(load_queue, ['(.*)spotify_browse/featured-playlists(.*)'])) {
|
||||
return (
|
||||
<div className="view discover-featured-view preserve-3d">
|
||||
<Header className="overlay" uiActions={uiActions}>
|
||||
@ -80,7 +80,7 @@ class DiscoverFeatured extends React.Component {
|
||||
);
|
||||
}
|
||||
|
||||
const playlists = indexToArray(items, uris);
|
||||
const playlists = indexToArray(items, uris || []);
|
||||
|
||||
const options = (
|
||||
<Button
|
||||
|
||||
@ -14,6 +14,7 @@ import * as spotifyActions from '../../services/spotify/actions';
|
||||
import { isLoading } from '../../util/helpers';
|
||||
import { i18n, I18n } from '../../locale';
|
||||
import Button from '../../components/Button';
|
||||
import { indexToArray } from '../../util/arrays';
|
||||
|
||||
class DiscoverNewReleases extends React.Component {
|
||||
componentDidMount() {
|
||||
@ -68,7 +69,7 @@ class DiscoverNewReleases extends React.Component {
|
||||
} = this.props;
|
||||
|
||||
hideContextMenu();
|
||||
getNewReleases();
|
||||
getNewReleases(true);
|
||||
}
|
||||
|
||||
handleContextMenu(e, item) {
|
||||
@ -92,13 +93,13 @@ class DiscoverNewReleases extends React.Component {
|
||||
render = () => {
|
||||
const {
|
||||
load_queue,
|
||||
items,
|
||||
new_releases,
|
||||
albums: albumsProp,
|
||||
new_releases_more,
|
||||
uiActions,
|
||||
} = this.props;
|
||||
|
||||
if (isLoading(load_queue, ['spotify_browse/new-releases'])) {
|
||||
if (isLoading(load_queue, ['(.*)new-releases(.*)offset=0(.*)'])) {
|
||||
return (
|
||||
<div className="view discover-new-releases-view">
|
||||
<Header>
|
||||
@ -110,14 +111,7 @@ class DiscoverNewReleases extends React.Component {
|
||||
);
|
||||
}
|
||||
|
||||
const albums = [];
|
||||
if (new_releases) {
|
||||
for (const uri of new_releases) {
|
||||
if (albumsProp.hasOwnProperty(uri)) {
|
||||
albums.push(albumsProp[uri]);
|
||||
}
|
||||
}
|
||||
}
|
||||
const albums = indexToArray(items, new_releases || []);
|
||||
|
||||
const options = (
|
||||
<Button
|
||||
@ -152,8 +146,7 @@ class DiscoverNewReleases extends React.Component {
|
||||
const mapStateToProps = (state) => ({
|
||||
theme: state.ui.theme,
|
||||
load_queue: state.ui.load_queue,
|
||||
artists: state.core.artists,
|
||||
albums: state.core.albums,
|
||||
items: state.core.items,
|
||||
new_releases: (state.spotify.new_releases ? state.spotify.new_releases : null),
|
||||
new_releases_more: (state.spotify.new_releases_more ? state.spotify.new_releases_more : null),
|
||||
new_releases_total: (state.spotify.new_releases_total ? state.spotify.new_releases_total : null),
|
||||
|
||||
@ -235,7 +235,7 @@ class LibraryAlbums extends React.Component {
|
||||
<LazyLoadListener
|
||||
loadKey={total_albums > limit ? limit : total_albums}
|
||||
showLoader={limit < total_albums}
|
||||
loadMore={() => this.loadMore()}
|
||||
loadMore={this.loadMore}
|
||||
/>
|
||||
</section>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user