Merge pull request #27 from sdasda7777/sdasda7777_moveConfig

Move default_config.js, added version

Author: sdasda7777

src/app.js

@@ -4,7 +4,7 @@
  */
 const { spawn } = require('child_process');
 const fs = require('fs');
-const config = require('./helpers/configLoader.js').getOrInit();
+const config = require('./helpers/configLoader.js').getOrInit('config.js');
 const log = require('./helpers/lager.js');
 require('./rpc/client.js');
 

src/helpers/configLoader.js

@@ -1,16 +1,16 @@
-
-const fs = require('fs');
-const path = require('path');
-
-module.exports.getOrInit = () => {
-
-  let configPath = path.join(__dirname, '..', '..', 'config', 'config.js');
-
-  if (fs.existsSync(configPath) === false)
-  {
-    fs.writeFileSync(configPath,
-          fs.readFileSync(path.join(__dirname, '..', '..', 'config', 'default_config.js')));
-  }
-  return require(configPath);
-
-}
+
+const fs = require('fs');
+const path = require('path');
+
+module.exports.getOrInit = (configName) => {
+
+  let configPath = path.join(__dirname, '..', '..', 'config', configName);
+
+  if (fs.existsSync(configPath) === false)
+  {
+    fs.writeFileSync(configPath,
+          fs.readFileSync(path.join(__dirname, 'configs', 'default_' + configName)));
+  }
+  return require(configPath);
+
+}

config/default_config.js src/helpers/configs/default_config.jsconfig/default_config.js renamed to src/helpers/configs/default_config.js

@@ -1,11 +1,15 @@
 module.exports = {
 
+  // Version of the config file
+  configFileVersion: "1.2",
+
   // The full path to your VLC executable
   // If left blank, typical defaults are used
   vlcPath: "C:\\Program Files\\VideoLAN\\VLC\\vlc.exe",
-  
+
   debug : "false",
 
+
   console: {
     // Sets the "Presence Updated" text to off or on
     presencestate : false,

src/helpers/lager.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const VLC = require('vlc.js');
-const { vlc } = require('./configLoader.js').getOrInit();
+const { vlc } = require('./configLoader.js').getOrInit('config.js');
 
 const client = new VLC.VLCClient(vlc);
 const destination = path.join(__dirname, '/../../logs/');

src/rpc/client.js

@@ -3,7 +3,7 @@
  */
 
 const RPC = require('discord-rpc');
-const config = require('../helpers/configLoader.js').getOrInit();
+const config = require('../helpers/configLoader.js').getOrInit('config.js');
 const diff = require('../vlc/diff.js');
 const format = require('./format.js');
 const log = require('../helpers/lager.js');

src/rpc/format.js

@@ -5,10 +5,10 @@
 
 const fs = require('fs');
 const log = require('../helpers/lager.js');
-const config = require('../helpers/configLoader.js').getOrInit();
+const config = require('../helpers/configLoader.js').getOrInit('config.js');
 const axios = require('axios');
 const yt = require("ytsr");
-const path = require("path")
+const path = require("path");
 
 let musichoardersFetcher = new (require('./musichoardersFetcher.js'))(config.rpc.persistentMusicHoardersCache);
 

src/vlc/diff.js

@@ -4,7 +4,7 @@
  */
 const VLC = require('vlc.js');
 const log = require('../helpers/lager.js');
-const config = require('../helpers/configLoader.js').getOrInit();
+const config = require('../helpers/configLoader.js').getOrInit('config.js');
 
 // VLC server (8080) detection status
 var detectVlc = true;