Moved configuration to json

.gitignore

@@ -12,3 +12,4 @@ logs
 results
 
 npm-debug.log
+node_modules/

apps/movies/index.js

@@ -22,8 +22,8 @@ exports.engine = 'jade';
 var express = require('express')
 , app = express()
 , fs = require('fs.extra')
-, ini = require('ini')
-, config = ini.parse(fs.readFileSync('./configuration/config.ini', 'utf-8'))
+, nconf = require('nconf')
+, config = require('../../configuration/config.json')
 , helper = require('../../lib/helpers.js')
 , functions = require('./movie-functions');
 

apps/movies/movie-functions.js

@@ -2,8 +2,7 @@ module.exports = {
 	loadItems: function (req,res){
 		var fs = require('fs')
 		, helper = require('../../lib/helpers.js')	
-		, ini = require('ini')
-		, config = ini.parse(fs.readFileSync('./configuration/config.ini', 'utf-8'))	
+		, config = require('../../configuration/config.json')
 		, dir = config.moviepath
 		, suffix = new RegExp("\.(avi|mkv|mpeg|mov|mp4)","g");
 
@@ -37,8 +36,7 @@ module.exports = {
 		, Encoder = require('node-html-encoder').Encoder
 		, encoder = new Encoder('entity')
 		, colors = require('colors')
-		, ini = require('ini')
-		, config = ini.parse(fs.readFileSync('./configuration/config.ini', 'utf-8'));	
+		, config = require('./configuration/config.json')
 
 		var dir = config.moviepath
 		, suffix = new RegExp("\.(avi|mkv|mpeg|mov|mp4)","g");
@@ -118,8 +116,7 @@ module.exports = {
 		, downloader = require('downloader')
 		, helper = require('../../lib/helpers.js')
 		, colors = require('colors')
-		, ini = require('ini')
-		, config = ini.parse(fs.readFileSync('./configuration/config.ini', 'utf-8'))
+		, config = require('./configuration/config.json')
 		, dblite = require('dblite');
 
 		// Variable defaults

apps/music/index.js

@@ -3,8 +3,7 @@
 var express = require('express')
 , app = express()
 , fs = require('fs.extra')
-, ini = require('ini')
-, config = ini.parse(fs.readFileSync('./configuration/config.ini', 'utf-8'))
+, config = require('../../configuration/config.json')
 , helper = require('../../lib/helpers.js')
 , functions = require('./music-functions');
 

apps/music/music-functions.js

@@ -1,9 +1,8 @@
 module.exports = {
 	loadItems: function(req,res){
 		var fs = require('fs')
-		, helper = require('../../lib/helpers.js')	
-		, ini = require('ini')
-		, config = ini.parse(fs.readFileSync('./configuration/config.ini', 'utf-8'))	
+		, helper = require('../../lib/helpers.js')
+		, config = require('../../configuration/config.json')
 		, dir = config.musicpath
 		, suffix = new RegExp("\.(mp3)","g");
 
@@ -36,8 +35,7 @@ module.exports = {
 		, Encoder = require('node-html-encoder').Encoder
 		, encoder = new Encoder('entity')
 		, helper = require('../../lib/helpers.js')
-		, ini = require('ini')
-		, config = ini.parse(fs.readFileSync('./configuration/config.ini', 'utf-8'))
+		, config = require('../../configuration/config.json')
 		, dblite = require('dblite');
 
 		var albumRequest = infoRequest
@@ -288,8 +286,7 @@ module.exports = {
 		, Encoder = require('node-html-encoder').Encoder
 		, encoder = new Encoder('entity')
 		, helper = require('../../lib/helpers.js')
-		, ini = require('ini')
-		, config = ini.parse(fs.readFileSync('./configuration/config.ini', 'utf-8'));
+		, config = require('./configuration/config.json');
 
 		var decodeTrack = encoder.htmlDecode(optionalParam)
 		, decodeAlbum = encoder.htmlDecode(infoRequest);

apps/settings/index.js

@@ -21,8 +21,7 @@ exports.engine = 'jade';
 var express = require('express')
 , app = express()
 , fs = require('fs')
-, ini = require('ini')
-, config = ini.parse(fs.readFileSync('./configuration/config.ini', 'utf-8'));
+, config = require('../../configuration/config.json')
 
 exports.index = function(req, res, next){	
 	var allThemes = new Array();

apps/settings/views/settings.jade

@@ -82,15 +82,15 @@ html(lang="en")
 					.row
 						span.label #{lingua.setting_keyboard}
 						.checkgroup
-							- if(onscreenkeyboard === 'yes')
-								input#yeskeyboard(name="usekeyboard",type="radio",value="yes",checked) 
+							- if(onscreenkeyboard == "true")
+								input#yeskeyboard(name="usekeyboard",type="radio",value="true",checked) 
 								label(for="yeskeyboard") #{lingua.setting_yes}
-								input#nokeyboard(name="usekeyboard",type="radio",value="no") 
+								input#nokeyboard(name="usekeyboard",type="radio",value="false") 
 								label(for="nokeyboard") #{lingua.setting_no}
 							- else
-								input#yeskeyboard(name="usekeyboard",type="radio",value="yes") 
+								input#yeskeyboard(name="usekeyboard",type="radio",value="true") 
 								label(for="yeskeyboard") #{lingua.setting_yes}
-								input#nokeyboard(name="usekeyboard",type="radio",value="no",checked) 
+								input#nokeyboard(name="usekeyboard",type="radio",value="false",checked) 
 								label(for="nokeyboard") #{lingua.setting_no}
 					.row
 						label #{lingua.setting_language}

apps/tv/index.js

@@ -34,8 +34,7 @@ var express = require('express')
 , Trakt = require('trakt')
 , trakt = new Trakt({username: 'mediacenterjs', password: 'mediacenterjs'})
 , colors = require('colors')
-, ini = require('ini')
-, config = ini.parse(fs.readFileSync('./configuration/config.ini', 'utf-8'));	
+, config = require('../../configuration/config.json')
 
 exports.index = function(req, res, next){	
 	var writePath = './public/tv/data/tvindex.js'

apps/weather/index.js

@@ -20,8 +20,7 @@
 var express = require('express')
 , app = express()
 , fs = require ('fs')
-, ini = require('ini')
-, config = ini.parse(fs.readFileSync('./configuration/config.ini', 'utf-8'));	
+, config = require('../../configuration/config.json')
 
 // Choose your render engine. The default choice is JADE:  http://jade-lang.com/
 exports.engine = 'jade';

configuration/config.json

@@ -0,0 +1,13 @@
+{
+	"moviepath":"",
+	"musicpath":"",
+	"tvpath":"",
+	"language":"",
+	"onscreenkeyboard":false,
+	"location":"",
+	"screensaver":"",
+	"theme":"",
+	"spotifyUser":"",
+	"spotifyPass":"",
+	"port":0
+}

index.js

@@ -23,8 +23,8 @@ var express = require('express')
 , lingua = require('lingua')
 , colors = require('colors')
 , rimraf = require('rimraf')
-, ini = require('ini')
-, config = ini.parse(fs.readFileSync('./configuration/config.ini', 'utf-8'))
+, nconf = require('nconf')
+, config = require('./configuration/config.json')
 , dblite = require('dblite')
 , http = require('http');
 
@@ -170,42 +170,44 @@ app.post('/submit', function(req, res){
 });
 
 function writeSettings(req, res, callback){
+	nconf.argv().env().file({file: './configuration/config.json'});
 	var incommingTheme = req.body.theme
 	if (incommingTheme.match(/\.(css)/)){
 		themeName = incommingTheme;
 	} else {
 		themeName = incommingTheme+'.css';
 	}
+	// TODO add input sanitization
+    nconf.set('moviepath', req.body.movielocation);
+	nconf.set('musicpath', req.body.musiclocation);
+	nconf.set('tvpath', req.body.tvlocation);
+	nconf.set('language', req.body.language);
+	nconf.set('onscreenkeyboard', req.body.usekeyboard);
+	nconf.set('location', req.body.location);
+	nconf.set('theme', themeName);
+	nconf.set('screensaver', req.body.screensaver);
+	nconf.set('spotifyUser', req.body.spotifyUser);
+	nconf.set('spotifyPass', req.body.spotifyPass);
+	nconf.set('port', req.body.port);
 
-    config.moviepath = req.body.movielocation,
-	config.musicpath = req.body.musiclocation,
-	config.tvpath = req.body.tvlocation,
-	config.language = req.body.language,
-	config.onscreenkeyboard = req.body.usekeyboard,
-	config.location = req.body.location,
-	config.theme = themeName,	
-	config.screensaver = req.body.screensaver,
-	config.spotifyUser= req.body.spotifyUser,
-	config.spotifyPass = req.body.spotifyPass,
-	config.port = req.body.port
-
-    fs.writeFile('./configuration/config.ini', ini.stringify(config), function(err){
-        if(err){
-            console.log('Error writing INI file.',err);  
-        } else{
+	nconf.save(function (error) {
+		if(error){
+			console.log('Error writing config file.',err);  
+		} else{
 			res.redirect('/');
-        }
-    });
+		}
+	});
 }
 
 app.set('port', process.env.PORT || 3000);
 
 // Open App socket
 if (config.port == "" || config.port == undefined ){
 	var defaultPort = app.get('port');
-	console.log('First run, Setup running on localhost:'+defaultPort);
+	console.log('First run, Setup running on localhost:' + defaultPort);
 	app.listen(parseInt(defaultPort));
 } else{
-	console.log("MediacenterJS listening on port:", config.port .green.bold); 
+	var message = "MediacenterJS listening on port:" + config.port;
+	console.log(message.green.bold);
 	app.listen(parseInt(config.port));
 }