Add log.h for better logging

Author: johanmalm

CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 

src/log.h

@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#pragma once
+#include <print>
+
+enum LogLevel {
+    FATAL,
+    WARN,
+    INFO,
+};
+
+constexpr const char *log_level_string(LogLevel level)
+{
+    switch (level) {
+    case LogLevel::FATAL:
+        return "fatal";
+    case LogLevel::WARN:
+        return "warn";
+    case LogLevel::INFO:
+        return "info";
+    default:
+        return "unknown";
+    }
+}
+
+template<typename... Args>
+static inline void _log(LogLevel level, std::format_string<Args...> fmt, Args &&...args)
+{
+    std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
+    switch (level) {
+    case LogLevel::FATAL:
+        msg = std::string("\033[1;31m") + log_level_string(level) + ": " + msg + "\033[0m";
+        break;
+    case LogLevel::WARN:
+        msg = std::string("\033[1;33m") + log_level_string(level) + ": " + msg + "\033[0m";
+        break;
+    case LogLevel::INFO:
+        msg = std::string("\033[1;32m") + log_level_string(level) + ": " + msg + "\033[0m";
+        break;
+    default:
+        break;
+    }
+    std::println(stderr, "{}", msg);
+}
+
+#define die(fmt, ...)                                                                             \
+    {                                                                                             \
+        _log(LogLevel::FATAL, "[{}:{}] {}", __FILE__, __LINE__, std::format(fmt, ##__VA_ARGS__)); \
+        exit(EXIT_FAILURE);                                                                       \
+    }
+
+#define warn(fmt, ...)                                                                           \
+    {                                                                                            \
+        _log(LogLevel::WARN, "[{}:{}] {}", __FILE__, __LINE__, std::format(fmt, ##__VA_ARGS__)); \
+    }
+
+#define info(fmt, ...)                                                                           \
+    {                                                                                            \
+        _log(LogLevel::INFO, "[{}:{}] {}", __FILE__, __LINE__, std::format(fmt, ##__VA_ARGS__)); \
+    }

src/maindialog.cpp

@@ -9,6 +9,7 @@
 #include "environment.h"
 #include "evdev-lst-layouts.h"
 #include "layoutmodel.h"
+#include "log.h"
 #include "maindialog.h"
 #include "settings.h"
 #include "./ui_maindialog.h"
@@ -137,7 +138,7 @@ void setInt(std::vector<std::shared_ptr<Setting>> &settings, QString name, int v
         qDebug() << "setInt(): not valid int setting" << name << value;
     }
     if (value != std::get<int>(setting->value())) {
-        qDebug() << name << "has changed to" << value;
+        info("'{} has changed to '{}'", name.toStdString(), value);
         xml_set_num(name.toStdString().c_str(), value);
     }
 }
@@ -153,7 +154,7 @@ void setStr(std::vector<std::shared_ptr<Setting>> &settings, QString name, QStri
         qDebug() << "setStr(): not valid string setting" << name << value;
     }
     if (value != std::get<QString>(setting->value())) {
-        qDebug() << name << "has changed to" << value;
+        info("'{} has changed to '{}'", name.toStdString(), value.toStdString());
         xml_set(name.toStdString().c_str(), value.toStdString().c_str());
     }
 }
@@ -204,7 +205,7 @@ void setBool(std::vector<std::shared_ptr<Setting>> &settings, QString name, QStr
     }
     int boolValue = parseBool(value.toStdString().c_str(), -1);
     if (boolValue != std::get<int>(setting->value())) {
-        qDebug() << name << "has changed to" << value;
+        info("'{} has changed to '{}'", name.toStdString(), value.toStdString());
         xml_set(name.toStdString().c_str(), value.toStdString().c_str());
     }
 }

src/settings.cpp

@@ -1,5 +1,6 @@
 #include <QDebug>
 #include <variant>
+#include "log.h"
 #include "settings.h"
 
 extern "C" {
@@ -49,7 +50,7 @@ Setting::Setting(QString name, enum settingFileType fileType, enum settingValueT
             if (value != std::get<QString>(m_value)) {
                 m_valueOrigin = LAB_VALUE_ORIGIN_USER_OVERRIDE;
                 m_value = value;
-                qDebug() << "USER OVERRIDE: " << m_name << "=" << value;
+                info("[user-override] {}: {}", m_name.toStdString(), value.toStdString());
             }
             break;
         }
@@ -58,7 +59,7 @@ Setting::Setting(QString name, enum settingFileType fileType, enum settingValueT
             if (value != std::get<int>(m_value)) {
                 m_valueOrigin = LAB_VALUE_ORIGIN_USER_OVERRIDE;
                 m_value = value;
-                qDebug() << "USER OVERRIDE: " << m_name << "=" << value;
+                info("[user-override] {}: {}", m_name.toStdString(), value);
             }
             break;
         }
@@ -67,7 +68,7 @@ Setting::Setting(QString name, enum settingFileType fileType, enum settingValueT
             if (value != std::get<int>(m_value)) {
                 m_valueOrigin = LAB_VALUE_ORIGIN_USER_OVERRIDE;
                 m_value = value;
-                qDebug() << "USER OVERRIDE: " << m_name << "=" << value;
+                info("[user-override] {}: {}", m_name.toStdString(), value);
             }
             break;
         }