Add timestamps to split parts

Signed-off-by: Viktor Kopp <vifactor@gmail.com>

Author: vifactor

commander/dltfileexporter.cpp

@@ -1,6 +1,7 @@
 #include "dltfileexporter.h"
 #include "qdltmsg.h"
 
+#include <ctime>
 #include <cstddef>
 #include <qdltfilterlist.h>
 #include <qdltfile.h>
@@ -10,7 +11,6 @@
 #include <QFileInfo>
 #include <QDir>
 #include <stdexcept>
-#include <variant>
 
 namespace {
 
@@ -36,7 +36,7 @@ class SimpleWriter {
         m_output.setFileName(outputPath);
     }
 
-    void write(const QByteArray& buf) {
+    void write(const QByteArray& buf, const time_t&) {
         m_output.write(buf);
     }
 
@@ -49,26 +49,56 @@ class SplitWriter {
     SplitWriter(const QString& basePath, std::size_t maxOutputSize)
       : m_basePath(basePath), m_bytesWritten{maxOutputSize}, m_maxOutputSize{maxOutputSize} {}
 
-    void write(const QByteArray& buf) {
+    ~SplitWriter() {
+        if (m_output.isOpen()) {
+            // rename very last file
+            m_output.rename(nextFileName());
+        }
+    }
+
+    void write(const QByteArray& buf, const time_t& ts) {
         if (m_bytesWritten >= m_maxOutputSize) {
-            m_output.close();
-            m_output.setFileName(m_basePath + QString::number(m_fileCounter) + ".dlt");
+            if (m_output.isOpen()) {
+                m_output.rename(nextFileName());
+                m_output.close();
+            }
+
+            m_output.setFileName(m_basePath + "_tmp.dlt");
             if (!m_output.open(QIODevice::WriteOnly)) {
                 qDebug() << "Couldn't open output file: " << m_output.fileName();
                 throw std::runtime_error("File couldn't be opened for writing");
             }
             m_bytesWritten = 0;
             ++m_fileCounter;
+            m_timestampBegin = formatTimestamp(ts);
         }
         m_output.write(buf);
         m_bytesWritten += buf.size();
+        m_timestampEnd = formatTimestamp(ts);
     }
 private:
     QFile m_output;
     QString m_basePath;
     std::size_t m_bytesWritten;
-    std::size_t m_fileCounter{1};
+    std::size_t m_fileCounter{0};
     std::size_t m_maxOutputSize;
+
+    QString m_timestampBegin;
+    QString m_timestampEnd;
+
+    QString nextFileName() {
+        return m_basePath + "_" + m_timestampBegin + "-" + m_timestampEnd + "_" +
+               QString::number(m_fileCounter) + ".dlt";
+    }
+
+    QString formatTimestamp(const time_t& timestamp) {
+        char strtime[256];
+        struct tm *timeTm;
+        timeTm = localtime(&timestamp);
+        if(timeTm)
+            strftime(strtime, 256, "%Y-%m-%d_%H-%M-%S", timeTm);
+        return QString(strtime);
+    }
 };
 
 template <typename Writer>
@@ -80,7 +110,7 @@ void processMessages(const QDltFile& m_input, QDltFilterList& filterList, Writer
         }
         auto [msg, buf] = *res;
         if (filterList.isEmpty() || filterList.checkFilter(msg)) {
-            writer.write(buf);
+            writer.write(buf, msg.getTime());
         }
     }
 }
@@ -117,7 +147,7 @@ void DltFileExporter::exportMessages(const QString& outputName)
 
             const QFileInfo filterInfo(filterFilepath);
             if (m_maxOutputSize) {
-                SplitWriter writer(outputDir + "/" + filterInfo.baseName() + "_", *m_maxOutputSize);
+                SplitWriter writer(outputDir + "/" + filterInfo.baseName(), *m_maxOutputSize);
                 processMessages(m_input, filterList, writer);
             } else {
                 SimpleWriter writer(outputDir + "/" + filterInfo.baseName() + ".dlt");
@@ -134,7 +164,7 @@ void DltFileExporter::exportMessages(const QString& outputName)
 
         const QFileInfo info(outputName);
         if (m_maxOutputSize) {
-            SplitWriter writer(info.absolutePath() + "/" + info.baseName() + "_", *m_maxOutputSize);
+            SplitWriter writer(info.absolutePath() + "/" + info.baseName(), *m_maxOutputSize);
             processMessages(m_input, filterList, writer);
         } else {
             SimpleWriter writer(outputName);

commander/optmanager.cpp

@@ -134,7 +134,7 @@ void OptManager::printUsage()
     qDebug().noquote() << executable << "input.pcap output.dlt";
     qDebug().noquote() << executable << "-c output.txt input.pcap";
     qDebug().noquote() << executable << "-c output.txt input1.mf4 input2.mf4";
-    qDebug().noquote() << executable << "-split 100K c:\\trace\\trace.dlt\n";
+    qDebug().noquote() << executable << "-d -split 100K c:\\trace\\trace.dlt\n -c output.dlt";
 }
 
 void OptManager::parse(QStringList *opt)