Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix handling in file nodes when number is specified as file name #4267

Merged
merged 3 commits into from
Aug 14, 2023
Merged

Fix handling in file nodes when number is specified as file name #4267

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dd7713
Fix handling in file nodes when number is specified as file name
kazuhitoyokoi Aug 6, 2023
8a4128d
Fix handling in file nodes when 0 is specified as file name
kazuhitoyokoi Aug 14, 2023
3fd2b5f
Merge branch 'dev' into dev-tostring4filenodes
kazuhitoyokoi Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/node_modules/@node-red/nodes/core/storage/10-file.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ module.exports = function(RED) {
node.error(err,msg);
return done();
} else {
if (value) {
value = value.toString();
}
kazuhitoyokoi marked this conversation as resolved.
Show resolved Hide resolved
processMsg2(msg,nodeSend,value,done);
}
});
Expand Down Expand Up @@ -278,7 +281,6 @@ module.exports = function(RED) {
}
RED.nodes.registerType("file",FileNode);


function FileInNode(n) {
// Read a file
RED.nodes.createNode(this,n);
Expand Down Expand Up @@ -314,6 +316,9 @@ module.exports = function(RED) {
node.error(err,msg);
return done();
} else {
if (value) {
kazuhitoyokoi marked this conversation as resolved.
Show resolved Hide resolved
value = value.toString();
}
processMsg2(msg, nodeSend, (value || "").replace(/\t|\r|\n/g,''), nodeDone);
}
});
Expand Down
27 changes: 25 additions & 2 deletions test/nodes/core/storage/10-file_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ describe('file Nodes', function() {
});
});


it('should write to a file using RED.settings.fileWorkingDirectory', function(done) {
var flow = [{id:"fileNode1", type:"file", name: "fileNode", "filename":relativePathToFile, "appendNewline":false, "overwriteFile":true, wires: [["helperNode1"]]},
{id:"helperNode1", type:"helper"}];
Expand All @@ -145,7 +144,6 @@ describe('file Nodes', function() {
});
});


it('should write multi-byte string to a file', function(done) {
var flow = [{id:"fileNode1", type:"file", name: "fileNode", "filename":fileToTest, "appendNewline":false, "overwriteFile":true, wires: [["helperNode1"]]},
{id:"helperNode1", type:"helper"}];
Expand Down Expand Up @@ -447,6 +445,31 @@ describe('file Nodes', function() {
n1.receive({payload:"typedInput", _user_specified_filename:fileToTest});
});
});

it('should support number in msg._user_specified_filename', function (done) {
var flow = [{id:"fileNode1", type:"file", filename:"_user_specified_filename", filenameType:"msg", name:"fileNode", "appendNewline":false, "overwriteFile":true, wires:[["helperNode1"]]},
{id:"helperNode1", type:"helper"}];
helper.load(fileNode, flow, function () {
RED.settings.fileWorkingDirectory = resourcesDir;
var n1 = helper.getNode("fileNode1");
var n2 = helper.getNode("helperNode1");
n2.on("input", function (msg) {
try {
var fileToTest = path.join(resourcesDir, "123");
var f = fs.readFileSync(fileToTest);
f.should.have.length(4);
fs.unlinkSync(fileToTest);
msg.should.have.property("payload", "test");
done();
}
catch (e) {
done(e);
}
});
n1.receive({payload: "test", _user_specified_filename: 123});
});
});

it('should use env.TEST_FILE set in nodes typedInput', function(done) {
var flow = [{id:"fileNode1", type:"file", filename:"TEST_FILE", filenameType: "env", name: "fileNode", "appendNewline":true, "overwriteFile":true, wires: [["helperNode1"]]},
{id:"helperNode1", type:"helper"}];
Expand Down