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

Merge pull request #139 from skynetim/storage 

Remove some sync calls from localfilesystem.js.
This commit is contained in:
Nick O'Leary 2014-02-02 12:22:23 -08:00
parent e19f2956a8 288b129ec3
commit 2afe474ec8
2 changed files with 50 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -10,7 +10,8 @@
}, },
"main" : "red/red.js", "main" : "red/red.js",
"scripts" : { "scripts" : {
"start": "node red.js" "start": "node red.js",
"test": "mocha test"
}, },
"contributors": [ "contributors": [
{"name": "Nick O'Leary"}, {"name": "Nick O'Leary"},
@ -33,7 +34,8 @@
"xml2js":"~0.2.8", "xml2js":"~0.2.8",
"sentiment":"~0.2.1", "sentiment":"~0.2.1",
"irc":"~0.3.6", "irc":"~0.3.6",
"follow-redirects":"~0.0.3" "follow-redirects":"~0.0.3",
"mkdirp":"~0.3.5"
}, },
"devDependencies": { "devDependencies": {
"mocha": "~1.12.0", "mocha": "~1.12.0",

182
red/storage/localfilesystem.js
View File

@ -16,8 +16,13 @@
var fs = require('fs'); var fs = require('fs');
var when = require('when'); var when = require('when');
var nodeFn = require('when/node/function');
var keys = require('when/keys');
var util = require('util'); var util = require('util');
var fspath = require("path"); var fspath = require("path");
var mkdirp = require("mkdirp");
var promiseDir = nodeFn.lift(mkdirp);
var settings; var settings;
var flowsFile; var flowsFile;
@ -31,19 +36,21 @@ function listFiles(dir) {
var dirs = {}; var dirs = {};
var files = []; var files = [];
var dirCount = 0; var dirCount = 0;
fs.readdirSync(dir).sort().filter(function(fn) { return nodeFn.call(fs.readdir, dir).then(function (contents) {
contents.sort().forEach(function(fn) {
var stats = fs.lstatSync(dir+"/"+fn); var stats = fs.lstatSync(dir+"/"+fn);
if (stats.isDirectory()) { if (stats.isDirectory()) {
dirCount += 1; dirCount += 1;
dirs[fn] = listFiles(dir+"/"+fn); dirs[fn] = listFiles(dir+"/"+fn)
} else { } else {
files.push(fn.split(".")[0]); files.push(fn.split(".")[0]);
} }
}); })
var result = {}; var result = {};
if (dirCount > 0) { result.d = dirs; } if (dirCount > 0) { result.d = keys.all(dirs); }
if (files.length > 0) { result.f = files; } if (files.length > 0) { result.f = when.resolve(files); }
return result; return keys.all(result);
})
} }
function getFileMeta(root,path) { function getFileMeta(root,path) {
@ -116,24 +123,16 @@ function getFileBody(root,path) {
function writeFile(root,path,meta,body,res) { function writeFile(root,path,meta,body,res) {
var fn = fspath.join(root,path); var fn = fspath.join(root,path);
var parts = path.split("/");
var dirname = root;
for (var i = 0;i<parts.length-1;i+=1) {
dirname = fspath.join(dirname,parts[i]);
if (!fs.existsSync(dirname)) {
fs.mkdirSync(dirname);
}
}
var headers = ""; var headers = "";
for (var i in meta) { for (var i in meta) {
headers += "// "+i+": "+meta[i]+"\n"; headers += "// "+i+": "+meta[i]+"\n";
} }
fs.writeFile(fn,headers+body,function(err) { mkdirp(fspath.dirname(fn), function (err) {
//TODO: handle error fs.writeFile(fn,headers+body,function(err) {
res.writeHead(204, {'Content-Type': 'text/plain'}); //TODO: handle error
res.end(); res.writeHead(204, {'Content-Type': 'text/plain'});
res.end();
});
}); });
} }
@ -153,33 +152,17 @@ var localfilesystem = {
libDir = fspath.join(userDir,"lib"); libDir = fspath.join(userDir,"lib");
libFlowsDir = fspath.join(libDir,"flows"); libFlowsDir = fspath.join(libDir,"flows");
if (!fs.existsSync(libDir)) { return promiseDir(libFlowsDir);
fs.mkdirSync(libDir);
}
if (!fs.existsSync(libFlowsDir)) {
fs.mkdirSync(libFlowsDir);
}
var defer = when.defer();
defer.resolve();
return defer.promise;
}, },
getFlows: function() { getFlows: function() {
var defer = when.defer(); var defer = when.defer();
fs.exists(flowsFullPath, function(exists) { fs.exists(flowsFullPath, function(exists) {
if (exists) { if (exists) {
util.log("[red] Loading flows : "+flowsFile); util.log("[red] Loading flows : "+flowsFile);
fs.readFile(flowsFullPath,'utf8',function(err,data) { defer.resolve(nodeFn.call(fs.readFile,flowsFullPath,'utf8').then(function(data) {
if (err) { return JSON.parse(data);
defer.reject(err); }));
} else {
try {
defer.resolve(JSON.parse(data));
} catch(err) {
defer.reject(err);
}
}
});
} else { } else {
util.log("[red] Flows file not found : "+flowsFile ); util.log("[red] Flows file not found : "+flowsFile );
defer.resolve([]); defer.resolve([]);
@ -188,32 +171,16 @@ var localfilesystem = {
return defer.promise; return defer.promise;
}, },
saveFlows: function(flows) { saveFlows: function(flows) {
var defer = when.defer(); return nodeFn.call(fs.writeFile, flowsFullPath, JSON.stringify(flows));
fs.writeFile(flowsFullPath, JSON.stringify(flows), function(err) {
if(err) {
defer.reject(err);
} else {
defer.resolve();
}
});
return defer.promise;
}, },
getCredentials: function() { getCredentials: function() {
var defer = when.defer(); var defer = when.defer();
fs.exists(credentialsFile, function(exists) { fs.exists(credentialsFile, function(exists) {
if (exists) { if (exists) {
fs.readFile(credentialsFile,'utf8',function(err,data) { defer.resolve(nodeFn.call(fs.readFile, credentialsFile, 'utf8').then(function(data) {
if (err) { return JSON.parse(data)
defer.reject(err); }));
} else {
try {
defer.resolve(JSON.parse(data));
} catch(err) {
defer.reject(err);
}
}
});
} else { } else {
defer.resolve({}); defer.resolve({});
} }
@ -222,21 +189,11 @@ var localfilesystem = {
}, },
saveCredentials: function(credentials) { saveCredentials: function(credentials) {
var defer = when.defer(); return nodeFn.call(fs.writeFile, credentialsFile, JSON.stringify(credentials))
fs.writeFile(credentialsFile, JSON.stringify(credentials), function(err) {
if(err) {
defer.reject(err);
} else {
defer.resolve();
}
});
return defer.promise;
}, },
getAllFlows: function() { getAllFlows: function() {
var defer = when.defer(); return listFiles(libFlowsDir);
defer.resolve(listFiles(libFlowsDir));
return defer.promise;
}, },
getFlow: function(fn) { getFlow: function(fn) {
@ -245,13 +202,7 @@ var localfilesystem = {
var file = fspath.join(libFlowsDir,fn+".json"); var file = fspath.join(libFlowsDir,fn+".json");
fs.exists(file, function(exists) { fs.exists(file, function(exists) {
if (exists) { if (exists) {
fs.readFile(file,'utf8',function(err,data) { defer.resolve(nodeFn.call(fs.readFile,file,'utf8'));
if (err) {
defer.reject(err);
} else {
defer.resolve(data);
}
});
} else { } else {
defer.reject(); defer.reject();
} }
@ -261,45 +212,23 @@ var localfilesystem = {
}, },
saveFlow: function(fn,data) { saveFlow: function(fn,data) {
var defer = when.defer();
var file = fspath.join(libFlowsDir,fn+".json"); var file = fspath.join(libFlowsDir,fn+".json");
var parts = file.split("/"); return promiseDir(fspath.dirname(file)).then(function () {
for (var i = 0;i<parts.length;i+=1) { return nodeFn.call(fs.writeFile, file, data);
var dirname = parts.slice(0,i).join("/");
if (dirname != "" ){
if (!fs.existsSync(dirname)) {
fs.mkdirSync(dirname);
}
}
}
fs.writeFile(file,data,function(err) {
if (err) {
defer.reject(err);
} else {
defer.resolve();
}
}); });
return defer.promise;
}, },
getLibraryEntry: function(type,path) { getLibraryEntry: function(type,path) {
var defer = when.defer();
var root = fspath.join(libDir,type); var root = fspath.join(libDir,type);
if (!fs.existsSync(root)) {
fs.mkdirSync(root);
}
var rootPath = fspath.join(libDir,type,path); var rootPath = fspath.join(libDir,type,path);
return promiseDir(root).then(function () {
fs.lstat(rootPath,function(err,stats) { return nodeFn.call(fs.lstat, rootPath).then(function(stats) {
if (err) { if (stats.isFile()) return getFileBody(root,path);
defer.reject(err);
} else if (stats.isFile()) {
defer.resolve(getFileBody(root,path));
} else {
if (path.substr(-1) == '/') { if (path.substr(-1) == '/') {
path = path.substr(0,path.length-1); path = path.substr(0,path.length-1);
} }
fs.readdir(rootPath,function(err,fns) { return nodeFn.call(fs.readdir, rootPath).then(function(fns) {
var dirs = []; var dirs = [];
var files = []; var files = [];
fns.sort().filter(function(fn) { fns.sort().filter(function(fn) {
@ -317,41 +246,22 @@ var localfilesystem = {
} }
}); });
defer.resolve(dirs.concat(files)); return dirs.concat(files);
}); });
} });
}); });
return defer.promise;
}, },
saveLibraryEntry: function(type,path,meta,body) { saveLibraryEntry: function(type,path,meta,body) {
var defer = when.defer(); var fn = fspath.join(libDir, type, path);
var root = fspath.join(libDir,type);
if (!fs.existsSync(root)) {
fs.mkdirSync(root);
}
var fn = fspath.join(root,path);
var parts = path.split("/");
var dirname = root;
for (var i=0;i<parts.length-1;i+=1) {
dirname = fspath.join(dirname,parts[i]);
if (!fs.existsSync(dirname)) {
fs.mkdirSync(dirname);
}
}
var headers = ""; var headers = "";
for (var i in meta) { for (var i in meta) {
headers += "// "+i+": "+meta[i]+"\n"; headers += "// "+i+": "+meta[i]+"\n";
} }
fs.writeFile(fn,headers+body,function(err) {
if (err) { return promiseDir(fspath.dirname(fn)).then(function () {
defer.reject(err); nodeFn.call(fs.writeFile, fn, headers+body);
} else {
defer.resolve();
}
}); });
return defer.promise;
} }
}; };