chore: [log]More logs

Add more logs for log coverage.

Log: Add more logs.

Author: re2zero

src/common/eventlogutils.cpp

@@ -7,16 +7,19 @@
 #include <QDir>
 #include <QLibraryInfo>
 #include <QJsonDocument>
+#include <QDebug>
 
 #include "eventlogutils.h"
 
 EventLogUtils *EventLogUtils::mInstance(nullptr);
 
 EventLogUtils &EventLogUtils::get()
 {
+    qDebug() << "Enter EventLogUtils::get()";
     if (mInstance == nullptr) {
         mInstance = new EventLogUtils;
     }
+    qDebug() << "Exit EventLogUtils::get()";
     return *mInstance;
 }
 
@@ -27,17 +30,23 @@ EventLogUtils::EventLogUtils()
     init =reinterpret_cast<bool (*)(const std::string &, bool)>(library.resolve("Initialize"));
     writeEventLog = reinterpret_cast<void (*)(const std::string &)>(library.resolve("WriteEventLog"));
 
-    if (init == nullptr)
+    if (init == nullptr) {
+        qWarning() << "Failed to resolve Initialize function in libdeepin-event-log.so";
         return;
+    }
 
     init("deepin-terminal", true);
 }
 
 void EventLogUtils::writeLogs(QJsonObject &data)
 {
-    if (writeEventLog == nullptr)
+    qDebug() << "Enter EventLogUtils::writeLogs()";
+    if (writeEventLog == nullptr) {
+        qWarning() << "writeEventLog function pointer is null";
         return;
+    }
 
     //std::string str = QJsonDocument(data).toJson(QJsonDocument::Compact).toStdString();
     writeEventLog(QJsonDocument(data).toJson(QJsonDocument::Compact).toStdString());
+    qDebug() << "Exit EventLogUtils::writeLogs()";
 }

src/common/settingio.cpp

@@ -15,11 +15,12 @@
 bool SettingIO::rewrite = false;
 SettingIO::SettingIO(QObject *parent) : QObject(parent)
 {
-
+    qDebug() << "SettingIO constructor";
 }
 
 bool SettingIO::readIniFunc(QIODevice &device, QSettings::SettingsMap &settingsMap)
 {
+    qDebug() << "Enter SettingIO::readIniFunc";
     QString currentSection;
     QTextStream stream(&device);
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
@@ -112,11 +113,13 @@ bool SettingIO::readIniFunc(QIODevice &device, QSettings::SettingsMap &settingsM
             }
         }
     }
+    qDebug() << "Exit SettingIO::readIniFunc";
     return true;
 }
 
 bool SettingIO::writeIniFunc(QIODevice &device, const QSettings::SettingsMap &settingsMap)
 {
+    qDebug() << "Enter SettingIO::writeIniFunc";
 #ifdef Q_OS_WIN
     const char *const eol = "\r\n";
 #else
@@ -179,6 +182,7 @@ bool SettingIO::writeIniFunc(QIODevice &device, const QSettings::SettingsMap &se
         if (device.write(block) == -1)
             writeError = true;
     }
+    qDebug() << "Exit SettingIO::writeIniFunc";
     return true;
 }
 
@@ -490,7 +494,10 @@ USettings::USettings(const QString &fileName, QObject *parent)
 }
 
 //析构函数
-USettings::~USettings() {}
+USettings::~USettings()
+{
+    qDebug() << "USettings destructor";
+}
 
 void USettings::beginGroup(const QString &prefix)
 {

src/common/utils.cpp

@@ -58,19 +58,26 @@ Q_LOGGING_CATEGORY(common,"org.deepin.terminal.common",QtInfoMsg)
 
 QString Utils::getQssContent(const QString &filePath)
 {
+    qCDebug(common) << "Reading QSS content from:" << filePath;
     QFile file(filePath);
     QString qss;
 
-    if (file.open(QIODevice::ReadOnly))
+    if (file.open(QIODevice::ReadOnly)) {
         qss = file.readAll();
+        qCDebug(common) << "Successfully read" << qss.size() << "bytes from QSS file";
+    } else {
+        qCWarning(common) << "Failed to open QSS file:" << filePath << "Error:" << file.errorString();
+    }
 
     return qss;
 }
 
 QString Utils::getConfigPath()
 {
+    qCDebug(common) << "Getting config path";
     static QStringList list = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation);
     const QString path = list.value(0);
+    qCDebug(common) << "Config path:" << path;
     QDir dir(
         QDir(path).filePath(qApp->organizationName()));
 
@@ -122,7 +129,9 @@ QString Utils::getRandString()
 
 QString Utils::showDirDialog(QWidget *widget)
 {
+    qCDebug(common) << "Showing directory dialog";
     QString curPath = QDir::currentPath();
+    qCDebug(common) << "Current path:" << curPath;
     QString dlgTitle = QObject::tr("Select a directory to save the file");
 
     DFileDialog dialog(widget, dlgTitle, curPath);
@@ -135,15 +144,19 @@ QString Utils::showDirDialog(QWidget *widget)
     if (QDialog::Accepted == code && !dialog.selectedFiles().isEmpty()) {
         QStringList list = dialog.selectedFiles();
         const QString dirName = list.value(0);
+        qCDebug(common) << "Selected directory:" << dirName;
         return dirName;
     } else {
+        qCDebug(common) << "Directory selection canceled";
         return "";
     }
 }
 
 QStringList Utils::showFilesSelectDialog(QWidget *widget)
 {
+    qCDebug(common) << "Showing file selection dialog";
     QString curPath = QDir::currentPath();
+    qCDebug(common) << "Current path:" << curPath;
     QString dlgTitle = QObject::tr("Select file to upload");
 
     DFileDialog dialog(widget, dlgTitle, curPath);
@@ -156,6 +169,7 @@ QStringList Utils::showFilesSelectDialog(QWidget *widget)
     if (code == QDialog::Accepted)
         return dialog.selectedFiles();
 
+    qCDebug(common) << "File selection canceled";
     return QStringList();
 }
 

src/customcommand/customcommandoptdlg.cpp

@@ -41,6 +41,7 @@ CustomCommandOptDlg::CustomCommandOptDlg(CustomCmdOptType type, CustomCommandDat
     , m_shortCutLineEdit(new DKeySequenceEdit(this))
     , m_bDelOpt(false)
 {
+    qCDebug(customcommand) << "Creating CustomCommandOptDlg, type:" << type;
     /******** Add by ut001000 renfeixiang 2020-08-13:增加 Begin***************/
     Utils::set_Object_Name(this);
     m_nameLineEdit->setObjectName("CustomNameLineEdit");
@@ -62,6 +63,7 @@ CustomCommandOptDlg::CustomCommandOptDlg(CustomCmdOptType type, CustomCommandDat
 
 CustomCommandOptDlg::~CustomCommandOptDlg()
 {
+    qCDebug(customcommand) << "Destroying CustomCommandOptDlg";
     if (m_currItemData) {
         delete m_currItemData;
         m_currItemData = nullptr;
@@ -74,6 +76,7 @@ CustomCommandOptDlg::~CustomCommandOptDlg()
 
 void CustomCommandOptDlg::initUI()
 {
+    qCDebug(customcommand) << "Initializing CustomCommandOptDlg UI";
     QWidget *contentFrame = new QWidget(this);
 
     QVBoxLayout *contentLayout = new QVBoxLayout;
@@ -140,6 +143,7 @@ void CustomCommandOptDlg::initUI()
     addContent(contentFrame);
     //判断是添加操作窗口还是修改操作窗口
     if (CCT_ADD == m_type) {
+        qCInfo(customcommand) << "Setting up Add Command dialog";
         setTitle(tr("Add Command"));
         initCommandFromClipBoardText();
 
@@ -149,6 +153,7 @@ void CustomCommandOptDlg::initUI()
         getMainLayout()->addSpacing(m_iSpaceSizeEighteen);
 #endif
     } else {
+        qCInfo(customcommand) << "Setting up Edit Command dialog";
         setTitle(tr("Edit Command"));
 
         m_deleteCmdWidget = new QWidget(this);
@@ -354,10 +359,12 @@ inline void CustomCommandOptDlg::slotThemeTypeChanged(DGuiApplicationHelper::Col
 
 void CustomCommandOptDlg::initCommandFromClipBoardText()
 {
+    qCDebug(customcommand) << "Initializing command from clipboard";
     if (m_commandLineEdit) {
         MainWindow *main = Utils::getMainWindow(this);//;getMainWindow();
         if (main != nullptr) {
             QString clipText = main->selectedText();
+            qCDebug(customcommand) << "Clipboard text:" << clipText;
             m_commandLineEdit->setText(clipText.trimmed());
         }
     }
@@ -489,6 +496,7 @@ void CustomCommandOptDlg::setModelIndex(const QModelIndex &mi)
 
 void CustomCommandOptDlg::slotDelCurCustomCommand()
 {
+    qCInfo(customcommand) << "Deleting current custom command";
     m_bDelOpt = true;
     reject();
 }

src/customcommand/customcommandpanel.cpp

@@ -23,11 +23,13 @@ Q_DECLARE_LOGGING_CATEGORY(customcommand)
 
 CustomCommandPanel::CustomCommandPanel(QWidget *parent) : CommonPanel(parent)
 {
+    qCDebug(customcommand) << "Creating CustomCommandPanel";
     Utils::set_Object_Name(this);
     initUI();
 }
 CustomCommandPanel::~CustomCommandPanel()
 {
+    qCDebug(customcommand) << "Destroying CustomCommandPanel";
     if (m_pdlg) {
         delete m_pdlg;
         m_pdlg = nullptr;
@@ -36,10 +38,14 @@ CustomCommandPanel::~CustomCommandPanel()
 
 void CustomCommandPanel::showCurSearchResult()
 {
+    qCDebug(customcommand) << "Showing search results";
     QString strTxt = m_searchEdit->text();
-    if (strTxt.isEmpty())
+    if (strTxt.isEmpty()) {
+        qCDebug(customcommand) << "Search text is empty";
         return;
+    }
 
+    qCInfo(customcommand) << "Searching for:" << strTxt;
     emit showSearchResult(strTxt);
 }
 
@@ -69,14 +75,20 @@ void CustomCommandPanel::showAddCustomCommandDlg()
 
 void CustomCommandPanel::doCustomCommand(const QString &key)
 {
+    qCDebug(customcommand) << "Executing custom command with key:" << key;
     QAction *item = ShortcutManager::instance()->findActionByKey(key);
-    if(!item)
+    if(!item) {
+        qCWarning(customcommand) << "No command found for key:" << key;
         return;
+    }
 
     QString strCommand = item->data().toString();
-    if (!strCommand.endsWith('\n'))
+    if (!strCommand.endsWith('\n')) {
+        qCDebug(customcommand) << "Appending newline to command";
         strCommand.append('\n');
+    }
 
+    qCInfo(customcommand) << "Executing command:" << strCommand;
     emit handleCustomCurCommand(strCommand);
 }
 
@@ -125,8 +137,10 @@ void CustomCommandPanel::onAddCommandResponse(int result)
 
 void CustomCommandPanel::refreshCmdPanel()
 {
+    qCDebug(customcommand) << "Refreshing command panel";
     clearSearchInfo();
     ShortcutManager::instance()->fillCommandListData(m_cmdListWidget);
+    qCDebug(customcommand) << "Command list updated, count:" << m_cmdListWidget->count();
     refreshCmdSearchState();
 }
 
@@ -179,6 +193,7 @@ void CustomCommandPanel::setFocusInPanel()
 
 void CustomCommandPanel::initUI()
 {
+    qCDebug(customcommand) << "Initializing CustomCommandPanel UI";
     setBackgroundRole(QPalette::Base);
     setAutoFillBackground(true);
 

src/customcommand/customcommandplugin.cpp

@@ -19,17 +19,22 @@ Q_DECLARE_LOGGING_CATEGORY(customcommand)
 
 CustomCommandPlugin::CustomCommandPlugin(QObject *parent) : MainWindowPluginInterface(parent)
 {
+    qCDebug(customcommand) << "Creating CustomCommandPlugin";
     Utils::set_Object_Name(this);
     m_pluginName = "Custom Command";
+    qCDebug(customcommand) << "Plugin name set to:" << m_pluginName;
 }
 
 void CustomCommandPlugin::initPlugin(MainWindow *mainWindow)
 {
+    qCDebug(customcommand) << "Initializing CustomCommandPlugin";
     m_mainWindow = mainWindow;
     connect(m_mainWindow, &MainWindow::showPluginChanged,  this, &CustomCommandPlugin::doShowPlugin);
     connect(m_mainWindow, &MainWindow::quakeHidePlugin, this, [ = ]() {
+        qCDebug(customcommand) << "Hiding command panel in quake mode";
         getCustomCommandTopPanel()->hide();
     });
+    qCDebug(customcommand) << "Plugin initialization complete";
 }
 
 QAction *CustomCommandPlugin::titlebarMenu(MainWindow *mainWindow)
@@ -45,12 +50,14 @@ QAction *CustomCommandPlugin::titlebarMenu(MainWindow *mainWindow)
 
 void CustomCommandPlugin::initCustomCommandTopPanel()
 {
+    qCDebug(customcommand) << "Initializing custom command top panel";
     m_customCommandTopPanel = new CustomCommandTopPanel(m_mainWindow->centralWidget());
     m_customCommandTopPanel->setObjectName("CustomCustomCommandTopPanel");//Add by ut001000 renfeixiang 2020-08-14
     connect(m_customCommandTopPanel,
             &CustomCommandTopPanel::handleCustomCurCommand,
             this,
             &CustomCommandPlugin::doCustomCommand);
+    qCDebug(customcommand) << "Custom command top panel initialized";
 }
 
 CustomCommandTopPanel *CustomCommandPlugin::getCustomCommandTopPanel()
@@ -63,40 +70,50 @@ CustomCommandTopPanel *CustomCommandPlugin::getCustomCommandTopPanel()
 
 void CustomCommandPlugin::doCustomCommand(const QString &strTxt)
 {
+    qCDebug(customcommand) << "Executing custom command:" << strTxt;
     if (!strTxt.isEmpty()) {
+        qCInfo(customcommand) << "Sending command to terminal:" << strTxt;
         m_mainWindow->currentPage()->sendTextToCurrentTerm(strTxt);
         m_mainWindow->focusCurrentPage();
         /******** Add by nt001000 renfeixiang 2020-05-28:增加 使用mainwindow的hideplugin函数隐藏自定义窗口bug#21992 Begin***************/
+        qCDebug(customcommand) << "Hiding plugin after command execution";
         m_mainWindow->showPlugin(MainWindow::PLUGIN_TYPE_NONE);
         /******** Add by nt001000 renfeixiang 2020-05-28:增加 使用mainwindow的hideplugin函数隐藏自定义窗口bug#21992 End***************/
     }
     emit doHide();
+    qCDebug(customcommand) << "Command execution complete";
 }
 
 void CustomCommandPlugin::doShowPlugin(const QString name, bool bSetFocus)
 {
+    qCDebug(customcommand) << "Show plugin called for:" << name << "with focus:" << bSetFocus;
     if (MainWindow::PLUGIN_TYPE_CUSTOMCOMMAND != name) {
         // 若插件已经显示，则隐藏
         if (m_isShow) {
-            qCWarning(customcommand) << "Command top panel hide";
+            qCInfo(customcommand) << "Hiding command top panel";
             getCustomCommandTopPanel()->hideAnim();
             m_isShow = false;
         }
     } else {
         /******** Add by nt001000 renfeixiang 2020-05-18:修改雷神窗口太小时，自定义界面使用不方便，将雷神窗口变大适应正常的自定义界面 Begin***************/
         if (m_mainWindow->isQuakeMode() && m_mainWindow->height() < LISTMINHEIGHT) {
+            qCDebug(customcommand) << "Adjusting quake window size for command panel";
             //因为拉伸函数设置了FixSize，导致自定义界面弹出时死循环，然后崩溃的问题
             QuakeWindow *quakeWindow = qobject_cast<QuakeWindow *>(m_mainWindow);
-            if(!quakeWindow)
+            if(!quakeWindow) {
+                qCWarning(customcommand) << "Failed to cast to QuakeWindow";
                 return;
+            }
             quakeWindow->switchEnableResize(true);
             m_mainWindow->resize(m_mainWindow->width(), LISTMINHEIGHT); //首先设置雷神界面的大小
             m_mainWindow->showPlugin(MainWindow::PLUGIN_TYPE_CUSTOMCOMMAND);//重新打开自定义界面，当前流程结束
             //窗口弹出后，重新判断雷神窗口是否需要有拉伸属性
             quakeWindow->switchEnableResize();
+            qCDebug(customcommand) << "Quake window size adjusted";
             return;
         }
         /******** Add by nt001000 renfeixiang 2020-05-18:修改雷神窗口太小时，自定义界面使用不方便，将雷神窗口变大适应正常的自定义界面 End***************/
+        qCInfo(customcommand) << "Showing command top panel";
         getCustomCommandTopPanel()->show(bSetFocus);
         m_isShow = true;
     }