fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use v8 to parse settings.json

This commit is contained in:
Marcel Klehr 2012-07-08 18:59:46 +02:00
parent 9ff3aa0ee0
commit 4c8f69b7c5
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/node/utils/Settings.js
View File

@ -24,6 +24,7 @@ var os = require("os");
var path = require('path'); var path = require('path');
var argv = require('./Cli').argv; var argv = require('./Cli').argv;
var npm = require("npm/lib/npm.js"); var npm = require("npm/lib/npm.js");
var vm = require('vm');
/* Root path of the installation */ /* Root path of the installation */
exports.root = path.normalize(path.join(npm.dir, "..")); exports.root = path.normalize(path.join(npm.dir, ".."));
@ -45,6 +46,7 @@ exports.dbType = "dirty";
* This setting is passed with dbType to ueberDB to set up the database * This setting is passed with dbType to ueberDB to set up the database
*/ */
exports.dbSettings = { "filename" : path.join(exports.root, "dirty.db") }; exports.dbSettings = { "filename" : path.join(exports.root, "dirty.db") };
/** /**
* The default Text of a new pad * The default Text of a new pad
*/ */
@ -102,33 +104,25 @@ exports.abiwordAvailable = function()
// Discover where the settings file lives // Discover where the settings file lives
var settingsFilename = argv.settings || "settings.json"; var settingsFilename = argv.settings || "settings.json";
if (settingsFilename.charAt(0) != '/') { settingsFilename = path.resolve(path.join(root, settingsFilename));
settingsFilename = path.normalize(path.join(root, settingsFilename));
}
var settingsStr var settingsStr;
try{ try{
//read the settings sync //read the settings sync
settingsStr = fs.readFileSync(settingsFilename).toString(); settingsStr = fs.readFileSync(settingsFilename);
} catch(e){ } catch(e){
console.warn('No settings file found. Using defaults.'); console.warn('No settings file found. Using defaults.');
settingsStr = '{}';
} }
//remove all comments
settingsStr = settingsStr.replace(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/gm,"").replace(/#.*/g,"").replace(/\/\/.*/g,"");
//try to parse the settings // try to parse the settings
var settings; var settings;
try try {
{ if(settingsStr) {
settings = JSON.parse(settingsStr); settings = vm.runInContext('exports = '+settingsStr, vm.createContext(), "settings.json");
} }
catch(e) }catch(e){
{ console.warn('There was an error processing your settings.json file. Using defaults.');
console.error("There is a syntax error in your settings.json file"); console.warn(e.message);
console.error(e.message);
process.exit(1);
} }
//loop trough the settings //loop trough the settings