fix: remove unused canonicalUrlList function

1. Removed canonicalUrlList utility function from SystemPathUtil as it
was no longer being used
2. Updated trash file operations to directly use source URLs without
canonical processing
3. Cleaned up related code and improved consistency in file operations
logic
4. The function was redundant as URL processing is now handled more
efficiently elsewhere

Log: Removed unused URL canonicalization handling in trash operations

Influence:
1. Test all trash operations (move to/restore from/clean/copy from)
2. Verify behavior with symlinks in trash operations
3. Check error handling for invalid URLs
4. Test undo/redo operations for trash

fix: 移除未使用的canonicalUrlList函数

1. 从SystemPathUtil中移除了不再使用的canonicalUrlList工具函数
2. 更新回收站文件操作直接使用源URL而不再进行标准化处理
3. 清理了相关代码并改进了文件操作逻辑的一致性
4. 该函数已冗余，URL处理现在在其他地方更高效地完成

Log: 移除了回收站操作中未使用的URL标准化处理

Influence:
1. 测试所有回收站操作(移动到/恢复到/清空/从回收站复制)
2. 验证包含符号链接的回收站操作行为
3. 检查对无效URL的错误处理
4. 测试回收站操作的撤销/重做功能

Bug: https://pms.uniontech.com/bug-view-339887.html

Author: Johnson-zs

src/dfm-base/utils/systempathutil.cpp

@@ -203,43 +203,6 @@ void SystemPathUtil::loadSystemPaths()
     }
 }
 
-QList<QUrl> SystemPathUtil::canonicalUrlList(const QList<QUrl> &urls)
-{
-    QList<QUrl> processedUrls;
-    processedUrls.reserve(urls.size());
-
-    for (const QUrl &url : urls) {
-        if (!url.isLocalFile()) {
-            processedUrls << url;
-            continue;
-        }
-
-        auto info = InfoFactory::create<FileInfo>(url);
-        if (!info) {
-            processedUrls << url;
-            continue;
-        }
-
-        // 如果是符号链接文件
-        if (info->isAttributes(OptInfoType::kIsSymLink)) {
-            // 获取链接文件所在目录的真实路径
-            QString parentPath = QFileInfo(url.path()).dir().canonicalPath();
-            // 获取链接文件的名称
-            QString fileName = QFileInfo(url.path()).fileName();
-            // 组合出正确的路径
-            QString realLinkPath = parentPath + "/" + fileName;
-            processedUrls << QUrl::fromLocalFile(realLinkPath);
-            continue;
-        }
-
-        // 非符号链接使用canonicalFilePath
-        const QString canonicalPath = QFileInfo(url.path()).canonicalFilePath();
-        processedUrls << (canonicalPath.isEmpty() ? url : QUrl::fromLocalFile(canonicalPath));
-    }
-
-    return processedUrls;
-}
-
 QString SystemPathUtil::getRealpathSafely(const QString &path) const
 {
     QStringList components = path.split('/', Qt::SkipEmptyParts);

src/dfm-base/utils/systempathutil.h

@@ -29,7 +29,6 @@ class SystemPathUtil final : public QObject
     QString systemPathIconNameByPath(QString path);
     bool isSystemPath(QString path) const;
     bool checkContainsSystemPath(const QList<QUrl> &urlList);
-    QList<QUrl> canonicalUrlList(const QList<QUrl> &urls);
     QString getRealpathSafely(const QString &path) const;
 
 private:

src/plugins/common/dfmplugin-fileoperations/fileoperationsevent/trashfileeventreceiver.cpp

@@ -53,7 +53,7 @@ TrashFileEventReceiver::TrashFileEventReceiver(QObject *parent)
         future.waitForFinished();
         fmInfo() << "TrashFileEventReceiver cleanup completed";
     });
-    
+
     fmInfo() << "TrashFileEventReceiver initialized successfully";
 }
 
@@ -83,34 +83,33 @@ JobHandlePointer TrashFileEventReceiver::doMoveToTrash(const quint64 windowId, c
     }
 
     // gio can only handle canonical file paths
-    QList<QUrl> processedSources = SystemPathUtil::instance()->canonicalUrlList(sources);
-    const QUrl &sourceFirst = processedSources.first();
+    const QUrl &sourceFirst = sources.first();
     JobHandlePointer handle = nullptr;
     bool nullDirDelete = false;
-    if (processedSources.count() == 1) {
+    if (sources.count() == 1) {
         auto info = InfoFactory::create<FileInfo>(sourceFirst);
         nullDirDelete = info && info->isAttributes(OptInfoType::kIsDir)
                 && !info->isAttributes(OptInfoType::kIsSymLink)
                 && !info->isAttributes(OptInfoType::kIsWritable);
     }
 
     if (nullDirDelete || !FileUtils::fileCanTrash(sourceFirst)) {
-        fmInfo() << "File cannot be moved to trash, will perform direct delete operation:" 
-                 << "nullDirDelete=" << nullDirDelete 
+        fmInfo() << "File cannot be moved to trash, will perform direct delete operation:"
+                 << "nullDirDelete=" << nullDirDelete
                  << "canTrash=" << FileUtils::fileCanTrash(sourceFirst);
-        
-        if (DialogManagerInstance->showDeleteFilesDialog(processedSources, true) != QDialog::Accepted) {
+
+        if (DialogManagerInstance->showDeleteFilesDialog(sources, true) != QDialog::Accepted) {
             fmInfo() << "Delete operation cancelled by user";
             return nullptr;
         }
-        handle = copyMoveJob->deletes(processedSources, flags, isInit);
+        handle = copyMoveJob->deletes(sources, flags, isInit);
         if (!isInit)
             return handle;
     } else {
         fmInfo() << "Processing normal move to trash operation";
-        
+
         // check url permission
-        QList<QUrl> urlsCanTrash = processedSources;
+        QList<QUrl> urlsCanTrash = sources;
         if (!flags.testFlag(AbstractJobHandler::JobFlag::kRevocation) && Application::instance()->genericAttribute(Application::kShowDeleteConfirmDialog).toBool()) {
             if (DialogManagerInstance->showNormalDeleteConfirmDialog(urlsCanTrash) != QDialog::Accepted) {
                 fmInfo() << "Move to trash operation cancelled by user";
@@ -123,7 +122,7 @@ JobHandlePointer TrashFileEventReceiver::doMoveToTrash(const quint64 windowId, c
     }
     if (handleCallback)
         handleCallback(handle);
-    
+
     fmInfo() << "Move to trash operation completed successfully";
     return handle;
 }
@@ -145,7 +144,7 @@ JobHandlePointer TrashFileEventReceiver::doRestoreFromTrash(const quint64 window
         return handle;
     if (handleCallback)
         handleCallback(handle);
-    
+
     fmInfo() << "Restore from trash operation completed successfully";
     return handle;
 }
@@ -166,7 +165,7 @@ JobHandlePointer TrashFileEventReceiver::doCopyFromTrash(const quint64 windowId,
     JobHandlePointer handle = copyMoveJob->copyFromTrash(sources, target, flags);
     if (handleCallback)
         handleCallback(handle);
-    
+
     fmInfo() << "Copy from trash operation completed successfully";
     return handle;
 }
@@ -220,7 +219,7 @@ JobHandlePointer TrashFileEventReceiver::doCleanTrash(const quint64 windowId, co
     FileOperationsEventHandler::instance()->handleJobResult(AbstractJobHandler::JobType::kCleanTrashType, handle);
     if (handleCallback)
         handleCallback(handle);
-    
+
     fmInfo() << "Clean trash operation completed successfully";
     return handle;
 }
@@ -232,12 +231,12 @@ void TrashFileEventReceiver::countTrashFile(const quint64 windowId, const DFMBAS
         fmWarning() << "Count trash file operation aborted: receiver is stopping";
         return;
     }
-    
+
     fmInfo() << "Starting trash file enumeration";
     DFMIO::DEnumerator enumerator(FileUtils::trashRootUrl());
     QList<QUrl> allFilesList;
     int processedCount = 0;
-    
+
     while (enumerator.hasNext()) {
         if (stoped) {
             fmWarning() << "Count trash file operation interrupted by stop signal";
@@ -323,7 +322,7 @@ void TrashFileEventReceiver::handleOperationRestoreFromTrash(const quint64 windo
                                                              DFMBASE_NAMESPACE::AbstractJobHandler::OperatorCallback callback)
 {
     fmInfo() << "Handling restore from trash operation with callback, window ID:" << windowId << "items count:" << sources.count();
-    
+
     JobHandlePointer handle = doRestoreFromTrash(windowId, sources, target, flags, handleCallback);
     if (callback) {
         AbstractJobHandler::CallbackArgus args(new QMap<AbstractJobHandler::CallbackKey, QVariant>);
@@ -341,7 +340,7 @@ void TrashFileEventReceiver::handleOperationCleanTrash(const quint64 windowId, c
                                                        const QVariant custom, AbstractJobHandler::OperatorCallback callback)
 {
     fmInfo() << "Handling clean trash operation with callback, window ID:" << windowId << "items count:" << sources.count();
-    
+
     JobHandlePointer handle = doCleanTrash(windowId, sources, AbstractJobHandler::DeleteDialogNoticeType::kEmptyTrash, handleCallback);
     if (callback) {
         AbstractJobHandler::CallbackArgus args(new QMap<AbstractJobHandler::CallbackKey, QVariant>);
@@ -371,7 +370,7 @@ void TrashFileEventReceiver::handleOperationCopyFromTrash(const quint64 windowId
                                                           AbstractJobHandler::OperatorCallback callback)
 {
     fmInfo() << "Handling copy from trash operation with callback, window ID:" << windowId << "items count:" << sources.count();
-    
+
     JobHandlePointer handle = doCopyFromTrash(windowId, sources, target, flags, handleCallback);
     if (callback) {
         AbstractJobHandler::CallbackArgus args(new QMap<AbstractJobHandler::CallbackKey, QVariant>);
@@ -387,7 +386,7 @@ void TrashFileEventReceiver::handleOperationCopyFromTrash(const quint64 windowId
 void TrashFileEventReceiver::handleSaveRedoOpt(const QString &token, const bool moreThanZero)
 {
     fmInfo() << "Processing save redo operation for token:" << token << "moreThanZero:" << moreThanZero;
-    
+
     QVariantMap ret;
     {
         QMutexLocker lk(&undoLock);
@@ -401,24 +400,24 @@ void TrashFileEventReceiver::handleSaveRedoOpt(const QString &token, const bool
         fmWarning() << "Empty undo operation data for token:" << token;
         return;
     }
-    
+
     GlobalEventType undoEventType = static_cast<GlobalEventType>(ret.value("undoevent").value<uint16_t>());
     QList<QUrl> undoSources = QUrl::fromStringList(ret.value("undosources").toStringList());
     QList<QUrl> undoTargets = QUrl::fromStringList(ret.value("undotargets").toStringList());
     GlobalEventType redoEventType = static_cast<GlobalEventType>(ret.value("redoevent").value<uint16_t>());
     QList<QUrl> redoSources = QUrl::fromStringList(ret.value("redosources").toStringList());
     QList<QUrl> redoTargets = QUrl::fromStringList(ret.value("redotargets").toStringList());
-    
+
     if (redoEventType == GlobalEventType::kTouchFile && moreThanZero) {
         fmInfo() << "Skipping touch file redo operation due to size constraint";
         return;
     }
-    
-    fmInfo() << "Saving redo operation: undoType=" << static_cast<int>(undoEventType) 
+
+    fmInfo() << "Saving redo operation: undoType=" << static_cast<int>(undoEventType)
              << "redoType=" << static_cast<int>(redoEventType)
-             << "undoSources=" << undoSources.count() 
+             << "undoSources=" << undoSources.count()
              << "redoSources=" << redoSources.count();
-    
+
     // save operation by dbus
     QVariantMap values;
     values.insert("undoevent", QVariant::fromValue(static_cast<uint16_t>(redoEventType)));
@@ -428,7 +427,7 @@ void TrashFileEventReceiver::handleSaveRedoOpt(const QString &token, const bool
     values.insert("redosources", QUrl::toStringList(undoSources));
     values.insert("redotargets", QUrl::toStringList(undoTargets));
     dpfSignalDispatcher->publish(GlobalEventType::kSaveRedoOperator, values);
-    
+
     fmInfo() << "Redo operation saved successfully";
 }
 
@@ -439,14 +438,14 @@ void TrashFileEventReceiver::handleOperationUndoMoveToTrash(const quint64 window
                                                             const QVariantMap &op)
 {
     fmInfo() << "Processing undo move to trash operation, window ID:" << windowId << "items count:" << sources.count();
-    
+
     auto handle = doMoveToTrash(windowId, sources, flags, handleCallback, false);
 
     if (!handle) {
         fmWarning() << "Failed to create job handle for undo move to trash operation";
         return;
     }
-    
+
     connect(handle.get(), &AbstractJobHandler::requestSaveRedoOperation, this,
             &TrashFileEventReceiver::handleSaveRedoOpt);
     {
@@ -459,20 +458,20 @@ void TrashFileEventReceiver::handleOperationUndoMoveToTrash(const quint64 window
     if (handleCallback)
         handleCallback(handle);
     FileOperationsEventHandler::instance()->handleJobResult(AbstractJobHandler::JobType::kMoveToTrashType, handle);
-    
+
     fmInfo() << "Undo move to trash operation setup completed";
 }
 
 void TrashFileEventReceiver::handleOperationUndoRestoreFromTrash(const quint64 windowId, const QList<QUrl> &sources, const QUrl &target, const AbstractJobHandler::JobFlag flags, AbstractJobHandler::OperatorHandleCallback handleCallback, const QVariantMap &op)
 {
     fmInfo() << "Processing undo restore from trash operation, window ID:" << windowId << "items count:" << sources.count();
-    
+
     auto handle = doRestoreFromTrash(windowId, sources, target, flags, handleCallback, false);
     if (!handle) {
         fmWarning() << "Failed to create job handle for undo restore from trash operation";
         return;
     }
-    
+
     connect(handle.get(), &AbstractJobHandler::requestSaveRedoOperation, this,
             &TrashFileEventReceiver::handleSaveRedoOpt);
     {
@@ -485,7 +484,7 @@ void TrashFileEventReceiver::handleOperationUndoRestoreFromTrash(const quint64 w
     if (handleCallback)
         handleCallback(handle);
     FileOperationsEventHandler::instance()->handleJobResult(AbstractJobHandler::JobType::kRestoreType, handle);
-    
+
     fmInfo() << "Undo restore from trash operation setup completed";
 }
 
@@ -497,7 +496,7 @@ JobHandlePointer TrashFileEventReceiver::onCleanTrashUrls(const quint64 windowId
         fmWarning() << "Clean trash URLs operation aborted: receiver is stopping";
         return nullptr;
     }
-    
+
     fmInfo() << "Executing clean trash URLs operation for" << sources.count() << "items";
     return doCleanTrash(windowId, sources, deleteNoticeType, handleCallback, false);
 }