From 07a308afb71410eb5f1461b6ee08d86dfe68aedb Mon Sep 17 00:00:00 2001
From: IrosTheBeggar <paul.sori@pm.me>
Date: Fri, 23 Oct 2020 16:29:29 -0400
Subject: [PATCH] new webb app config flags

---
 modules/config/configure-commander.js |  4 +++
 modules/defaults.js                   |  1 +
 mstream.js                            | 46 +++++++++++++++------------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/modules/config/configure-commander.js b/modules/config/configure-commander.js
index 83f7855..c9397b6 100644
--- a/modules/config/configure-commander.js
+++ b/modules/config/configure-commander.js
@@ -43,6 +43,9 @@ exports.setup = function (args) {
     // JSON config
     .option('-j, --json <json>', 'Specify JSON Boot File')
 
+    // New Web App
+    .option('-q, --newapp', 'Try the new web app')
+
     // Wizard
     .option("-w, --wizard [file]", "Setup Wizard")
     .parse(args);  
@@ -108,6 +111,7 @@ exports.setup = function (args) {
     }
   }
 
+  if (program.newapp) { program3.newWebApp = true }
   if (program.userinterface) { program3.webAppDirectory = program.userinterface }
   if (program.secret) { program3.secret = program.secret; }
   if (program.skipimg) { program3.scanOptions.skipImg = true; }
diff --git a/modules/defaults.js b/modules/defaults.js
index 379ccfd..0cb554e 100644
--- a/modules/defaults.js
+++ b/modules/defaults.js
@@ -25,6 +25,7 @@ exports.setup = function (config) {
     address: Joi.string().ip({ cidr: 'forbidden' }).default('127.0.0.1'),
     port: Joi.number().default(3000),
     noLogin: Joi.boolean().default(false),
+    newWebApp: Joi.boolean().default(false),
     supportedAudioFiles: Joi.object().pattern(
       Joi.string(),
       Joi.boolean()
diff --git a/mstream.js b/mstream.js
index b0e42c8..04ff231 100755
--- a/mstream.js
+++ b/mstream.js
@@ -48,27 +48,31 @@ exports.serveIt = config => {
     next();
   });
 
-  // Give access to public folder
-  mstream.use('/public', express.static( program.webAppDirectory ));
-  // Serve the webapp
-  mstream.get('/', (req, res) => {
-    res.sendFile('mstream.html', { root: program.webAppDirectory });
-  });
-  mstream.get('/j/*', (req, res) => {
-    res.sendFile( 'mstream.html', { root: program.webAppDirectory });
-  });
-  // It Really Whips The Llama's Ass
-  mstream.get('/winamp', (req, res) => {
-    res.sendFile('winamp.html', { root: program.webAppDirectory });
-  });
-  // Serve Shared Page
-  mstream.all('/shared/playlist/*', (req, res) => {
-    res.sendFile( 'shared.html', { root: program.webAppDirectory });
-  });
-  // Serve Jukebox Page
-  mstream.all('/remote', (req, res) => {
-    res.sendFile('remote.html', { root: program.webAppDirectory });
-  });
+  if (program.newWebApp) {
+    mstream.use(express.static( 'webapp-beta' ));
+  } else {
+    // Give access to public folder
+    mstream.use('/public', express.static( program.webAppDirectory ));
+    // Serve the webapp
+    mstream.get('/', (req, res) => {
+      res.sendFile('mstream.html', { root: program.webAppDirectory });
+    });
+    mstream.get('/j/*', (req, res) => {
+      res.sendFile( 'mstream.html', { root: program.webAppDirectory });
+    });
+    // It Really Whips The Llama's Ass
+    mstream.get('/winamp', (req, res) => {
+      res.sendFile('winamp.html', { root: program.webAppDirectory });
+    });
+    // Serve Shared Page
+    mstream.all('/shared/playlist/*', (req, res) => {
+      res.sendFile( 'shared.html', { root: program.webAppDirectory });
+    });
+    // Serve Jukebox Page
+    mstream.all('/remote', (req, res) => {
+      res.sendFile('remote.html', { root: program.webAppDirectory });
+    });
+  }
 
   // JukeBox
   jukebox.setup2(mstream, server, program);