From eb658448f9dc1d30817d1e4cfb3fdacaabee680e Mon Sep 17 00:00:00 2001 From: dengzhongyuan Date: Mon, 13 Apr 2026 13:37:42 +0800 Subject: [PATCH] refactor: remove EventLogUtils references from main application and archive management - Removed EventLogUtils logging calls from main.cpp, archivemanager.cpp, and mainwindow.cpp to streamline the codebase. - Deleted associated enum values from eventlogutils.h to clean up unused code. This change simplifies the logging mechanism and reduces dependencies on EventLogUtils. TASK: https://pms.uniontech.com/task-view-388231.html --- src/main.cpp | 21 ---------- src/source/archivemanager/archivemanager.cpp | 43 -------------------- src/source/common/eventlogutils.h | 10 ----- src/source/mainwindow.cpp | 6 --- 4 files changed, 80 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 064129111..af94f41c9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,7 +28,6 @@ #include #include #include "common/dbusadpator.h" -#include "eventlogutils.h" #ifdef DTKWIDGET_CLASS_DWaterMarkHelper #include DWIDGET_USE_NAMESPACE @@ -365,26 +364,6 @@ int main(int argc, char *argv[]) // 无参数打开应用 w.show(); } - QObject::connect(&app, &DApplication::aboutToQuit,[=](){ - QString strOpenFile; - if(!listTransFiles.isEmpty()) - strOpenFile = listTransFiles[0]; - if(strOpenFile.isEmpty()) { - QJsonObject obj{ - {"tid", EventLogUtils::closeCompressWnd}, - {"operate", "closeCompressWnd"}, - {"describe", QString("Close Compress Window.")} - }; - EventLogUtils::get().writeLogs(obj); - } else { - QJsonObject obj{ - {"tid", EventLogUtils::closeCompressWnd}, - {"operate", "closeCompressWnd"}, - {"describe", QString("Close Compress Window. Close compress file : ") + strOpenFile} - }; - EventLogUtils::get().writeLogs(obj); - } - }); PERF_PRINT_END("POINT-01"); return app.exec(); diff --git a/src/source/archivemanager/archivemanager.cpp b/src/source/archivemanager/archivemanager.cpp index 06da05ea7..2b8780ce7 100644 --- a/src/source/archivemanager/archivemanager.cpp +++ b/src/source/archivemanager/archivemanager.cpp @@ -10,7 +10,6 @@ #include "pluginmanager.h" #include "singlejob.h" #include "batchjob.h" -#include "eventlogutils.h" #include #include @@ -103,12 +102,6 @@ bool ArchiveManager::createArchive(const QList &files, const QString bool ArchiveManager::loadArchive(const QString &strArchiveFullPath, UiTools::AssignPluginType eType) { qDebug() << "Starting loadArchive operation for file:" << strArchiveFullPath; - QJsonObject obj{ - {"tid", EventLogUtils::LoadCompressFile}, - {"operate", "LoadCompressFile"}, - {"describe", QString("Load Compress File : ") + strArchiveFullPath} - }; - EventLogUtils::get().writeLogs(obj); // 重新加载首先释放之前的interface if (m_pInterface != nullptr) { qDebug() << "Clearing previous archive interface"; @@ -141,12 +134,6 @@ bool ArchiveManager::loadArchive(const QString &strArchiveFullPath, UiTools::Ass bool ArchiveManager::addFiles(const QString &strArchiveFullPath, const QList &listAddEntry, const CompressOptions &stOptions) { qDebug() << "Starting addFiles operation for archive:" << strArchiveFullPath; - QJsonObject obj{ - {"tid", EventLogUtils::AddCompressFile}, - {"operate", "AddCompressFile"}, - {"describe", QString("Add File to package: ") + strArchiveFullPath} - }; - EventLogUtils::get().writeLogs(obj); // workaround: // pzip 仅支持新建压缩，目前先将zip 追加时显式指定使用 libzip 插件 UiTools::AssignPluginType eType = UiTools::APT_Auto; @@ -182,12 +169,6 @@ bool ArchiveManager::addFiles(const QString &strArchiveFullPath, const QList &files, const ExtractionOptions &stOptions, UiTools::AssignPluginType eType) { qDebug() << "Starting extractFiles operation for archive:" << strArchiveFullPath; - QJsonObject obj{ - {"tid", EventLogUtils::ExtractCompressFile}, - {"operate", "ExtractCompressFile"}, - {"describe", QString("Decompress the package : ") + strArchiveFullPath} - }; - EventLogUtils::get().writeLogs(obj); if (nullptr == m_pInterface) { qDebug() << "Creating interface for extraction"; m_pInterface = UiTools::createInterface(strArchiveFullPath, false, eType); @@ -236,12 +217,6 @@ bool ArchiveManager::extractFiles(const QString &strArchiveFullPath, const QList bool ArchiveManager::extractFiles2Path(const QString &strArchiveFullPath, const QList &listSelEntry, const ExtractionOptions &stOptions) { qDebug() << "Starting extractFiles2Path operation for archive:" << strArchiveFullPath; - QJsonObject obj{ - {"tid", EventLogUtils::ExtractSingleFile}, - {"operate", "ExtractSingleFile"}, - {"describe", QString("Extract file from the compressed package : ") + strArchiveFullPath} - }; - EventLogUtils::get().writeLogs(obj); if (nullptr == m_pInterface) { qDebug() << "Creating interface for extraction to path"; m_pInterface = UiTools::createInterface(strArchiveFullPath); @@ -271,12 +246,6 @@ bool ArchiveManager::extractFiles2Path(const QString &strArchiveFullPath, const bool ArchiveManager::deleteFiles(const QString &strArchiveFullPath, const QList &listSelEntry) { qDebug() << "Starting deleteFiles operation for archive:" << strArchiveFullPath; - QJsonObject obj{ - {"tid", EventLogUtils::DelCompressFile}, - {"operate", "DelCompressFile"}, - {"describe", QString("Delete file from package : ") + strArchiveFullPath} - }; - EventLogUtils::get().writeLogs(obj); if (nullptr == m_pInterface) { qDebug() << "Creating interface for deletion"; m_pInterface = UiTools::createInterface(strArchiveFullPath); @@ -306,12 +275,6 @@ bool ArchiveManager::deleteFiles(const QString &strArchiveFullPath, const QList< bool ArchiveManager::renameFiles(const QString &strArchiveFullPath, const QList &listSelEntry) { qDebug() << "Starting renameFiles operation for archive:" << strArchiveFullPath; - QJsonObject obj{ - {"tid", EventLogUtils::RenameCompressFile}, - {"operate", "RenameCompressFile"}, - {"describe", QString("Rename file from package : ") + strArchiveFullPath} - }; - EventLogUtils::get().writeLogs(obj); if (nullptr == m_pInterface) { qDebug() << "Creating interface for renaming"; m_pInterface = UiTools::createInterface(strArchiveFullPath); @@ -368,12 +331,6 @@ bool ArchiveManager::batchExtractFiles(const QStringList &listFiles, const QStri bool ArchiveManager::openFile(const QString &strArchiveFullPath, const FileEntry &stEntry, const QString &strTempExtractPath, const QString &strProgram) { qDebug() << "Starting openFile operation for archive:" << strArchiveFullPath; - QJsonObject obj{ - {"tid", EventLogUtils::OpenCompressFile}, - {"operate", "OpenCompressFile"}, - {"describe", QString("Open file from package : ") + strArchiveFullPath} - }; - EventLogUtils::get().writeLogs(obj); if (nullptr == m_pInterface) { qDebug() << "Creating interface for opening file"; m_pInterface = UiTools::createInterface(strArchiveFullPath); diff --git a/src/source/common/eventlogutils.h b/src/source/common/eventlogutils.h index fa36ad693..ea38de30a 100644 --- a/src/source/common/eventlogutils.h +++ b/src/source/common/eventlogutils.h @@ -18,16 +18,6 @@ class EventLogUtils Start = 1000000003, Quit = 1000000004 }; - enum CompressTID { - LoadCompressFile = 1000200040, - OpenCompressFile = 1000200041, - ExtractCompressFile = 1000200042, - ExtractSingleFile = 1000200043, - closeCompressWnd = 1000200044, - AddCompressFile = 1000200045, - DelCompressFile = 1000200046, - RenameCompressFile = 1000200047 - }; enum REPORTMODE { BROADCAST = 1, diff --git a/src/source/mainwindow.cpp b/src/source/mainwindow.cpp index f35f41df6..ed628b88f 100644 --- a/src/source/mainwindow.cpp +++ b/src/source/mainwindow.cpp @@ -1356,12 +1356,6 @@ void MainWindow::slotJobFinished(ArchiveJob::JobType eJobType, PluginFinishType void MainWindow::slotUncompressClicked(const QString &strUncompressPath) { qDebug() << "Starting extraction to path:" << strUncompressPath; - QJsonObject obj{ - {"tid", EventLogUtils::ExtractCompressFile}, - {"operate", "ExtractCompressFile"}, - {"describe", QString("Extract Compress File: ") + strUncompressPath} - }; - EventLogUtils::get().writeLogs(obj); m_operationtype = Operation_Extract; //解压操作 QString strArchiveFullPath = m_pUnCompressPage->archiveFullPath();