exttex/freezerpc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed removing/adding to library, label tag

Browse source
This commit is contained in:
exttex 2020-11-05 22:00:29 +01:00
parent 7eb047bae1
commit 416d65f310
38 changed files with 514 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/definitions.js
View file

@ -41,7 +41,7 @@ class Track {
}
class Album {
constructor(json, tracksJson = {data: []}) {
constructor(json, tracksJson = {data: []}, library = false) {
this.id = json.ALB_ID.toString();
this.title = json.ALB_TITLE;
this.art = new DeezerImage(json.ALB_PICTURE);
@ -65,11 +65,13 @@ class Album {
//Helpers
this.artistString = this.artists.map((a) => a.name).join(', ');
this.library = library;
}
}
class Artist {
constructor(json, albumsJson = {data: []}, topJson = {data: []}) {
constructor(json, albumsJson = {data: []}, topJson = {data: []}, library = false) {
this.id = json.ART_ID.toString();
this.name = json.ART_NAME;
this.fans = json.NB_FAN;
@ -78,11 +80,12 @@ class Artist {
this.albums = albumsJson.data.map((a) => new Album(a));
this.topTracks = topJson.data.map((t) => new Track(t));
this.radio = json.SMARTRADIO;
this.library = library;
}
}
class Playlist {
constructor(json, tracksJson = {data: []}) {
constructor(json, tracksJson = {data: []}, library = false) {
this.id = json.PLAYLIST_ID.toString(),
this.title = json.TITLE,
this.trackCount = json.NB_SONG ? json.NB_SONG : tracksJson.total;
@ -96,6 +99,7 @@ class Playlist {
new DeezerImage(json.PARENT_USER_PICTURE, 'user')
);
this.tracks = tracksJson.data.map((t) => new Track(t));
this.library = library;
}
//Extend tracks
@ -159,15 +163,15 @@ class DeezerLibrary {
break;
case 'albums':
this.count = json.albums.total;
this.data = json.albums.data.map((a) => new Album(a));
this.data = json.albums.data.map((a) => new Album(a, {data: []}, true));
break;
case 'artists':
this.count = json.artists.total;
this.data = json.artists.data.map((a) => new Artist(a));
this.data = json.artists.data.map((a) => new Artist(a, {data: []}, {data: []}, true));
break;
case 'playlists':
this.count = json.playlists.total;
this.data = json.playlists.data.map((p) => new Playlist(p));
this.data = json.playlists.data.map((p) => new Playlist(p, {data: []}, true));
break;
}
}

1
app/src/downloads.js
View file

@ -480,6 +480,7 @@ class DownloadThread {
'%0trackNumber%': (this.track.trackNumber ? this.track.trackNumber : 1).toString().padStart(2, '0'),
'%album%': this.track.album.title,
'%year%': date.getFullYear().toString(),
'%label%': (this.publicAlbum.label) ? this.publicAlbum.label : ''
};
for (let k of Object.keys(props)) {
fn = fn.replace(new RegExp(k, 'g'), sanitize(props[k]));