From: 2weiEmu Date: Thu, 12 Mar 2026 19:23:07 +0000 (+0100) Subject: updated: make procedure, reloadroms ability and fixed artist display X-Git-Url: https://git.saalbach.dev/?a=commitdiff_plain;h=ab6a8299b9e387c7a65b03eac3bbb058382dd938;p=binbsis50.git updated: make procedure, reloadroms ability and fixed artist display --- diff --git a/Makefile b/Makefile index 2f51fd9..cb85414 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ default: + sudo docker stop redis || true + sudo docker rm redis || true + npm run minify sudo docker run -d --name redis -p 6379:6379 redis:latest @@ -7,6 +10,3 @@ default: node app.js - sudo docker stop redis || true - sudo docker rm redis || true - diff --git a/app.js b/app.js index eae83d0..aa1e107 100644 --- a/app.js +++ b/app.js @@ -15,6 +15,7 @@ const site = require('./routes/site'); const urlencoded = require('body-parser').urlencoded; const user = require('./routes/user'); const usersdb = require('./lib/redis-clients').users; +const roomsReload = require('./lib/rooms.js').reloadRooms; /** * Setting up Express. @@ -82,6 +83,7 @@ app.post( user.checkOldPasswd, user.changePasswd ); +app.get('/reloadRooms', roomsReload) app.get('/leaderboards', user.leaderboards); app.get('/login', site.validationErrors, site.login); app.post('/login', user.validateLogin, user.checkUser, user.authenticate); diff --git a/lib/rooms.js b/lib/rooms.js index d8e43e2..7f2c24b 100644 --- a/lib/rooms.js +++ b/lib/rooms.js @@ -35,6 +35,7 @@ module.exports.rooms = rooms; * Actively re-read the rooms from genres, so the config may be hot reloaded on that part, this will also reinitalize the rooms */ module.exports.reloadRooms = function() { + console.log("Reloading rooms") rooms = {} config.rooms.forEach(function(room) { rooms[room] = new Room(room) @@ -570,7 +571,8 @@ Room.prototype.sendLoadTrack = function() { } room.artworkUrl = replies[3]; room.trackViewUrl = replies[4]; - room.displayArtistNames = replies[5].replace("~", ", ").replace(""); + console.log("dispaay artist:", replies[5].replace("~", ", ")) + room.displayArtistNames = replies[5].replace("~", ", "); room.displayTrackName = replies[6]; primus.room(room.roomname).send('loadtrack', room.previewUrl);