node-red-contrib-fs-ops
Advanced tools
Comparing version 1.1.0 to 1.1.1
@@ -31,15 +31,2 @@ /** | ||
function getProperty(node, msg, name, type) { | ||
if (type === 'str') { | ||
return name; | ||
} else if (type === 'msg') { | ||
return RED.util.getMessageProperty(msg,name).toString(); | ||
} else if (type === 'flow') { | ||
return node.context().flow.get(name).toString(); | ||
} else if (type === 'global') { | ||
return node.context().global.get(name).toString(); | ||
} else { | ||
return undefined; | ||
} | ||
} | ||
@@ -72,7 +59,7 @@ function setProperty(node, msg, name, type, value) { | ||
var source = getProperty(node, msg, node.sourcePath, node.sourcePathType); | ||
var source = RED.util.evaluateNodeProperty(node.sourcePath, node.sourcePathType, node, msg); | ||
if ((source.length > 0) && (source.lastIndexOf(path.sep) != source.length-1)) { | ||
source += path.sep; | ||
} | ||
source += getProperty(node, msg, node.sourceFilename, node.sourceFilenameType); | ||
source += RED.util.evaluateNodeProperty(node.sourceFilename, node.sourceFlenameType, node, msg); | ||
@@ -106,7 +93,7 @@ var dest = getProperty(node, msg, node.destPath, node.destPathType); | ||
var pathname = getProperty(node, msg, node.path, node.pathType); | ||
var pathname = RED.util.evaluateNodeProperty(node.path, node.pathType, node, msg); | ||
if ((pathname.length > 0) && (pathname.lastIndexOf(path.sep) != pathname.length-1)) { | ||
pathname += path.sep; | ||
} | ||
pathname += getProperty(node, msg, node.filename, node.filenameType); | ||
pathname += RED.util.evaluateNodeProperty(node.sourceFilename, node.sourceFilenameType, node, msg); | ||
@@ -155,8 +142,8 @@ try { | ||
node.on("input", function(msg) { | ||
var pathname = getProperty(node, msg, node.path, node.pathType); | ||
try { | ||
var pathname = RED.util.evaluateNodeProperty(node.path, node.pathType, node, msg); | ||
if ((pathname.length > 0) && (pathname.lastIndexOf(path.sep) != pathname.length-1)) { | ||
pathname += path.sep; | ||
} | ||
pathname += getProperty(node, msg, node.filename, node.filenameType); | ||
pathname += RED.util.evaluateNodeProperty(node.filename, node.filenameType, node, msg); | ||
@@ -166,3 +153,3 @@ var mode = fs.F_OK; | ||
if (node.write) mode |= fs.W_OK; | ||
} catch (e) {console.log(e);} | ||
try { | ||
@@ -201,7 +188,7 @@ fs.accessSync(pathname, mode); | ||
var pathname = getProperty(node, msg, node.path, node.pathType); | ||
var pathname = RED.util.evaluateNodeProperty(node.path, node.pathType, node, msg); | ||
if ((pathname.length > 0) && (pathname.lastIndexOf(path.sep) != pathname.length-1)) { | ||
pathname += path.sep; | ||
} | ||
pathname += getProperty(node, msg, node.filename, node.filenameType); | ||
pathname += RED.util.evaluateNodeProperty(node.filename, node.filenameType, node, msg); | ||
@@ -234,3 +221,3 @@ var size = fs.statSync(pathname).size; | ||
var pathname = getProperty(node, msg, node.path, node.pathType); | ||
var pathname = RED.util.evaluateNodeProperty(node.path, node.pathType, node, msg); | ||
if ((pathname.length > 0) && (pathname.lastIndexOf(path.sep) != pathname.length-1)) { | ||
@@ -240,3 +227,3 @@ pathname += path.sep; | ||
var filter = getProperty(node, msg, node.filter, node.filterType); | ||
var filter = RED.util.evaluateNodeProperty(node.filter, node.filterType, node, msg); | ||
@@ -276,3 +263,3 @@ | ||
var pathname = getProperty(node, msg, node.path, node.pathType); | ||
var pathname = RED.util.evaluateNodeProperty(node.path, node.pathType, node, msg); | ||
if ((pathname.length > 0) && (pathname.lastIndexOf(path.sep) != pathname.length-1)) { | ||
@@ -321,7 +308,7 @@ pathname += path.sep; | ||
var pathname = getProperty(node, msg, node.path, node.pathType); | ||
var pathname = RED.util.evaluateNodeProperty(node.path, node.pathType, node, msg); | ||
if ((pathname.length > 0) && (pathname.lastIndexOf(path.sep) != pathname.length-1)) { | ||
pathname += path.sep; | ||
} | ||
pathname += getProperty(node, msg, node.prefix, node.prefixType); | ||
pathname += RED.util.evaluateNodeProperty(node.prefix, node.prefixType, node, msg); | ||
@@ -328,0 +315,0 @@ if (fs.mkdtempSync) { |
{ | ||
"name": "node-red-contrib-fs-ops", | ||
"version": "1.1.0", | ||
"version": "1.1.1", | ||
"description": "A node-red node to perform basic file system operations.", | ||
@@ -5,0 +5,0 @@ "dependencies": {}, |
35551
247