makes use of new line type in write calls; improved logic on when to write headers - no only writes on newly opened files.

Author: gigapod

src/Flux/flxFileRotate.cpp

@@ -72,7 +72,12 @@ bool flxFileRotate::openCurrentFile(void)
 
     _currentFilename = szBuffer;
 
-    return openLogFile(true); // send in true for append mode if file exists.
+    // If the file exists, no need to add a header.
+    bool bExists = _theFS->exists(szBuffer);
+    if (bExists)
+        _headerWritten = true;
+
+    return openLogFile(bExists); // send in true for append mode if file exists.
 }
 //------------------------------------------------------------------------------------------------
 // Open the next log file.
@@ -98,6 +103,9 @@ bool flxFileRotate::openNextLogFile()
 
     _secsFileOpen = flxClock.epoch();
 
+    // no header written to file yet...
+    _headerWritten = false;
+
     // send the new file event. Will persist prop values
     on_newFile.emit();
 
@@ -107,17 +115,17 @@ bool flxFileRotate::openNextLogFile()
 //------------------------------------------------------------------------------------------------
 void flxFileRotate::write(int value)
 {
-    write(flx_utils::to_string(value).c_str(), true);
+    write(flx_utils::to_string(value).c_str(), true, flxLineTypeData);
 }
 
 //------------------------------------------------------------------------------------------------
 void flxFileRotate::write(float value)
 {
-    write(flx_utils::to_string(value).c_str(), true);
+    write(flx_utils::to_string(value).c_str(), true, flxLineTypeData);
 }
 
 //------------------------------------------------------------------------------------------------
-void flxFileRotate::write(const char *value, bool newline)
+void flxFileRotate::write(const char *value, bool newline, flxLineType_t type)
 {
 
     if (!_theFS)
@@ -143,11 +151,27 @@ void flxFileRotate::write(const char *value, bool newline)
         if (!status)
             return;
     }
-    // Write the current line out
-    _currentFile.write((uint8_t *)value, strlen(value) + 1);
-    // add a cr if newline set
-    if (newline)
-        _currentFile.write((uint8_t *)"\n", 1);
+
+    // Data line? write it
+    if (type == flxLineTypeData)
+    {
+        // Write the current line out
+         _currentFile.write((uint8_t *)value, strlen(value) + 1);
+        // add a cr if newline set
+        if (newline)
+            _currentFile.write((uint8_t *)"\n", 1);
+    }
+    // if this is a header line, and we've not written a header, write it
+    else if (type == flxLineTypeHeader && !_headerWritten)
+    {
+        // Write the current line out
+         _currentFile.write((uint8_t *)value, strlen(value) + 1);
+        // add a cr if newline set
+        if (newline)
+            _currentFile.write((uint8_t *)"\n", 1);
+
+        _headerWritten = true; 
+    }
 
     // Will we need to rotate?
     if (flxClock.epoch() - _secsFileOpen() > _secsRotPeriod)

src/Flux/flxFileRotate.h

@@ -39,7 +39,7 @@ class flxFileRotate : public flxActionType<flxFileRotate>, public flxWriter
     }
 
   public:
-    flxFileRotate() : _currentFilename{""}, _theFS{nullptr}, _flushCount{0}, _secsRotPeriod{0}
+    flxFileRotate() : _currentFilename{""}, _theFS{nullptr}, _flushCount{0}, _secsRotPeriod{0}, _headerWritten{false}
     {
 
         setName("File Rotate",
@@ -61,7 +61,7 @@ class flxFileRotate : public flxActionType<flxFileRotate>, public flxWriter
 
     void write(int);
     void write(float);
-    void write(const char *, bool newline);
+    void write(const char *, bool newline, flxLineType_t type);
 
     void setFileSystem(flxIFileSystem *fs)
     {
@@ -107,4 +107,6 @@ class flxFileRotate : public flxActionType<flxFileRotate>, public flxWriter
     uint32_t _secsRotPeriod;
 
     flxFSFile _currentFile;
+
+    bool _headerWritten;
 };