From 55698e637d0ca04ac812b7cf2284c5035ca7f010 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 12 Jul 2019 12:22:13 +0100
Subject: [PATCH] Update tail node to accept/display regex.

To address Issue #555
---
 storage/tail/28-tail.html            | 6 +++---
 storage/tail/28-tail.js              | 4 ++--
 storage/tail/locales/ja/28-tail.html | 3 +--
 storage/tail/package.json            | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/storage/tail/28-tail.html b/storage/tail/28-tail.html
index 9910de31..08a5014c 100644
--- a/storage/tail/28-tail.html
+++ b/storage/tail/28-tail.html
@@ -25,8 +25,8 @@
 </script>
 
 <script type="text/x-red" data-help-name="tail">
-    <p>Tails (watches for things to be added) to the configured file. (Linux/Mac ONLY)</p>
-    <p>This will not work on Windows filesystems, as it relies on the <b>tail -F</b> command.</p>
+    <p>Tails (watches for things to be added) to the configured file.</p>
+    <p>Note: On Windows you may need to close the file between writes for any updates to be registered.</p>
     <h3>Outputs</h3>
     <ul>
         <li>Text (UTF-8) files will be returned as strings.</li>
@@ -40,7 +40,7 @@
         defaults: {
             name: {value:""},
             filetype: {value:"text"},
-            split: {value:"[\r]{0,1}\n"},
+            split: {value:"[\\r]{0,1}\\n"},
             filename: {value:"",required:true}
         },
         color:"BurlyWood",
diff --git a/storage/tail/28-tail.js b/storage/tail/28-tail.js
index 4fde885d..959b9457 100644
--- a/storage/tail/28-tail.js
+++ b/storage/tail/28-tail.js
@@ -9,7 +9,7 @@ module.exports = function(RED) {
 
         this.filename = n.filename;
         this.filetype = n.filetype || "text";
-        this.split = new RegExp(n.split || "[\r]{0,1}\n");
+        this.split = new RegExp(n.split.replace(/\\r/g,'\r').replace(/\\n/g,'\n').replace(/\\t/g,'\t') || "[\r]{0,1}\n");
         var node = this;
 
         var fileTail = function() {
@@ -42,7 +42,7 @@ module.exports = function(RED) {
             }
             else {
                 node.tout = setTimeout(function() { fileTail(); },10000);
-                node.warn(RED._("tail.errors.filenotfound") + node.filename);
+                node.warn(RED._("tail.errors.filenotfound") + ": "+node.filename);
             }
         }
 
diff --git a/storage/tail/locales/ja/28-tail.html b/storage/tail/locales/ja/28-tail.html
index 51303859..27adcbdb 100644
--- a/storage/tail/locales/ja/28-tail.html
+++ b/storage/tail/locales/ja/28-tail.html
@@ -15,8 +15,7 @@
 -->
 
 <script type="text/x-red" data-help-name="tail">
-    <p>設定したファイルの末尾を出力(追加されたデータを監視)します。(Linux/Macのみ)</p>
-    <p>このノードは<b>tail -F</b>コマンドを内部で利用しているため、Windowsファイルシステムでは動作しません。</p>
+    <p>設定したファイルの末尾を出力(追加されたデータを監視)します.</p>
     <h3>出力</h3>
     <ul>
         <li>(UTF-8形式の)テキストファイルは文字列を返却。</li>
diff --git a/storage/tail/package.json b/storage/tail/package.json
index 38fba264..bea82fe7 100644
--- a/storage/tail/package.json
+++ b/storage/tail/package.json
@@ -1,9 +1,9 @@
 {
     "name": "node-red-node-tail",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "description": "A node to tail files for Node-RED",
     "dependencies": {
-        "tail": "^2.0.0"
+        "tail": "^2.0.2"
     },
     "repository": {
         "type": "git",