From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Thu, 24 Apr 2025 08:07:47 +0000 (+0200)
Subject: fix(filesystem): still use std::filesystem::remove for folders
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2^2~9^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3fee74a43b935594b0878e018161c3356a6aad6d;p=nextcloud-desktop.git

fix(filesystem): still use std::filesystem::remove for folders

this API has a way to provide an error when failing to delete a folder

we may want to know why teh folderf ailed to be deleted

QDir::rmdir does not provide any error when failing to delete a folder

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp
index 55d4c3c8b..3150819a3 100644
--- a/src/libsync/filesystem.cpp
+++ b/src/libsync/filesystem.cpp
@@ -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)