mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8130 from nextcloud/backport/8127/stable-3.16

Browse Source 
[stable-3.16] stop using QFile api to delete a single local file
This commit is contained in:
Matthieu Gallien 2025-04-08 23:24:25 +02:00 committed by GitHub
commit 2b33cddcf7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/filesystembase.cpp
View File

@ -26,6 +26,7 @@
#include <QFile>
#include <QCoreApplication>
#include <filesystem>
#include <sys/stat.h>
#include <sys/types.h>
@ -588,13 +589,30 @@ bool FileSystem::remove(const QString &fileName, QString *errorString)
// allow that.
setFileReadOnly(fileName, false);
#endif
QFile f(fileName);
if (!f.remove()) {
try {
if (!std::filesystem::remove(std::filesystem::path{fileName.toUtf8().data()})) {
if (errorString) {
*errorString = QObject::tr("File is already deleted");
}
return false;
}
}
catch (const std::filesystem::filesystem_error &e)
{
if (errorString) {
*errorString = f.errorString();
*errorString = QString::fromLatin1(e.what());
}
return false;
}
catch (...)
{
if (errorString) {
*errorString = QObject::tr("Error deleting the file");
}
return false;
}
return true;
}