updated: make procedure, reloadroms ability and fixed artist display

diff --git a/Makefile b/Makefile
index 2f51fd96c1da6dfda9f43b7bce24b4ad2b18d99c..cb8541421072172226237304a1505aa0b85e5379 100644 (file)
--- 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 eae83d0d8e1047924ba686bd71a37e8b745c91b5..aa1e107f8ff45974d1d0a0e58c26528031e26ace 100644 (file)
--- 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 d8e43e2816df9e47f407f1a29aef20d36369a414..7f2c24b5aca7c016161873ddce9eb51ca4aff4e5 100644 (file)
--- 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);