feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix FilePath::renameFile if source and target are on a different device

Browse Source 
Change-Id: I7d6c93769c943325cc986fdebda1228dbaa95bfb
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-09-12 08:03:15 +02:00
parent d72d40fbe5
commit 5fb9afe492
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/utils/filepath.cpp
View File

@@ -2024,7 +2024,23 @@ expected_str<void> FilePath::copyFile(const FilePath &target) const
expected_str<void> FilePath::renameFile(const FilePath &target) const
{
return fileAccess()->renameFile(*this, target);
if (isSameDevice(target))
return fileAccess()->renameFile(*this, target);
return copyFile(target).and_then([this, &target] {
return removeFile().or_else(
[this, &target](const QString &removeError) -> expected_str<void> {
// If we fail to remove the source file, we remove the target file to return to the
// original state.
expected_str<void> rmResult = target.removeFile();
QTC_CHECK_EXPECTED(rmResult);
return make_unexpected(
Tr::tr("Failed to move %1 to %2. Removing the source file failed: %3")
.arg(toUserOutput())
.arg(target.toUserOutput())
.arg(removeError));
});
});
}
qint64 FilePath::fileSize() const