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

Playlist and Users data storage overhaul

Browse Source
This commit is contained in:
James Barnsley
2018-08-31 16:04:55 +12:00
parent 02ab0616fa
commit dbb5effbb9
21 changed files with 15035 additions and 11241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/js/services/core/actions.js
View File

@ -86,38 +86,51 @@ export function cachebustHttpStream(){
* relevant service to load the record - all from one neat package.
**/
export function loadTrack(uri){
export function loadTrack(uri, force_reload = false){
return {
type: 'LOAD_TRACK',
uri: uri
uri: uri,
force_reload: force_reload
}
}
export function loadAlbum(uri){
export function loadAlbum(uri, force_reload = false){
return {
type: 'LOAD_ALBUM',
uri: uri
uri: uri,
force_reload: force_reload
}
}
export function loadArtist(uri){
export function loadArtist(uri, force_reload = false){
return {
type: 'LOAD_ARTIST',
uri: uri
uri: uri,
force_reload: force_reload
}
}
export function loadPlaylist(uri){
export function loadPlaylist(uri, force_reload = false){
return {
type: 'LOAD_PLAYLIST',
uri: uri
uri: uri,
force_reload: force_reload
}
}
export function loadUser(uri){
export function loadUser(uri, force_reload = false){
return {
type: 'LOAD_USER',
uri: uri
uri: uri,
force_reload: force_reload
}
}
export function loadUserPlaylists(uri, force_reload = false){
return {
type: 'LOAD_USER_PLAYLISTS',
uri: uri,
force_reload: force_reload
}
}
@ -177,6 +190,15 @@ export function usersLoaded(users){
users: users
}
}
export function userPlaylistsLoaded(uri, playlists, more = null, total = null){
return {
type: 'USER_PLAYLISTS_LOADED',
uri: uri,
playlists: playlists,
more: more,
total: total
}
}
export function loadedMore(parent_type, parent_key, records_type, records_data){
return {

91
src/js/services/core/middleware.js
View File

@ -357,6 +357,14 @@ const CoreMiddleware = (function(){
case 'LOAD_TRACK':
if (
!action.force_reload &&
store.getState().core.tracks[action.uri]){
console.info('Loading "'+action.uri+'" from index');
break;
}
switch (helpers.uriSource(action.uri)){
case 'spotify':
store.dispatch(spotifyActions.getTrack(action.uri));
@ -374,6 +382,15 @@ const CoreMiddleware = (function(){
break;
case 'LOAD_ALBUM':
if (
!action.force_reload &&
store.getState().core.albums[action.uri] &&
store.getState().core.albums[action.uri].tracks_uris){
console.info('Loading "'+action.uri+'" from index');
break;
}
switch (helpers.uriSource(action.uri)){
case 'spotify':
store.dispatch(spotifyActions.getAlbum(action.uri));
@ -391,6 +408,16 @@ const CoreMiddleware = (function(){
break;
case 'LOAD_ARTIST':
if (
!action.force_reload &&
store.getState().core.artists[action.uri] &&
store.getState().core.artists[action.uri].albums_uris &&
store.getState().core.artists[action.uri].tracks_uris){
console.info('Loading "'+action.uri+'" from index');
break;
}
switch (helpers.uriSource(action.uri)){
case 'spotify':
store.dispatch(spotifyActions.getArtist(action.uri, true));
@ -408,6 +435,15 @@ const CoreMiddleware = (function(){
break;
case 'LOAD_PLAYLIST':
if (
!action.force_reload &&
store.getState().core.playlists[action.uri] &&
store.getState().core.playlists[action.uri].tracks_uris){
console.info('Loading "'+action.uri+'" from index');
break;
}
switch (helpers.uriSource(action.uri)){
case 'spotify':
store.dispatch(spotifyActions.getPlaylist(action.uri));
@ -424,6 +460,46 @@ const CoreMiddleware = (function(){
next(action);
break;
case 'LOAD_USER':
console.log(action);
if (
!action.force_reload &&
store.getState().core.playlists[action.uri] &&
store.getState().core.playlists[action.uri].albums_uris ){
console.info('Loading "'+action.uri+'" from index');
break;
}
switch (helpers.uriSource(action.uri)){
case 'spotify':
store.dispatch(spotifyActions.getUser(action.uri));
store.dispatch(spotifyActions.following(action.uri));
break;
default:
// No Mopidy mechanism for users
break;
}
next(action);
break;
case 'LOAD_USER_PLAYLISTS':
switch (helpers.uriSource(action.uri)){
case 'spotify':
store.dispatch(spotifyActions.getUserPlaylists(action.uri));
break;
default:
// No Mopidy mechanism for users
break;
}
next(action);
break;
/**
* Index actions
@ -537,7 +613,9 @@ const CoreMiddleware = (function(){
var playlists_loaded = [];
var tracks_loaded = [];
action.playlists.forEach(playlist => {
for (var playlist of action.playlists){
playlist = helpers.formatPlaylist(playlist);
// Detect editability
switch (helpers.uriSource(playlist.uri)){
@ -567,7 +645,7 @@ const CoreMiddleware = (function(){
// Update index
playlists_loaded.push(playlist);
});
}
action.playlists = playlists_loaded;
@ -581,20 +659,25 @@ const CoreMiddleware = (function(){
var users_index = Object.assign({}, core.users);
var users_loaded = [];
action.users.forEach(user => {
for (var user of action.users){
if (users_index[user.uri]){
user = Object.assign({}, users_index[user.uri], user);
}
users_loaded.push(user);
});
}
action.users = users_loaded;
next(action);
break;
case 'USER_PLAYLISTS_LOADED':
store.dispatch(coreActions.playlistsLoaded(action.playlists));
next(action);
break;
/**
* Loaded more linked assets
* Often fired during lazy-loading or async asset grabbing.

42
src/js/services/core/reducer.js
View File

@ -124,37 +124,37 @@ export default function reducer(core = {}, action){
case 'TRACKS_LOADED':
var tracks = Object.assign({}, core.tracks);
action.tracks.forEach(track => {
for (var track of action.tracks){
tracks[track.uri] = track;
});
}
return Object.assign({}, core, { tracks: tracks });
case 'ALBUMS_LOADED':
var albums = Object.assign({}, core.albums);
action.albums.forEach(album => {
for (var album of action.albums){
albums[album.uri] = album;
});
}
return Object.assign({}, core, { albums: albums });
case 'ARTISTS_LOADED':
var artists = Object.assign({}, core.artists);
action.artists.forEach(artist => {
for (var artist of action.artists){
artists[artist.uri] = artist;
});
}
return Object.assign({}, core, { artists: artists });
case 'PLAYLISTS_LOADED':
var playlists = Object.assign({}, core.playlists);
action.playlists.forEach(playlist => {
for (var playlist of action.playlists){
playlists[playlist.uri] = playlist;
});
}
return Object.assign({}, core, { playlists: playlists });
case 'USERS_LOADED':
var users = Object.assign({}, core.users);
action.users.forEach(user => {
for (var user of action.users){
users[user.uri] = user;
});
}
return Object.assign({}, core, { users: users });
@ -167,8 +167,10 @@ export default function reducer(core = {}, action){
});
}
var new_releases = []
if (core.new_releases) new_releases = Object.assign([], core.new_releases)
var new_releases = [];
if (core.new_releases){
new_releases = Object.assign([], core.new_releases);
}
return Object.assign({}, core, {
new_releases: [...new_releases, ...action.uris],
@ -199,19 +201,23 @@ export default function reducer(core = {}, action){
case 'USER_PLAYLISTS_LOADED':
var users = Object.assign({}, core.users)
var playlists_uris = []
if (users[action.key] && users[action.key].playlists_uris) playlists_uris = users[action.key].playlists_uris
var existing_playlists_uris = [];
if (users[action.uri] && users[action.uri].playlists_uris){
existing_playlists_uris = users[action.uri].playlists_uris;
}
var artist = Object.assign(
var playlists_uris = [...existing_playlists_uris, ...helpers.arrayOf('uri',action.playlists)]
var user = Object.assign(
{},
users[action.key],
users[action.uri],
{
playlists_uris: [...playlists_uris, ...action.uris],
playlists_uris: playlists_uris,
playlists_more: action.more,
playlists_total: action.total
}
)
users[action.key] = artist
users[action.uri] = user;
return Object.assign({}, core, { users: users });