Move header formatting from stream to logger

Author: flanglet

src/app/BlockDecompressor.cpp

@@ -89,8 +89,9 @@ int BlockDecompressor::decompress(uint64& inputSize)
 
     if (isStdIn == false) {
         vector<string> errors;
-        bool isRecursive = (_inputName.length() < 2) ||                                                                                                                  (_inputName[_inputName.length() - 2] != PATH_SEPARATOR) ||
-            (_inputName[_inputName.length() - 1] != '.');
+        bool isRecursive = (_inputName.length() < 2) ||
+                           (_inputName[_inputName.length() - 2] != PATH_SEPARATOR) ||
+                           (_inputName[_inputName.length() - 1] != '.');
         FileListConfig cfg = { isRecursive, _noLinks, false, _noDotFiles };
         createFileList(_inputName, files, cfg, errors);
 

src/app/InfoPrinter.cpp

@@ -17,6 +17,7 @@ limitations under the License.
 #include <ios>
 #include <sstream>
 #include "InfoPrinter.hpp"
+#include "../util.hpp"
 
 using namespace kanzi;
 using namespace std;
@@ -135,8 +136,34 @@ void InfoPrinter::processEvent(const Event& evt)
         delete bi;
         _map[hash(currentBlockId)] = nullptr;
     }
-    else if ((evt.getType() == Event::AFTER_HEADER_DECODING) && (_level >= 3)) {
-        _os << evt.toString() << endl;
+    else if (evt.getType() == Event::AFTER_HEADER_DECODING) {
+        if (_level >= 3) {
+            stringstream ss(evt.toString());
+            string s = ss.str();
+            vector<string> tokens;
+            const int nbTokens = tokenizeCSV(s, tokens);
+            ss.str(string());
+            
+            if (nbTokens > 1)
+                ss << "Bitstream version: " << tokens[1] << endl;
+
+            if (nbTokens > 2)
+                ss << "Block checksum: " << tokens[2] << (tokens[2] == "NONE" ? "" : " bits") << endl;
+
+            if (nbTokens > 3)
+                ss << "Block size: " << tokens[3] << " bytes" << endl;
+
+            if (nbTokens > 4)
+                ss << "Using " << (tokens[4] == "" ? "no" : tokens[4]) << " entropy codec (stage 1)" << endl;
+
+            if (nbTokens > 5)
+                ss << "Using " << (tokens[5] == "" ? "no" : tokens[5]) << " transform (stage 2)" << endl;
+
+            if (nbTokens > 7)
+                ss << "Original size: " << tokens[7] << " byte(s)" << endl;;
+
+            _os << ss.str() << endl;
+        }
     }
     else if (_level >= 5) {
         _os << evt.toString() << endl;

src/app/InfoPrinter.hpp

@@ -38,7 +38,8 @@ namespace kanzi
    public:
        enum Type {
            ENCODING,
-           DECODING
+           DECODING,
+           INFO
        };
 
        InfoPrinter(int infoLevel, InfoPrinter::Type type, OutputStream& os);
@@ -61,7 +62,7 @@ namespace kanzi
        Clock _clock12;
        Clock _clock23;
        Clock _clock34;
-	   
+
        static uint hash(uint id) { return (id * 0x1E35A7BD) & 0x03FF; }
    };
 }

src/io/CompressedInputStream.cpp

@@ -376,24 +376,27 @@ void CompressedInputStream::readHeader()
 
     if (_listeners.size() > 0) {
         stringstream ss;
-        ss << "Bitstream version: " << bsVersion << endl;
+        string inputName = _ctx.getString("inputName", "");
+        ss << inputName << ",";
+        ss << bsVersion << ",";
         string ckSize = "NONE";
 
         if (_hasher32 != nullptr)
-            ckSize = "32 bits";
+            ckSize = "32";
         else if (_hasher64 != nullptr)
-            ckSize = "64 bits";
+            ckSize = "64";
 
-        ss << "Block checksum: " << ckSize<< endl;
-        ss << "Block size: " << _blockSize << " bytes" << endl;
+        ss << ckSize << ",";
+        ss << _blockSize << ",";
         string w1 = EntropyDecoderFactory::getName(_entropyType);
-        ss << "Using " << ((w1 == "NONE") ? "no" : w1) << " entropy codec (stage 1)" << endl;
+        ss << ((w1 == "NONE") ? "" : w1) << ",";
         string w2 = TransformFactory<byte>::getName(_transformType);
-        ss << "Using " << ((w2 == "NONE") ? "no" : w2) << " transform (stage 2)" << endl;
+        ss << ((w2 == "NONE") ? "" : w2) << ",";
+        long fileSize = _ctx.getLong("fileSize", 0);
+        ss << fileSize << ",";
 
         if (szMask != 0) {
-            ss << "Original size: " << _outputSize;
-            ss << (_outputSize < 2 ? " byte" : " bytes") << endl;
+            ss << _outputSize << ",";
         }
 
         // Protect against future concurrent modification of the list of block listeners

src/util.hpp

@@ -18,7 +18,12 @@ limitations under the License.
 #define _util_
 
 
+#include <cstdlib>
+#include <iomanip>
 #include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
 #include "types.hpp"
 
 
@@ -42,5 +47,57 @@ struct istreambuf : public std::basic_streambuf<T, std::char_traits<T> >
     }
 };
 
-#endif
+inline int tokenizeCSV(std::string& s, std::vector<std::string>& tokens, char delim = ',')
+{
+    std::stringstream ss;
+    char prv = 0;
+
+    for (auto& c : s) {
+        if (c == delim) {
+            if (prv != '\\') {
+                std::string tk = ss.str();
+                tokens.push_back(tk);
+                ss.str("");
+                prv = 0;
+                continue;
+            }
+        }
+
+        ss << c;
+        prv = c;
+    }
+
+    std::string tk = ss.str();
 
+    if (tk.size() > 0)
+        tokens.push_back(tk);
+
+    return tokens.size();
+}
+
+inline std::string formatSize(const std::string& input)
+{           
+    double size = atof(input.c_str());;
+    std::stringstream ss;
+    std::string s = input;
+                  
+    if (size >= double(1 << 30)) {     
+       size /= double(1024 * 1024 * 1024);
+       ss << std::fixed << std::setprecision(2) << size << " GiB";
+       s = ss.str(); 
+    }             
+    else if (size >= double(1 << 20)) {
+       size  /= double(1024 * 1024);
+       ss << std::fixed << std::setprecision(2) << size << " MiB";
+       s = ss.str(); 
+    }
+    else if (size >= double(1 << 10)) {
+       size /= double(1024);
+       ss << std::fixed << std::setprecision(2) << size << " KiB";
+       s = ss.str();  
+    }
+                   
+   return s;   
+}
+
+#endif