From 38a7da300dc3681864fd4b69f4fab3c46b07c9c4 Mon Sep 17 00:00:00 2001 From: Filip Bucek Date: Mon, 25 Nov 2019 08:46:59 +0100 Subject: [PATCH] disabled color output for Windows --- src/serversdk/logger.cpp | 16 ++++++++++++++-- src/serversdk/logger.h | 3 +++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/serversdk/logger.cpp b/src/serversdk/logger.cpp index b4c0b3e..b79cb41 100644 --- a/src/serversdk/logger.cpp +++ b/src/serversdk/logger.cpp @@ -14,7 +14,11 @@ Q_LOGGING_CATEGORY(sdkdb, "sdk.db"); namespace serversdk { Logger* Logger::sConsumer = nullptr; -//bool Logger::sShowFunction = false; +#ifdef Q_OS_UNIX + bool Logger::mColorOutput = true; +#else + bool Logger::mColorOutput = false; +#endif void Logger::setConsumer(Logger *consumer) @@ -25,6 +29,7 @@ void Logger::setConsumer(Logger *consumer) Logger::Logger(QObject *parent) : QObject(parent) { qRegisterMetaType(); + } QList Logger::getNewMessages(int currentCount) @@ -50,6 +55,11 @@ QString Logger::toColor(const QString &color, const QString &text) return color + text + "\033[0m"; } +void Logger::setColorOutput(bool colorOutput) +{ + mColorOutput = colorOutput; +} + void Logger::outputMessage(QtMsgType type, const QMessageLogContext &context, const QString &msg) { @@ -94,9 +104,11 @@ void Logger::outputMessage(QtMsgType type, const QMessageLogContext &context, co QDateTime now = QDateTime::currentDateTime(); + const QString textTypeUni = mColorOutput ? colorTextType : textType; + text = QStringLiteral("[%1 %2 %3] %4") // [ %3:%4 | %5 | %6 ]") .arg(now.toString("dd-MM-yyyy hh:mm:ss.z")) - .arg(colorTextType) + .arg(textTypeUni) .arg(context.category) .arg(msg); diff --git a/src/serversdk/logger.h b/src/serversdk/logger.h index a14d727..dea05ac 100644 --- a/src/serversdk/logger.h +++ b/src/serversdk/logger.h @@ -97,6 +97,8 @@ public: static QString toColor(const QString &color, const QString &text); + /** I will enable color output for terminal ( linux only ) */ + void setColorOutput(bool colorOutput); signals: void messageReceived(const serversdk::LoggerMessage &message); @@ -104,6 +106,7 @@ signals: private: QList mLogMessages; //!< Test QMutex mMutex; + static bool mColorOutput; };