From 39000e5499b5a250ec509d06a8459a250a627e10 Mon Sep 17 00:00:00 2001
From: IrosTheBeggar <paul.sori@gmail.com>
Date: Sat, 29 Apr 2017 01:36:24 -0400
Subject: [PATCH] Album art fixes

---
 modules/configure-commander.js                    |  7 ++++++-
 modules/db-management/database-default-manager.js |  2 +-
 mstream.js                                        | 10 +++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/configure-commander.js b/modules/configure-commander.js
index 851c751..eea5067 100644
--- a/modules/configure-commander.js
+++ b/modules/configure-commander.js
@@ -1,11 +1,12 @@
 exports.setup = function(args){
   const program = require('commander');
   program
-    .version('2.6.0')
+    .version('3.0.1')
     // Server Config
     .option('-p, --port <port>', 'Select Port', /^\d+$/i, 3000)
     .option('-i, --userinterface <folder>', 'Specify folder name that will be served as the UI', 'public')
     .option('-s, --secret <secret>', 'Set the login secret key')
+    .option('-I, --images <images>', 'Set the image folder')
 
     // SSL
     .option('-c, --cert <cert>', 'SSL Certificate File')
@@ -101,6 +102,10 @@ exports.setup = function(args){
     program3.ssl.cert = program.cert;
   }
 
+  // images
+  if(program.images){
+    program3.albumArtDir = program.images;
+  }
 
   return program3;
 }
diff --git a/modules/db-management/database-default-manager.js b/modules/db-management/database-default-manager.js
index ba534b8..9f33d5d 100644
--- a/modules/db-management/database-default-manager.js
+++ b/modules/db-management/database-default-manager.js
@@ -183,7 +183,7 @@ function parseFile(thisSong){
         var picHashString = crypto.createHash('sha256').update(bufferString).digest('hex');
         songInfo.albumArtFilename = picHashString + '.' + picFormat;
         // Cehck image-cache folder for filename and save if doesn't exist
-        if (!fs.existsSync(songInfo.albumArtFilename)) {
+        if (!fs.existsSync(fe.join(loadJson.albumArtDir, songInfo.albumArtFilename))) {
           // Save file sync
           fs.writeFileSync(fe.join(loadJson.albumArtDir, songInfo.albumArtFilename), songInfo.picture[0].data);
         }
diff --git a/mstream.js b/mstream.js
index 8f1e972..d27ee6d 100755
--- a/mstream.js
+++ b/mstream.js
@@ -64,13 +64,13 @@ exports.serveit = function (program, callback) {
     });
   }
   // Setup Album Art
-  // TODO: Move to after login systm ???
-  mstream.use( '/album-art',  express.static(fe.join(__dirname, 'image-cache') ));
-  program.albumArtDir = fe.join(__dirname, 'image-cache');
+  if(!program.albumArtDir){
+    program.albumArtDir = fe.join(__dirname, 'image-cache');
+  }
+  // Move to after login systm
+  mstream.use( '/album-art',  express.static(program.albumArtDir ));
 
 
-
-  // TODO: Move this to the configure module
   // Setup Secret for JWT
   try{
     // IF user entered a filepath