1 files changed, 133 insertions, 32 deletions

diff --git a/common/log.cpp b/common/log.cpp
index 45bbec1..96c6f82 100644
--- a/common/log.cpp
+++ b/common/log.cpp
@@ -3,11 +3,19 @@
 #include <QString>
 #include <QIODevice>
 #include <QCoreApplication>
+#include <QSettings>
+#include <QStandardPaths>
+#include <QSharedPointer>
 #include <iostream>
 #include <unistd.h>
 
 using namespace Sink::Log;
 
+static QSharedPointer<QSettings> config()
+{
+    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/log.ini", QSettings::IniFormat);
+}
+
 class DebugStream: public QIODevice
 {
 public:
@@ -17,24 +25,24 @@ public:
     {
         open(WriteOnly);
     }
-    virtual ~DebugStream(){};
+    virtual ~DebugStream();
 
     bool isSequential() const { return true; }
     qint64 readData(char *, qint64) { return 0; /* eof */ }
     qint64 readLineData(char *, qint64) { return 0; /* eof */ }
     qint64 writeData(const char *data, qint64 len)
     {
-        const QByteArray buf = QByteArray::fromRawData(data, len);
-        // if (!qgetenv("IMAP_TRACE").isEmpty()) {
-            // qt_message_output(QtDebugMsg, buf.trimmed().constData());
-            std::cout << buf.trimmed().constData() << std::endl;
-        // }
+        std::cout << data << std::endl;
         return len;
     }
 private:
     Q_DISABLE_COPY(DebugStream)
 };
 
+//Virtual method anchor
+DebugStream::~DebugStream()
+{}
+
 class NullStream: public QIODevice
 {
 public:
@@ -43,7 +51,7 @@ public:
     {
         open(WriteOnly);
     }
-    virtual ~NullStream(){};
+    virtual ~NullStream();
 
     bool isSequential() const { return true; }
     qint64 readData(char *, qint64) { return 0; /* eof */ }
@@ -56,6 +64,10 @@ private:
     Q_DISABLE_COPY(NullStream)
 };
 
+//Virtual method anchor
+NullStream::~NullStream()
+{}
+
     /*
      * ANSI color codes:
      * 0: reset colors/style
@@ -130,31 +142,95 @@ DebugLevel Sink::Log::debugLevelFromName(const QByteArray &name)
 
 void Sink::Log::setDebugOutputLevel(DebugLevel debugLevel)
 {
-    qputenv("SINKDEBUGLEVEL", debugLevelName(debugLevel));
+    config()->setValue("level", debugLevel);
 }
 
 Sink::Log::DebugLevel Sink::Log::debugOutputLevel()
 {
-    return debugLevelFromName(qgetenv("SINKDEBUGLEVEL"));
+    return static_cast<Sink::Log::DebugLevel>(config()->value("level", Sink::Log::Log).toInt());
+}
+
+void Sink::Log::setDebugOutputFilter(FilterType type, const QByteArrayList &filter)
+{
+    switch (type) {
+        case ApplicationName:
+            config()->setValue("applicationfilter", QVariant::fromValue(filter));
+            break;
+        case Area:
+            config()->setValue("areafilter", QVariant::fromValue(filter));
+            break;
+    }
+}
+
+QByteArrayList Sink::Log::debugOutputFilter(FilterType type)
+{
+    switch (type) {
+        case ApplicationName:
+            return config()->value("applicationfilter").value<QByteArrayList>();
+        case Area:
+            return config()->value("areafilter").value<QByteArrayList>();
+    }
+}
+
+void Sink::Log::setDebugOutputFields(const QByteArrayList &output)
+{
+    config()->setValue("outputfields", QVariant::fromValue(output));
+}
+
+QByteArrayList Sink::Log::debugOutputFields()
+{
+    return config()->value("outputfields").value<QByteArrayList>();
+}
+
+static QByteArray getProgramName()
+{
+    if (QCoreApplication::instance()) {
+        return QCoreApplication::instance()->applicationName().toLocal8Bit();
+    } else {
+        return "<unknown program name>";
+    }
+}
+
+static bool containsItemStartingWith(const QByteArray &pattern, const QByteArrayList &list)
+{
+    for (const auto &item : list) {
+        if (pattern.startsWith(item)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+static bool caseInsensitiveContains(const QByteArray &pattern, const QByteArrayList &list)
+{
+    for (const auto &item : list) {
+        if (item.toLower() == pattern) {
+            return true;
+        }
+    }
+    return false;
 }
 
 QDebug Sink::Log::debugStream(DebugLevel debugLevel, int line, const char* file, const char* function, const char* debugArea)
 {
-    DebugLevel debugOutputLevel = debugLevelFromName(qgetenv("SINKDEBUGLEVEL"));
-    if (debugLevel < debugOutputLevel) {
-        static NullStream stream;
-        return QDebug(&stream);
+    static NullStream nullstream;
+    if (debugLevel < debugOutputLevel()) {
+        return QDebug(&nullstream);
     }
 
-    static DebugStream stream;
-    QDebug debug(&stream);
+    auto areas = debugOutputFilter(Sink::Log::Area);
+    if (debugArea && !areas.isEmpty()) {
+        if (!containsItemStartingWith(debugArea, areas)) {
+            return QDebug(&nullstream);
+        }
+    }
+    static QByteArray programName = getProgramName();
 
-    static QByteArray programName;
-    if (programName.isEmpty()) {
-        if (QCoreApplication::instance())
-            programName = QCoreApplication::instance()->applicationName().toLocal8Bit();
-        else
-            programName = "<unknown program name>";
+    auto filter = debugOutputFilter(Sink::Log::ApplicationName);
+    if (!filter.isEmpty() && !filter.contains(programName)) {
+        if (!containsItemStartingWith(programName, filter)) {
+            return QDebug(&nullstream);
+        }
     }
 
     QString prefix;
@@ -175,29 +251,54 @@ QDebug Sink::Log::debugStream(DebugLevel debugLevel, int line, const char* file,
             prefix = "Error:  ";
             prefixColorCode = ANSI_Colors::Red;
             break;
-        default:
-            break;
     };
 
-    bool showLocation = false;
-    bool showProgram = true;
+    auto debugOutput = debugOutputFields();
+
+    bool showLocation = debugOutput.isEmpty() ? false : caseInsensitiveContains("location", debugOutput);
+    bool showFunction = debugOutput.isEmpty() ? false : caseInsensitiveContains("function", debugOutput);
+    bool showProgram = debugOutput.isEmpty() ? false : caseInsensitiveContains("application", debugOutput);
+    bool useColor = true;
+    bool multiline = false;
 
     const QString resetColor = colorCommand(ANSI_Colors::Reset);
     QString output;
-    output += colorCommand(QList<int>() << ANSI_Colors::Bold << prefixColorCode) + prefix + resetColor;
+    if (useColor) {
+        output += colorCommand(QList<int>() << ANSI_Colors::Bold << prefixColorCode);
+    }
+    output += prefix;
+    if (useColor) {
+        output += resetColor;
+    }
     if (showProgram) {
-        output += QString(" %1(%2)").arg(QString::fromLatin1(programName)).arg(unsigned(getpid()));
+        int width = 10;
+        output += QString(" %1(%2)").arg(QString::fromLatin1(programName).leftJustified(width, ' ', true)).arg(unsigned(getpid())).rightJustified(width + 8, ' ');
     }
     if (debugArea) {
-        output += colorCommand(QList<int>() << ANSI_Colors::Bold << prefixColorCode) + QString(" %1 ").arg(QString::fromLatin1(debugArea)) + resetColor;
+        if (useColor) {
+            output += colorCommand(QList<int>() << ANSI_Colors::Bold << prefixColorCode);
+        }
+        output += QString(" %1 ").arg(QString::fromLatin1(debugArea).leftJustified(25, ' ', true));
+        if (useColor) {
+            output += resetColor;
+        }
+    }
+    if (showFunction) {
+        output += QString(" %3").arg(QString::fromLatin1(function).leftJustified(25, ' ', true));
     }
     if (showLocation) {
-        output += QString(" %3").arg(function);
-        output += QString("%1:%2").arg(file).arg(line);
+        const auto filename = QString::fromLatin1(file).split('/').last();
+        output += QString(" %1:%2").arg(filename.right(25)).arg(QString::number(line).leftJustified(4, ' ')).leftJustified(30, ' ', true);
+    }
+    if (multiline) {
+        output += "\n  ";
     }
     output += ":";
 
-    debug << output;
+    static DebugStream stream;
+    QDebug debug(&stream);
+
+    debug.noquote().nospace() << output;
 
-    return debug;
+    return debug.space().quote();
 }