From 37a62a8d0b590710b902376ca3320cc05e954b63 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 26 Jul 2024 18:24:34 +0200 Subject: feat: remove spdlog and clean up log --- src/cmd.cpp | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'src/cmd.cpp') diff --git a/src/cmd.cpp b/src/cmd.cpp index d41b6de0..1f3182fe 100644 --- a/src/cmd.cpp +++ b/src/cmd.cpp @@ -28,11 +28,9 @@ #include "cmd.h" -#include "core/utils/BuildInfoUtils.h" -#include "main.h" +#include -// std -#include +#include "core/utils/BuildInfoUtils.h" // GpgFrontend #include "GpgFrontendContext.h" @@ -60,30 +58,29 @@ auto PrintVersion() -> int { return 0; } -auto ParseLogLevel(const QString& log_level) -> spdlog::level::level_enum { - if (log_level == "trace") { - return spdlog::level::trace; - } +auto ParseLogLevel(const QString& log_level) -> int { if (log_level == "debug") { - return spdlog::level::debug; - } - if (log_level == "info") { - return spdlog::level::info; + QLoggingCategory::setFilterRules( + "core.debug=true\nui.debug=true\ntest.debug=true\nmodule.debug=true"); + } else if (log_level == "info") { + QLoggingCategory::setFilterRules( + "*.debug=false\ncore.info=true\nui.info=true\ntest.info=" + "true\nmodule.info=true"); + } else if (log_level == "warning") { + QLoggingCategory::setFilterRules("*.debug=false\n*.info=false\n"); + } else if (log_level == "critical") { + QLoggingCategory::setFilterRules( + "*.debug=false\n*.info=false\n*.warning=false\n"); + } else { + qWarning() << "unknown log level: " << log_level; } - if (log_level == "warn") { - return spdlog::level::warn; - } - if (log_level == "error") { - return spdlog::level::err; - } - - return spdlog::level::info; + return 0; } auto RunTest(const GFCxtWPtr& p_ctx) -> int { GpgFrontend::GFCxtSPtr const ctx = p_ctx.lock(); if (ctx == nullptr) { - GF_MAIN_LOG_ERROR("cannot get gpgfrontend context for test running"); + qWarning("cannot get gpgfrontend context for test running"); return -1; } -- cgit v1.2.3 From 3ef497cbeb8835ef13e20c690a4fb83a9f5c4eac Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 28 Jul 2024 19:45:39 +0200 Subject: feat: support more build mode --- src/cmd.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/cmd.cpp') diff --git a/src/cmd.cpp b/src/cmd.cpp index 1f3182fe..06222431 100644 --- a/src/cmd.cpp +++ b/src/cmd.cpp @@ -28,11 +28,16 @@ #include "cmd.h" +#include #include +#include +#include +#include #include "core/utils/BuildInfoUtils.h" // GpgFrontend + #include "GpgFrontendContext.h" #include "test/GpgFrontendTest.h" @@ -40,7 +45,7 @@ namespace GpgFrontend { auto PrintVersion() -> int { QTextStream stream(stdout); - stream << PROJECT_NAME << " " << GetProjectVersion() << '\n'; + stream << GetProjectName() << " " << GetProjectVersion() << '\n'; stream << "Copyright (©) 2021 Saturneric " << '\n' << QCoreApplication::tr( "This is free software; see the source for copying conditions.") -- cgit v1.2.3