fix: When restoring files with long file names from trash, the prompt…

… window icon and file size display error for replacing existing files Create a fileinfo using the scheme of trash, retrieve the restored original path, and recreate the fileinfo Log: When restoring files with long file names from trash, the prompt window icon and file size display error for replacing existing files Bug: https://pms.uniontech.com/bug-view-259587.html
linuxdeepin · Jun 19, 2024 · f614642 · f614642
1 parent 9adc344
commit f614642
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...core/dfmplugin-fileoperations/fileoperations/fileoperationutils/fileoperatebaseworker.cpp b/...core/dfmplugin-fileoperations/fileoperations/fileoperationutils/fileoperatebaseworker.cpp
@@ -786,7 +786,6 @@ void FileOperateBaseWorker::initCopyWay()
 
 QUrl FileOperateBaseWorker::trashInfo(const DFileInfoPointer &fromInfo)
 {
-
     auto parentPath = parentUrl(fromInfo->uri()).path();
     if (!parentPath.endsWith("files"))
         return QUrl();

diff --git a/...mon/core/dfmplugin-fileoperations/fileoperations/trashfiles/dorestoretrashfilesworker.cpp b/...mon/core/dfmplugin-fileoperations/fileoperations/trashfiles/dorestoretrashfilesworker.cpp
@@ -173,8 +173,11 @@ bool DoRestoreTrashFilesWorker::doRestoreTrashFiles()
             }
         }
         DFileInfoPointer fileInfo { new DFileInfo(url) };
+
         // read trash info
         QUrl trashInfoUrl { fileInfo->attribute(DFileInfo::AttributeID::kStandardTargetUri).toString().replace("/files/", "/info/") + ".trashinfo" };
+        QUrl trashUrl = QUrl(fileInfo->attribute(DFileInfo::AttributeID::kStandardTargetUri).toString());
+        fileInfo.reset(new DFileInfo(trashUrl));
         const QString &trashInfoCache { DFMIO::DFile(trashInfoUrl).readAll() };
         emitCurrentTaskNotify(url, restoreInfo->uri());
         bool ok = false;