sync: from linuxdeepin/dtkcore

include/global/dsysinfo.h

@@ -38,7 +38,8 @@ class LIBDTKCORESHARED_EXPORT DSysInfo
         DeepinDesktop,
         DeepinProfessional,
         DeepinServer,
-        DeepinPersonal
+        DeepinPersonal,
+        DeepinMilitary
     };
 
     enum LogoType {

src/dsysinfo.cpp

@@ -17,6 +17,7 @@
 #include <QStandardPaths>
 #include <QDateTime>
 #include <QRegularExpression>
+#include <QLoggingCategory>
 #include <qmath.h>
 
 #ifdef Q_OS_LINUX
@@ -37,6 +38,12 @@ static inline bool inTest()
 
 DCORE_BEGIN_NAMESPACE
 
+#ifdef QT_DEBUG
+Q_LOGGING_CATEGORY(logSysInfo, "dtk.dsysinfo")
+#else
+Q_LOGGING_CATEGORY(logSysInfo, "dtk.dsysinfo", QtInfoMsg)
+#endif
+
 class Q_DECL_HIDDEN DSysInfoPrivate
 {
 public:
@@ -150,7 +157,7 @@ bool DSysInfoPrivate::splitA_BC_DMode()
 
 void DSysInfoPrivate::ensureDeepinInfo()
 {
-    if (static_cast<int>(deepinType) >= 0 && !inTest())
+    if (static_cast<int>(deepinType) > 0 && !inTest())
         return;
 
     if (inTest())
@@ -220,6 +227,8 @@ void DSysInfoPrivate::ensureDeepinInfo()
         deepinType = DSysInfo::DeepinServer;
     } else if (deepin_type == "Personal") {
         deepinType = DSysInfo::DeepinPersonal;
+    } else if (deepin_type == "Military") {
+        deepinType = DSysInfo::DeepinMilitary;
     } else {
         deepinType = DSysInfo::UnknownDeepin;
     }
@@ -423,7 +432,7 @@ static bool readLsbRelease(DSysInfoPrivate *info)
 
 void DSysInfoPrivate::ensureReleaseInfo()
 {
-    if (productType >= 0 && !inTest()) {
+    if (productType > 0 && !inTest()) {
         return;
     }
 
@@ -1122,18 +1131,35 @@ qint64 DSysInfo::memoryInstalledSize()
         }
 
         const QByteArray &lshwInfoJson = lshw.readAllStandardOutput();
-        QJsonArray lshwResultArray = QJsonDocument::fromJson(lshwInfoJson).array();
-        if (!lshwResultArray.isEmpty()) {
-            QJsonValue memoryHwInfo = lshwResultArray.first();
-            QString id = memoryHwInfo.toObject().value("id").toString();
-            Q_ASSERT(id == "memory");
-            siGlobal->memoryInstalledSize = memoryHwInfo.toObject().value("size").toDouble(); // TODO: check "units" is "bytes" ?
+
+        QJsonParseError error;
+        auto doc = QJsonDocument::fromJson(lshwInfoJson, &error);
+        if (error.error != QJsonParseError::NoError) {
+            qCWarning(logSysInfo(), "parse failed, expect json doc from lshw command");
+            return -1;
+        }
+
+        if (!doc.isArray()) {
+            qCWarning(logSysInfo(), "parse failed, expect array");
+            return -1;
+        }
+
+        QJsonArray lshwResultArray = doc.array();
+        for (const QJsonValue value : lshwResultArray) {
+            QJsonObject obj = value.toObject();
+            if (obj.contains("id") && obj.value("id").toString() == "memory") {
+                siGlobal->memoryInstalledSize = obj.value("size").toDouble(); // TODO: check "units" is "bytes" ?
+                break;
+            }
         }
     }
 
+    Q_ASSERT(siGlobal->memoryInstalledSize > 0);
+
     return siGlobal->memoryInstalledSize;
-#endif
+#else
     return -1;
+#endif
 }
 
 /*!

src/log/AbstractStringAppender.cpp

@@ -339,6 +339,11 @@ QString AbstractStringAppender::formattedString(const QDateTime &time, Logger::L
                                                 bool withcolor) const
 {
     QString f = format();
+
+    // dtkcore无法正确解析Qt的日志格式，dtk默认的日志格式并未和Qt统一，解析方式需要兼容两种不同的格式。
+    if (f.contains(QLatin1String("time ")))
+        f.replace(f.indexOf(' ', f.indexOf(QLatin1String("time")) + QLatin1String("time").size()), 1, QLatin1String("}{"));
+
     const int size = f.size();
 
     QString result;

src/log/ConsoleAppender.cpp

@@ -38,7 +38,7 @@ DCORE_BEGIN_NAMESPACE
 
 ConsoleAppender::ConsoleAppender()
     : AbstractStringAppender()
-    ,m_ignoreEnvPattern(false)
+    , m_ignoreEnvPattern(false)
 {
     if (!spdlog::get("console")) {
         auto clogger = spdlog::stdout_color_mt("console");

src/log/LogManager.cpp

@@ -4,6 +4,8 @@
 
 #include <QtCore>
 #include "LogManager.h"
+#include "dconfig.h"
+#include <DSGApplication>
 #include <Logger.h>
 #include <ConsoleAppender.h>
 #include <RollingFileAppender.h>
@@ -14,6 +16,7 @@
 
 DCORE_BEGIN_NAMESPACE
 
+#define RULES_KEY ("rules")
 // Courtesy qstandardpaths_unix.cpp
 static void appendOrganizationAndApp(QString &path)
 {
@@ -39,16 +42,79 @@ class DLogManagerPrivate {
     {
     }
 
+    DConfig *createDConfig(const QString &appId);
+    void initLoggingRules();
+    void updateLoggingRules();
+
     QString m_format;
     QString m_logPath;
     ConsoleAppender* m_consoleAppender = nullptr;
     RollingFileAppender* m_rollingFileAppender = nullptr;
     JournalAppender* m_journalAppender = nullptr;
+    QScopedPointer<DConfig> m_dsgConfig;
+    QScopedPointer<DConfig> m_fallbackConfig;
 
     DLogManager *q_ptr = nullptr;
     Q_DECLARE_PUBLIC(DLogManager)
 
 };
+
+DConfig *DLogManagerPrivate::createDConfig(const QString &appId)
+{
+    if (appId.isEmpty())
+        return nullptr;
+
+    DConfig *config = DConfig::create(appId, "org.deepin.dtk.preference");
+    if (!config->isValid()) {
+        qWarning() << "Logging rules config is invalid, please check `appId` [" << appId << "]arg is correct";
+        delete config;
+        config = nullptr;
+        return nullptr;
+    }
+
+    QObject::connect(config, &DConfig::valueChanged, config, [this](const QString &key) {
+        if (key != RULES_KEY)
+            return;
+
+        updateLoggingRules();
+    });
+
+    return config;
+}
+
+void DLogManagerPrivate::initLoggingRules()
+{
+    if (qEnvironmentVariableIsSet("DTK_DISABLED_LOGGING_RULES"))
+        return;
+
+    // 1. 未指定 fallbackId 时，以 dsgAppId 为准
+    QString dsgAppId = DSGApplication::id();
+    m_dsgConfig.reset(createDConfig(dsgAppId));
+
+    QString fallbackId = qgetenv("DTK_LOGGING_FALLBACK_APPID");
+    // 2. fallbackId 和 dsgAppId 非空且不等时，都创建和监听变化
+    if (!fallbackId.isEmpty() && fallbackId != dsgAppId)
+        m_fallbackConfig.reset(createDConfig(fallbackId));
+
+    // 3. 默认值和非默认值时，非默认值优先
+    updateLoggingRules();
+}
+
+void DLogManagerPrivate::updateLoggingRules()
+{
+    QVariant var;
+    // 4. 优先看 dsgConfig 是否默认值，其次 fallback 是否默认值
+    if (m_dsgConfig && !m_dsgConfig->isDefaultValue(RULES_KEY)) {
+        var = m_dsgConfig->value(RULES_KEY);
+    } else if (m_fallbackConfig && !m_fallbackConfig->isDefaultValue(RULES_KEY)) {
+        var = m_fallbackConfig->value(RULES_KEY);
+    } else {
+        // do nothing..
+    }
+
+    if (var.isValid())
+        QLoggingCategory::setFilterRules(var.toString().replace(";", "\n"));
+}
 /*!
 @~english
   \class Dtk::Core::DLogManager
@@ -62,6 +128,8 @@ DLogManager::DLogManager()
 {
     spdlog::set_automatic_registration(true);
     spdlog::set_pattern("%v");
+
+    d_ptr->initLoggingRules();
 }
 
 void DLogManager::initConsoleAppender(){