frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Load flows file from userDir when appropriate

This commit is contained in:
Nick O'Leary 2015-02-26 11:30:20 +00:00
parent 4d48c72146
commit f78a71e8ed
2 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
red.js
View File

@ -69,6 +69,10 @@ if (parsedArgs.settings) {
} else if (parsedArgs.userDir && fs.existsSync(path.join(parsedArgs.userDir,"settings.js"))) {
// User-specified userDir that contains a settings.js
settingsFile = path.join(parsedArgs.userDir,"settings.js");
} else {
if (fs.existsSync(path.join(process.env.NODE_RED_HOME,".config.json"))) {
// NODE_RED_HOME contains user data - use its settings.js
settingsFile = path.join(process.env.NODE_RED_HOME,"settings.js");
} else {
var userSettingsFile = path.join(process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE,".node-red","settings.js");
if (fs.existsSync(userSettingsFile)) {
@ -79,9 +83,11 @@ if (parsedArgs.settings) {
settingsFile = "./settings";
}
}
}
try {
var settings = require(settingsFile);
settings.settingsFile = settingsFile;
} catch(err) {
if (err.code == 'MODULE_NOT_FOUND') {
console.log("Unable to load settings file: "+settingsFile);

38
red/storage/localfilesystem.js
View File

@ -158,7 +158,23 @@ var localfilesystem = {
if (settings.flowFile) {
flowsFile = settings.flowFile;
if (flowsFile[0] == "/") {
// Absolute path
flowsFullPath = flowsFile;
} else if (flowsFile.substring(0,2) === "./") {
// Relative to cwd
flowsFullPath = fspath.join(process.cwd(),flowsFile);
} else {
if (fs.existsSync(fspath.join(process.cwd(),flowsFile))) {
// Found in cwd
flowsFullPath = fspath.join(process.cwd(),flowsFile);
} else {
// Use userDir
flowsFullPath = fspath.join(settings.userDir,flowsFile);
}
}
} else {
flowsFile = 'flows_'+require('os').hostname()+'.json';
flowsFullPath = fspath.join(settings.userDir,flowsFile);
@ -186,20 +202,20 @@ var localfilesystem = {
},
getFlows: function() {
var defer = when.defer();
return when.promise(function(resolve) {
log.info("User Directory : "+settings.userDir);
log.info("Flows file : "+flowsFullPath);
fs.exists(flowsFullPath, function(exists) {
if (exists) {
log.info("Loading flows : "+flowsFile);
defer.resolve(nodeFn.call(fs.readFile,flowsFullPath,'utf8').then(function(data) {
resolve(nodeFn.call(fs.readFile,flowsFullPath,'utf8').then(function(data) {
return JSON.parse(data);
}));
} else {
log.info("Creating new flows file : "+flowsFile );
defer.resolve([]);
log.info("Creating new flows file");
resolve([]);
}
});
return defer.promise;
});
},
saveFlows: function(flows) {
@ -218,25 +234,25 @@ var localfilesystem = {
},
getCredentials: function() {
var defer = when.defer();
return when.promise(function(resolve) {
fs.exists(credentialsFile, function(exists) {
if (exists) {
defer.resolve(nodeFn.call(fs.readFile, credentialsFile, 'utf8').then(function(data) {
resolve(nodeFn.call(fs.readFile, credentialsFile, 'utf8').then(function(data) {
return JSON.parse(data)
}));
} else {
fs.exists(oldCredentialsFile, function(exists) {
if (exists) {
defer.resolve(nodeFn.call(fs.readFile, oldCredentialsFile, 'utf8').then(function(data) {
resolve(nodeFn.call(fs.readFile, oldCredentialsFile, 'utf8').then(function(data) {
return JSON.parse(data)
}));
} else {
defer.resolve({});
resolve({});
}
});
}
});
return defer.promise;
});
},
saveCredentials: function(credentials) {