CactiChameleon9/freezerpc
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shuffle/Repeat fixes, Prebuilt frontend, Linux icon, Playback errors, Unsynced lyrics, Bug fixes

Browse Source
This commit is contained in:
exttex
2020-09-20 19:17:28 +02:00
parent 27b55a4876
commit 863c1aff40
15 changed files with 133 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/definitions.js
View File

@ -247,7 +247,10 @@ class Lyrics {
constructor(json) {
this.id = json.LYRICS_ID;
this.writer = json.LYRICS_WRITERS;
this.text = json.LYRICS_TEXT;
this.text = [];
if (json.LYRICS_TEXT) {
this.text = json.LYRICS_TEXT.replace(new RegExp('\\r', 'g'), '').split('\n');
}
//Parse invidual lines
this.lyrics = [];

44
app/src/server.js
View File

@ -102,40 +102,15 @@ app.get('/artist/:id', async (req, res) => {
//start & full query parameters
app.get('/playlist/:id', async (req, res) => {
//Set anything to `full` query parameter to get entire playlist
if (!req.query.full) {
let data = await deezer.callApi('deezer.pagePlaylist', {
playlist_id: req.params.id.toString(),
lang: 'us',
nb: 50,
start: req.query.start ? parseInt(req.query.start, 10) : 0,
tags: true
});
return res.send(new Playlist(data.results.DATA, data.results.SONGS));
}
//Entire playlist
let chunk = 200;
let nb = req.query.full ? 100000 : 50;
let data = await deezer.callApi('deezer.pagePlaylist', {
playlist_id: req.params.id.toString(),
lang: 'us',
nb: chunk,
start: 0,
playlist_id: req.params.id.toString(),
lang: 'us',
nb: nb,
start: req.query.start ? parseInt(req.query.start, 10) : 0,
tags: true
});
let playlist = new Playlist(data.results.DATA, data.results.SONGS);
let missingChunks = Math.ceil((playlist.trackCount - playlist.tracks.length)/chunk);
//Extend playlist
for(let i=0; i<missingChunks; i++) {
let d = await deezer.callApi('deezer.pagePlaylist', {
playlist_id: id.toString(),
lang: 'us',
nb: chunk,
start: (i+1)*chunk,
tags: true
});
playlist.extend(d.results.SONGS);
}
res.send(playlist);
return res.send(new Playlist(data.results.DATA, data.results.SONGS));
});
//DELETE playlist
@ -484,6 +459,13 @@ app.get('/lastfm', async (req, res) => {
}).end();
});
//Get URL from deezer.page.link
app.get('/fullurl', async (req, res) => {
let url = req.query.url;
let r = await axios.get(url, {validateStatus: null});
res.json({url: r.request.res.responseUrl});
});
//Redirect to index on unknown path
app.all('*', (req, res) => {
res.redirect('/');