openkylin
/
peony
mirror of https://gitee.com/openkylin/peony.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

FileMoveOperation: 优化fallback move操作拷贝完成后续执行删除的流程 

1、如果文件和链接文件的overwrite操作有错，设置node的errorResponseTyep为Invalid
2、当moveaction为targetmove时，执行删除操作
3、根据node的state、response type决定是否删除文件/文件夹
This commit is contained in:
Yue-Lan 2023-09-01 10:33:40 +08:00
parent 288f4927b1
commit 031bf897ed
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libpeony-qt/file-operation/file-move-operation.cpp
View File

@ -1253,6 +1253,7 @@ fallback_retry:
// node->setErrorResponse(OverWriteOne);
if (nodeErr){
// setHasError(true);
node->setErrorResponse(Invalid);
g_error_free(nodeErr);
}else{
// setHasError(false);
@ -1296,6 +1297,7 @@ fallback_retry:
m_prehandle_hash.insert(err->code, OverWriteAll);
if (nodeErr){
// setHasError(true);
node->setErrorResponse(Invalid);
g_error_free(nodeErr);
}else{
// setHasError(false);
@ -1436,24 +1438,30 @@ fallback_retry:
void FileMoveOperation::deleteRecursively(FileNode *node)
{
qDebug() << "deleteRecursively:"<<node->uri()<<isCancelled()<<hasError();
if (isCancelled() || hasError())
if (isCancelled()/* || hasError()*/)
return;
// 在外部判断可以节约时间
// if (m_info->m_type != FileOperationInfo::Move) {
// return;
// }
g_autoptr(GFile) file = g_file_new_for_uri(node->uri().toUtf8().constData());
if (node->isFolder()) {
for (auto child : *(node->children())) {
deleteRecursively(child);
}
if (node->state() != FileNode::Unhandled) {
g_file_delete(file, getCancellable().get()->get(), nullptr);
node->setState(FileNode::Handled);
}
} else {
if (node->state() != FileNode::Unhandled) {
g_file_delete(file, getCancellable().get()->get(), nullptr);
node->setState(FileNode::Handled);
if (node->state() == FileNode::Handled || node->responseType() == OverWriteOne || node->responseType() == OverWriteAll) {
if (node->isFolder()) {
for (auto child : *(node->children())) {
deleteRecursively(child);
}
g_file_delete(file, /*getCancellable().get()->get()*/nullptr, nullptr);
} else {
// targetmove替换时原文件也需要删除，需要注意替换可能会失败的情况，这里只是一层保险，
// 在overwrite操作时应该判断是否overwrite成功，如果不成功需要设置response type为invalid
if (FileUtils::isFileExsit(node->destUri())) {
g_file_delete(file, /*getCancellable().get()->get()*/nullptr, nullptr);
}
}
}
operationAfterProgressedOne(node->uri());
}
@ -1768,13 +1776,13 @@ bool FileMoveOperation::copyLinkedFile(FileNode *node, GFileInfo *info, GFileWra
break;
}
case OverWriteOne: {
node->setErrorResponse(OverWriteOne);
g_file_delete(file.get()->get(), nullptr, nullptr);
bool success = g_file_delete(file.get()->get(), nullptr, nullptr);
node->setErrorResponse(success? OverWriteOne: Invalid);
return false;
}
case OverWriteAll: {
node->setErrorResponse(OverWriteOne);
g_file_delete(file.get()->get(), nullptr, nullptr);
bool success = g_file_delete(file.get()->get(), nullptr, nullptr);
node->setErrorResponse(success? OverWriteOne: Invalid);
m_prehandle_hash.insert(err->code, OverWriteOne);
break;
}