frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix garbled characters in library (#2457)

Browse Source 
* update getFileBody

* add suitable unit tests

Co-authored-by: Hiroyuki Okada <ok.okada.hiroyuki@gmail.com>
This commit is contained in:
Kazuhito Yokoi
2020-02-13 01:35:33 +09:00
committed by GitHub
parent 634a51635c
commit 5c199d3bb4
2 changed files with 90 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/library.js vendored
View File

@@ -25,73 +25,54 @@ var settings;
var libDir;
var libFlowsDir;
function getFileMeta(root,path) {
var fn = fspath.join(root,path);
var fd = fs.openSync(fn,"r");
function getFileMeta(root, path) {
var fn = fspath.join(root, path);
var fd = fs.openSync(fn, 'r');
var size = fs.fstatSync(fd).size;
var meta = {};
var read = 0;
var length = 10;
var remaining = "";
var remaining = Buffer.alloc(0);
var buffer = Buffer.alloc(length);
while(read < size) {
read+=fs.readSync(fd,buffer,0,length);
var data = remaining+buffer.toString();
var parts = data.split("\n");
remaining = parts.splice(-1);
for (var i=0;i<parts.length;i+=1) {
var match = /^\/\/ (\w+): (.*)/.exec(parts[i]);
if (match) {
meta[match[1]] = match[2];
} else {
read = size;
break;
while (read < size) {
read += fs.readSync(fd, buffer, 0, length);
var data = Buffer.concat([remaining, buffer]);
var index = data.lastIndexOf(0x0a);
if (index !== -1) {
var parts = data.slice(0, index).toString().split('\n');
for (var i = 0; i < parts.length; i++) {
var match = /^\/\/ (\w+): (.*)/.exec(parts[i]);
if (match) {
meta[match[1]] = match[2];
} else {
read = size;
break;
}
}
remaining = data.slice(index + 1);
} else {
remaining = data;
}
}
fs.closeSync(fd);
return meta;
}
function getFileBody(root,path) {
var body = "";
var fn = fspath.join(root,path);
var fd = fs.openSync(fn,"r");
var size = fs.fstatSync(fd).size;
function getFileBody(root, path) {
var body = '';
var fn = fspath.join(root, path);
var data = fs.readFileSync(fn, 'utf8');
var parts = data.split('\n');
var scanning = true;
var read = 0;
var length = 50;
var remaining = "";
var buffer = Buffer.alloc(length);
while(read < size) {
var thisRead = fs.readSync(fd,buffer,0,length);
if (scanning) {
var data = remaining+buffer.slice(0,thisRead).toString();
read += thisRead;
var parts = data.split("\n");
if (read < size) {
remaining = parts.splice(-1)[0];
} else {
remaining = "";
}
for (var i=0;i<parts.length;i+=1) {
if (! /^\/\/ \w+: /.test(parts[i])) {
scanning = false;
body += (body.length > 0?"\n":"")+parts[i];
}
}
if (!scanning) {
body += remaining;
}
} else {
read += thisRead;
body += buffer.slice(0,thisRead).toString();
for (var i = 0; i < parts.length; i++) {
if (! /^\/\/ \w+: /.test(parts[i]) || !scanning) {
body += (body.length > 0 ? '\n' : '') + parts[i];
scanning = false;
}
}
fs.closeSync(fd);
return body;
}
function getLibraryEntry(type,path) {
var root = fspath.join(libDir,type);
var rootPath = fspath.join(libDir,type,path);