From f7434b5ec8ab8e1790d4f625d78d1e41dfcb552a Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 15 Jun 2018 13:25:05 +0100
Subject: [PATCH] Add output to File Out node and update icons

---
 editor/icons/file-in.png        | Bin 0 -> 542 bytes
 editor/icons/file-out.png       | Bin 0 -> 503 bytes
 nodes/core/storage/50-file.html |   7 ++---
 nodes/core/storage/50-file.js   |  47 ++++++++++++++++++++++----------
 4 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 editor/icons/file-in.png
 create mode 100644 editor/icons/file-out.png

diff --git a/editor/icons/file-in.png b/editor/icons/file-in.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3e5cd7fee68ea5d99fc0e644f4e5871f5badcd4
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq001Ze002A)1^@s66uJ1|00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10h>ugK~!jg?Uy}H!$1&5zkxs>i8G|(8mW+IIRpraW6&bOC1@!q
zLPM7;1c@sUQ4{efY|DvbC$_Ucme|*3yz{c2omoqXL?V$$IES88*0>+KAl@V$3i^?B
zEa+a+gP>bUPlE0wJqo&!^elL|WB|d#Bm)WdmkcP_PcpDzcgYBXjgq6z+uIT|GZ*U|
zxmd&}|4XoCtv$7=;ey&aX$p44iKJIa(=C~rx(zO9W(JHU%_U8$zg6R-)S#IyC0$Bd
z?u(6fNX+a*(v_suuDGbD*v#G}-F1Gj#}sHyL%!l<UwaemybGK8M!*dC0k%$ebiq95
z7+3&bz+_)=aKSw9Bo|zewW47O=DDY2uX+a5UuI$o=J{{(WgmxrS*X9V4dfNS1E+%$
zq&y^_z}c?A;DVHG<{LQQ7aUZOvQe*qi#88<qaj~0>TcWqqhNxREd^k!t3<i5uH~63
zyImIz`Pj^U2O&r{Z|9QMN7|8@ZRC#9sLAH+i#FwI2`)%BU!PU^9+9N#?n!ZW@If_S
gbcsYFkx2OA4+j@3u5bOyeE<Le07*qoM6N<$f(YB_RsaA1

literal 0
HcmV?d00001

diff --git a/editor/icons/file-out.png b/editor/icons/file-out.png
new file mode 100644
index 0000000000000000000000000000000000000000..051f819c8b442a1d1ed21543d565145dc839f074
GIT binary patch
literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq001Ze002A)1^@s66uJ1|00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10dz@3K~!jg?U%h#!$1&5-+Dv=Zo-u)C8Y?QPzEUh6hTTr00mG3
zO}GG<SpwNJ8n{FEvnxEzzEtwg^J>4-3W6XAg1{VY<Xer~a~D)MNkc&&Nn=5KNe4k&
zNhd)&Nk>5&NoT=+$rS|qBv%q_mt0Y>O>$+yddWW!%t{W`?JYz^#G=l|qKGH|O7LOn
zhSu3l&G3ojoMdjk0G@%d;!jnPn%iPQ5fN400&l?1UN0?JHG?8@04{-pmDCc|ArX;x
z;0pM(*ZIk&bXezz$SZKOf?xYFBO><{B)gl^u4R5ZsOn4a@$&02bGp#_YO+jrcZxGb
zU6XC{s&h?t&kQDN?X73<?3V?z4yx*?svp)J>`w7fZpW15ZEKC3L-!-r>6m$<Q!YoB
zpsEhQBTm~5%)UvM<}fn?cR22c(9uCv-2>N#E=j5u*4g!uX}dQ4D(v2<kJn5RTPj%f
th`ke=qF8W^#HOg}pnGD2AP9oMo-fy=$IR}84T=B&002ovPDHLkV1mPj)qVf~

literal 0
HcmV?d00001

diff --git a/nodes/core/storage/50-file.html b/nodes/core/storage/50-file.html
index cdb001eb6..eabf56a76 100644
--- a/nodes/core/storage/50-file.html
+++ b/nodes/core/storage/50-file.html
@@ -123,9 +123,8 @@
         },
         color:"BurlyWood",
         inputs:1,
-        outputs:0,
-        icon: "file.png",
-        align: "right",
+        outputs:1,
+        icon: "file-out.png",
         label: function() {
             if (this.overwriteFile === "delete") {
                 return this.name||this._("file.label.deletelabel",{file:this.filename});
@@ -159,7 +158,7 @@
         outputLabels: function(i) {
             return (this.format === "utf8") ? "UTF8 string" : "binary buffer";
         },
-        icon: "file.png",
+        icon: "file-in.png",
         label: function() {
             return this.name||this.filename||this._("file.label.filelabel");
         },
diff --git a/nodes/core/storage/50-file.js b/nodes/core/storage/50-file.js
index a0e49f6fc..76cedb136 100644
--- a/nodes/core/storage/50-file.js
+++ b/nodes/core/storage/50-file.js
@@ -39,14 +39,20 @@ module.exports = function(RED) {
                     node.tout = null;
                 },333);
             }
-            if (filename === "") { node.warn(RED._("file.errors.nofilename")); }
-            else if (node.overwriteFile === "delete") {
+            if (filename === "") {
+                node.warn(RED._("file.errors.nofilename"));
+            } else if (node.overwriteFile === "delete") {
                 fs.unlink(filename, function (err) {
-                    if (err) { node.error(RED._("file.errors.deletefail",{error:err.toString()}),msg); }
-                    else if (RED.settings.verbose) { node.log(RED._("file.status.deletedfile",{file:filename})); }
+                    if (err) {
+                        node.error(RED._("file.errors.deletefail",{error:err.toString()}),msg);
+                    } else {
+                        if (RED.settings.verbose) {
+                            node.log(RED._("file.status.deletedfile",{file:filename}));
+                        }
+                        node.send(msg);
+                    }
                 });
-            }
-            else if (msg.hasOwnProperty("payload") && (typeof msg.payload !== "undefined")) {
+            } else if (msg.hasOwnProperty("payload") && (typeof msg.payload !== "undefined")) {
                 var dir = path.dirname(filename);
                 if (node.createDir) {
                     try {
@@ -64,15 +70,21 @@ module.exports = function(RED) {
                 if (typeof data === "boolean") { data = data.toString(); }
                 if (typeof data === "number") { data = data.toString(); }
                 if ((node.appendNewline) && (!Buffer.isBuffer(data))) { data += os.EOL; }
-                node.data.push(Buffer.from(data));
+                node.data.push({msg:msg,data:Buffer.from(data)});
 
                 while (node.data.length > 0) {
                     if (node.overwriteFile === "true") {
-                        node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'w', autoClose:true });
-                        node.wstream.on("error", function(err) {
-                            node.error(RED._("file.errors.writefail",{error:err.toString()}),msg);
-                        });
-                        node.wstream.end(node.data.shift());
+                        (function(packet) {
+                            node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'w', autoClose:true });
+                            node.wstream.on("error", function(err) {
+                                node.error(RED._("file.errors.writefail",{error:err.toString()}),msg);
+                            });
+                            node.wstream.on("open", function() {
+                                node.wstream.end(packet.data, function() {
+                                    node.send(packet.msg);
+                                });
+                            })
+                        })(node.data.shift());
                     }
                     else {
                         // Append mode
@@ -115,10 +127,17 @@ module.exports = function(RED) {
                         }
                         if (node.filename) {
                             // Static filename - write and reuse the stream next time
-                            node.wstream.write(node.data.shift());
+                            var packet = node.data.shift()
+                            node.wstream.write(packet.data, function() {
+                                node.send(packet.msg);
+                            });
+
                         } else {
                             // Dynamic filename - write and close the stream
-                            node.wstream.end(node.data.shift());
+                            var packet = node.data.shift()
+                            node.wstream.end(packet.data, function() {
+                                node.send(packet.msg);
+                            });
                             delete node.wstream;
                             delete node.wstreamIno;
                         }