Skip to content

revert to QFile::remove to remove single files #8195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgallien merged 3 commits into from
Apr 24, 2025
Merged

revert to QFile::remove to remove single files #8195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b8f129
fix: Revert "stop using QFile api to delete a single local file"
mgallien Apr 24, 2025
2bcf7ce
fix(filesystem): still use std::filesystem::remove for folders
mgallien Apr 24, 2025
0eacdce
fix(filesystem): warn when trying to delete an already deleted file
mgallien Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 8 additions & 24 deletions src/common/filesystembase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <QFile>
#include <QCoreApplication>

#include <filesystem>
#include <sys/stat.h>
#include <sys/types.h>

Expand Down Expand Up @@ -541,34 +540,19 @@ bool FileSystem::remove(const QString &fileName, QString *errorString)
// allow that.
setFileReadOnly(fileName, false);
#endif

try {
if (!std::filesystem::remove(std::filesystem::path{fileName.toStdWString()})) {
if (errorString) {
*errorString = QObject::tr("File is already deleted");
}
qCWarning(lcFileSystem()) << "File is already deleted" << fileName;
return false;
}
qCInfo(lcFileSystem()) << "delete" << fileName;
}
catch (const std::filesystem::filesystem_error &e)
{
if (errorString) {
*errorString = QString::fromLatin1(e.what());
}
qCWarning(lcFileSystem()) << e.what() << fileName;
return false;
const auto deletedFileInfo = QFileInfo{fileName};
if (!deletedFileInfo.exists()) {
qCWarning(lcFileSystem()) << fileName << "has been already deleted";
}
catch (...)
{

QFile f(fileName);
if (!f.remove()) {
if (errorString) {
*errorString = QObject::tr("Error deleting the file");
*errorString = f.errorString();
}
qCWarning(lcFileSystem()) << "Error deleting the file" << fileName;
qCWarning(lcFileSystem()) << f.errorString() << fileName;
return false;
}

return true;
}

Expand Down
20 changes: 19 additions & 1 deletion src/libsync/filesystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,25 @@ bool FileSystem::removeRecursively(const QString &path, const std::function<void
const auto parentPermissionsHandler = FileSystem::FilePermissionsRestore{parentFolderPath, FileSystem::FolderPermissions::ReadWrite};
FileSystem::setFolderPermissions(path, FileSystem::FolderPermissions::ReadWrite);
auto folderDeleteError = QString{};
allRemoved = FileSystem::remove(path, &folderDeleteError);

try {
if (!std::filesystem::remove(std::filesystem::path{fileInfo.filePath().toStdWString()})) {
qCWarning(lcFileSystem()) << "File is already deleted" << fileInfo.filePath();
}
}
catch (const std::filesystem::filesystem_error &e)
{
folderDeleteError = QString::fromLatin1(e.what());
qCWarning(lcFileSystem()) << e.what() << fileInfo.filePath();
allRemoved = false;
}
catch (...)
{
folderDeleteError = QObject::tr("Error deleting the file");
qCWarning(lcFileSystem()) << "Error deleting the file" << fileInfo.filePath();
allRemoved = false;
}

qCInfo(lcFileSystem()) << "delete" << path;
if (allRemoved) {
if (onDeleted)
Expand Down