From 547709641f8544b751aed7dede58046caffc4845 Mon Sep 17 00:00:00 2001
From: IrosTheBeggar <paul.sori@gmail.com>
Date: Thu, 26 Oct 2017 18:05:07 -0400
Subject: [PATCH] Fixed some bugs

---
 modules/configure-commander.js       | 12 +++++++-----
 modules/configure-json-file.js       |  2 --
 mstream-command-line-boot-wrapper.js |  1 -
 public/css/master.css                | 10 ++++++++++
 public/js/mstream.js                 |  6 +++---
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/modules/configure-commander.js b/modules/configure-commander.js
index 1f5e1bb..a18b392 100644
--- a/modules/configure-commander.js
+++ b/modules/configure-commander.js
@@ -41,17 +41,19 @@ exports.setup = function(args){
     program3.salt = program.salt;
   }
 
+  program3.folders = {
+    'media': {root: program.musicdir}
+  }
+
   // User account
   if(program.user && program.password){
     program3.users = {};
     program3.users[program.user] = {
-      password:program.password,
-      musicDir:program.musicdir
-    };
+      password: program.password,
+      vpaths: ['media']
+    }
   }else{
     console.log('USER SYSTEM NOT ENABLED!');
-    // Store the musicDir to be used in setup
-    program3.musicDir = program.musicdir;
   }
 
   // db plugins
diff --git a/modules/configure-json-file.js b/modules/configure-json-file.js
index 5fbf68e..847f52f 100644
--- a/modules/configure-json-file.js
+++ b/modules/configure-json-file.js
@@ -41,7 +41,6 @@ exports.setup = function(loadJson, rootDir){
     }
   }
 
-  console.log(loadJson.users)
   if(!loadJson.users || typeof loadJson.users !== 'object'){
     errorArray.push('No Users');
     loadJson.error = errorArray;
@@ -52,7 +51,6 @@ exports.setup = function(loadJson, rootDir){
     if(typeof loadJson.users[user].vpaths === 'string'){
       loadJson.users[user].vpaths = [loadJson.users[user].vpaths];
     }
-
   }
 
   if(errorArray.length > 0){
diff --git a/mstream-command-line-boot-wrapper.js b/mstream-command-line-boot-wrapper.js
index 7f6f5ab..23fefbe 100755
--- a/mstream-command-line-boot-wrapper.js
+++ b/mstream-command-line-boot-wrapper.js
@@ -12,7 +12,6 @@ if(process.versions['electron']){
 
 var program;
 try{
-  console.log(fs.readFileSync(process.argv[process.argv.length-1], "utf8"))
   if(fe.extname(process.argv[process.argv.length-1]) === '.json'  &&  fs.statSync(process.argv[process.argv.length-1]).isFile()){
     let loadJson = JSON.parse(fs.readFileSync(process.argv[process.argv.length-1], 'utf8'));
     program =  require('./modules/configure-json-file.js').setup(loadJson, __dirname);
diff --git a/public/css/master.css b/public/css/master.css
index d266dcd..5136b65 100755
--- a/public/css/master.css
+++ b/public/css/master.css
@@ -465,6 +465,16 @@ h3 {
                                   supported by Chrome and Opera */
 }
 
+.autoselect{
+  -webkit-touch-callout: auto; /* iOS Safari */
+    -webkit-user-select: auto; /* Safari */
+     -khtml-user-select: auto; /* Konqueror HTML */
+       -moz-user-select: auto; /* Firefox */
+        -ms-user-select: auto; /* Internet Explorer/Edge */
+            user-select: auto; /* Non-prefixed version, currently
+                                  supported by Chrome and Opera */
+}
+
 
 
 .meta-box{
diff --git a/public/js/mstream.js b/public/js/mstream.js
index d680a53..84bc26b 100755
--- a/public/js/mstream.js
+++ b/public/js/mstream.js
@@ -177,7 +177,7 @@ $(document).ready(function(){
 		fileExplorerArray = [];
 		fileExplorerScrollPosition = [];
 
-    if(MSTREAMAPI.currentServer.vpaths.length === 1){
+    if(MSTREAMAPI.currentServer.vpaths && MSTREAMAPI.currentServer.vpaths.length === 1){
       fileExplorerArray.push(MSTREAMAPI.currentServer.vpaths[0]);
       fileExplorerScrollPosition.push(0);
     }
@@ -759,7 +759,7 @@ $(document).ready(function(){
 	});
 
   function createJukeboxPanel(){
-    var returnHtml = '<p class="jukebox-panel">';
+    var returnHtml = '<div class="jukebox-panel autoselect">';
 
     if(JUKEBOX.stats.error !== false){
       return returnHtml + 'An error occurred.  Please refresh the page and try again</p>';
@@ -775,7 +775,7 @@ $(document).ready(function(){
     var adrs =  window.location.protocol + '//' + window.location.host + '/remote';
     returnHtml += '<br><h4>Remote Jukebox Controls: <a target="_blank" href="' + adrs + '"> ' + adrs + '</a><h4>';
 
-    return returnHtml + '</p>';
+    return returnHtml + '</div>';
   }