Merge branch 'master' into master

linuxdeepin · Jan 23, 2024 · b58b5fe · b58b5fe
2 parents 4e8763b + 1bc9675
commit b58b5fe
Show file tree

Hide file tree

Showing 83 changed files with 1,480 additions and 714 deletions.
diff --git a/assets/configs/org.deepin.dde.file-manager.json b/assets/configs/org.deepin.dde.file-manager.json
@@ -188,6 +188,17 @@
             "description":"Used to determine if all directories use async iteration to load files",
             "permissions":"readwrite",
             "visibility":"private"
+        },
+        "log_rules": {
+            "value": "*.debug=false;*.info=false;*.warning=true",
+            "serial": 0,
+            "flags": ["global"],
+            "name": "log rules",
+            "name[zh_CN]": "日志规则",
+            "description": "log rules",
+            "description[zh_CN]": "日志规则",
+            "permissions": "readwrite",
+            "visibility": "public"
         }
     }
 }
diff --git a/assets/log/debug/org.deepin.file-manager.json b/assets/log/debug/org.deepin.file-manager.json
@@ -0,0 +1,12 @@
+{
+  "name": "dde-file-manager",
+  "group": "",
+  "submodules": [
+    {
+      "name": "dde-file-manager",
+      "exec": "dde-file-manager_debug.sh"
+    }
+  ],
+  "reboot": 0,
+  "version": "V1.0"
+}
diff --git a/assets/log/dde-file-manager.json → assets/log/viewer/dde-file-manager.json b/assets/log/dde-file-manager.json → assets/log/viewer/dde-file-manager.json
@@ -36,13 +36,6 @@
 			"logType": "journal",
 			"logPath": ""
 		},
-		{
-			"name": "dde-file-manager-daemon",
-			"filter": "",
-			"exec": "/usr/bin/dde-file-manager-daemon",
-			"logType": "journal",
-			"logPath": ""
-		},
 		{
 			"name": "dde-file-manager-server",
 			"filter": "",

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+dde-file-manager (6.0.40) unstable; urgency=medium
+
+  * update file manager baseline version to V6.0.40
+
+ -- lvwujun <[email protected]>  Wed, 17 Jan 2024 15:03:17 +0800
+
 dde-file-manager (6.0.39) unstable; urgency=medium
 
   * update file manager baseline version to V6.0.39

diff --git a/debian/dde-file-manager.install b/debian/dde-file-manager.install
@@ -20,6 +20,7 @@ usr/share/dbus-1/system-services/com.deepin.filemanager.daemon.service
 usr/share/deepin-manual/manual-assets/application
 usr/share/polkit-1/actions/*.policy
 usr/share/deepin-log-viewer/deepin-log.conf.d/*.json
+usr/share/deepin-debug-config/deepin-debug-config.d/*.json
 usr/share/qt5/doc
 usr/lib/systemd/system/ lib/systemd/
 usr/lib/systemd/user/

diff --git a/include/dfm-base/dfm_log_defines.h b/include/dfm-base/dfm_log_defines.h
@@ -40,11 +40,11 @@
 // Wrap qCDebug for all plugins
 // Note: Used in the plugin's namespace!!!
 #undef DFM_LOG_REISGER_CATEGORY
-#define DFM_LOG_REISGER_CATEGORY2(name)                              \
-    const QLoggingCategory &__log##name()                            \
-    {                                                                \
-        static const QLoggingCategory category("log.plugin." #name); \
-        return category;                                             \
+#define DFM_LOG_REISGER_CATEGORY2(name)                                                     \
+    const QLoggingCategory &__log##name()                                                   \
+    {                                                                                       \
+        static const QLoggingCategory category("org.deepin.dde.filemanager.plugin." #name); \
+        return category;                                                                    \
     }
 #define DFM_LOG_REISGER_CATEGORY(nameMacro) DFM_LOG_REISGER_CATEGORY2(nameMacro)
 

diff --git a/src/apps/dde-desktop/main.cpp b/src/apps/dde-desktop/main.cpp
@@ -9,6 +9,7 @@
 
 #include <dfm-base/base/configs/dconfig/dconfigmanager.h>
 #include <dfm-base/utils/sysinfoutils.h>
+#include <dfm-base/utils/loggerrules.h>
 #include <dfm-base/base/configs/dconfig/dconfigmanager.h>
 #include <dfm-base/base/application/application.h>
 #include <dfm-base/base/application/settings.h>
@@ -35,7 +36,7 @@
 #include <unistd.h>
 #include <malloc.h>
 
-Q_LOGGING_CATEGORY(logAppDesktop, "log.app.dde-desktop")
+Q_LOGGING_CATEGORY(logAppDesktop, "org.deepin.dde.filemanager.desktop")
 
 DGUI_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
@@ -91,7 +92,7 @@ static bool pluginsLoad()
 
     QStringList blackNames { DConfigManager::instance()->value(kPluginsDConfName, "desktop.blackList").toStringList() };
 #ifdef COMPILE_ON_V23
-    if (qEnvironmentVariable("DDE_CURRENT_COMPOSITER") == "TreeLand") {
+    if (qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == "TreeLand") {
         qCInfo(logAppDesktop) << "disable background by TreeLand";
         if (!blackNames.contains("ddplugin-background")) {
             blackNames.append("ddplugin-background");
@@ -153,6 +154,9 @@ static void registerDDESession()
 static void initLog()
 {
     dpfLogManager->applySuggestedLogSettings();
+#ifdef DTKCORE_CLASS_DConfigFile
+    LoggerRules::instance().initLoggerRules();
+#endif
 }
 
 static void checkUpgrade(DApplication *app)
@@ -215,6 +219,7 @@ static void autoReleaseMemory()
 
 int main(int argc, char *argv[])
 {
+    initLog();
     QString mainTime = QDateTime::currentDateTime().toString();
     DApplication a(argc, argv);
     a.setOrganizationName(ORGANIZATION_NAME);
@@ -233,7 +238,6 @@ int main(int argc, char *argv[])
     }
 
     DPF_NAMESPACE::backtrace::installStackTraceHandler();
-    initLog();
     autoReleaseMemory();
 
     qCInfo(logAppDesktop) << "start desktop " << a.applicationVersion() << "pid" << getpid() << "parent id" << getppid()

diff --git a/src/apps/dde-file-dialog-wayland/main.cpp b/src/apps/dde-file-dialog-wayland/main.cpp
@@ -11,12 +11,13 @@
 
 #include <dfm-base/dfm_plugin_defines.h>
 #include <dfm-base/base/configs/dconfig/dconfigmanager.h>
+#include <dfm-base/utils/loggerrules.h>
 
 #include <dfm-framework/dpf.h>
 
 #include <signal.h>
 
-Q_LOGGING_CATEGORY(logAppDialogWayland, "log.app.dde-select-dialog-wayland")
+Q_LOGGING_CATEGORY(logAppDialogWayland, "org.deepin.dde.filemanager.filedialog-wayland")
 
 DGUI_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
@@ -40,6 +41,9 @@ static constexpr char kDFMCoreLibName[] { "libdfmplugin-core.so" };
 static void initLog()
 {
     dpfLogManager->applySuggestedLogSettings();
+#ifdef DTKCORE_CLASS_DConfigFile
+    LoggerRules::instance().initLoggerRules();
+#endif
 }
 
 static void initEnv()
@@ -168,6 +172,7 @@ static void handleSIGTERM(int sig)
 int main(int argc, char *argv[])
 {
     initEnv();
+    initLog();
 
     // Fixed the locale codec to utf-8
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
@@ -190,7 +195,6 @@ int main(int argc, char *argv[])
     signal(SIGTERM, handleSIGTERM);
 
     DPF_NAMESPACE::backtrace::installStackTraceHandler();
-    initLog();
 
     if (!pluginsLoad()) {
         qCCritical(logAppDialogWayland) << "Load pugin failed!";

diff --git a/src/apps/dde-file-dialog-x11/main.cpp b/src/apps/dde-file-dialog-x11/main.cpp
@@ -11,12 +11,13 @@
 
 #include <dfm-base/dfm_plugin_defines.h>
 #include <dfm-base/base/configs/dconfig/dconfigmanager.h>
+#include <dfm-base/utils/loggerrules.h>
 
 #include <dfm-framework/dpf.h>
 
 #include <signal.h>
 
-Q_LOGGING_CATEGORY(logAppDialogX11, "log.app.dde-select-dialog-x11")
+Q_LOGGING_CATEGORY(logAppDialogX11, "org.deepin.dde.filemanager.filedialog-x11")
 
 DGUI_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
@@ -40,6 +41,9 @@ static constexpr char kDFMCoreLibName[] { "libdfmplugin-core.so" };
 static void initLog()
 {
     dpfLogManager->applySuggestedLogSettings();
+#ifdef DTKCORE_CLASS_DConfigFile
+    LoggerRules::instance().initLoggerRules();
+#endif
 }
 
 static void initEnv()
@@ -168,6 +172,7 @@ static void handleSIGTERM(int sig)
 int main(int argc, char *argv[])
 {
     initEnv();
+    initLog();
 
     // Fixed the locale codec to utf-8
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
@@ -190,7 +195,6 @@ int main(int argc, char *argv[])
     signal(SIGTERM, handleSIGTERM);
 
     DPF_NAMESPACE::backtrace::installStackTraceHandler();
-    initLog();
 
     if (!pluginsLoad()) {
         qCCritical(logAppDialogX11) << "Load pugin failed!";

diff --git a/src/apps/dde-file-dialog/main.cpp b/src/apps/dde-file-dialog/main.cpp
@@ -11,12 +11,13 @@
 
 #include <dfm-base/dfm_plugin_defines.h>
 #include <dfm-base/base/configs/dconfig/dconfigmanager.h>
+#include <dfm-base/utils/loggerrules.h>
 
 #include <dfm-framework/dpf.h>
 
 #include <signal.h>
 
-Q_LOGGING_CATEGORY(logAppDialog, "log.app.dde-file-dialog")
+Q_LOGGING_CATEGORY(logAppDialog, "org.deepin.dde.filemanager.filedialog")
 
 DGUI_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
@@ -40,6 +41,9 @@ static constexpr char kDFMCoreLibName[] { "libdfmplugin-core.so" };
 static void initLog()
 {
     dpfLogManager->applySuggestedLogSettings();
+#ifdef DTKCORE_CLASS_DConfigFile
+    LoggerRules::instance().initLoggerRules();
+#endif
 }
 
 static void initEnv()
@@ -165,6 +169,7 @@ static void handleSIGTERM(int sig)
 int main(int argc, char *argv[])
 {
     initEnv();
+    initLog();
 
     // Fixed the locale codec to utf-8
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
@@ -186,7 +191,6 @@ int main(int argc, char *argv[])
     signal(SIGTERM, handleSIGTERM);
 
     DPF_NAMESPACE::backtrace::installStackTraceHandler();
-    initLog();
 
     if (!pluginsLoad()) {
         qCCritical(logAppDialog) << "Load pugin failed!";

diff --git a/src/apps/dde-file-manager-daemon/main.cpp b/src/apps/dde-file-manager-daemon/main.cpp
@@ -4,22 +4,25 @@
 
 #include "config.h"   // cmake
 
-#include <QCoreApplication>
-#include <QDebug>
-#include <QDir>
-
 #include <dfm-base/base/configs/dconfig/dconfigmanager.h>
 
 #include <dfm-framework/dpf.h>
 
+#include <dtkcore_config.h>
+#include <dfm-base/utils/loggerrules.h>
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDir>
+
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <pwd.h>
 #include <sys/types.h>
 #include <signal.h>
 
-Q_LOGGING_CATEGORY(logAppDaemon, "log.app.dde-file-manager-daemon")
+Q_LOGGING_CATEGORY(logAppDaemon, "org.deepin.dde.filemanager.daemon")
 
 static constexpr char kDaemonInterface[] { "org.deepin.plugin.daemon" };
 static constexpr char kPluginCore[] { "daemonplugin-core" };
@@ -57,6 +60,9 @@ static void initEnv()
 static void initLog()
 {
     dpfLogManager->applySuggestedLogSettings();
+#ifdef DTKCORE_CLASS_DConfigFile
+    LoggerRules::instance().initLoggerRules();
+#endif
 }
 
 static bool pluginsLoad()
@@ -112,12 +118,13 @@ static bool pluginsLoad()
 int main(int argc, char *argv[])
 {
     initEnv();
+    initLog();
+
     QCoreApplication a(argc, argv);
     a.setOrganizationName("deepin");
 
     DPF_NAMESPACE::backtrace::installStackTraceHandler();
 
-    initLog();
     if (!pluginsLoad()) {
         qCCritical(logAppDaemon) << "Load plugin failed!";
         abort();

diff --git a/src/apps/dde-file-manager-server/main.cpp b/src/apps/dde-file-manager-server/main.cpp
@@ -5,6 +5,7 @@
 #include "config.h"
 
 #include <dfm-base/base/configs/dconfig/dconfigmanager.h>
+#include <dfm-base/utils/loggerrules.h>
 
 #include <dfm-framework/dpf.h>
 
@@ -17,7 +18,7 @@
 #include <signal.h>
 #include <unistd.h>
 
-Q_LOGGING_CATEGORY(logAppServer, "log.app.dde-file-manager-server")
+Q_LOGGING_CATEGORY(logAppServer, "org.deepin.dde.filemanager.server")
 
 static constexpr char kServerInterface[] { "org.deepin.plugin.server" };
 static constexpr char kPluginCore[] { "serverplugin-core" };
@@ -37,6 +38,9 @@ DCORE_USE_NAMESPACE
 static void initLog()
 {
     dpfLogManager->applySuggestedLogSettings();
+#ifdef DTKCORE_CLASS_DConfigFile
+    LoggerRules::instance().initLoggerRules();
+#endif
 }
 
 static bool pluginsLoad()
@@ -105,6 +109,7 @@ DWIDGET_USE_NAMESPACE
 
 int main(int argc, char *argv[])
 {
+    initLog();
     DApplication a(argc, argv);
     a.setOrganizationName(ORGANIZATION_NAME);
     {
@@ -119,7 +124,6 @@ int main(int argc, char *argv[])
     signal(SIGABRT, handleSIGABRT);
 
     DPF_NAMESPACE::backtrace::installStackTraceHandler();
-    initLog();
 
     if (!pluginsLoad()) {
         qCCritical(logAppServer) << "Load pugin failed!";