Merge pull request #9243 from nextcloud/bugfix/reduceLogVerbosity

fix(logs): reduce verbosity when deleting a folder content

Author: mgallien

src/gui/accountsettings.cpp

@@ -962,7 +962,7 @@ void AccountSettings::slotEnableVfsCurrentFolder()
             folder->setRootPinState(PinState::Unspecified);
             for (const auto &entry : oldBlacklist) {
                 folder->journalDb()->schedulePathForRemoteDiscovery(entry);
-                if (!folder->vfs().setPinState(entry, PinState::OnlineOnly)) {
+                if (FileSystem::fileExists(entry) && !folder->vfs().setPinState(entry, PinState::OnlineOnly)) {
                     qCWarning(lcAccountSettings) << "Could not set pin state of" << entry << "to online only";
                 }
             }

src/gui/folder.cpp

@@ -610,7 +610,7 @@ void Folder::slotWatchedPathChanged(const QStringView &path, const ChangeReason
     if (_vfs) {
         if (pathIsIgnored(path.toString())) {
             const auto pinState = _vfs->pinState(relativePath.toString());
-            if (!pinState || *pinState != PinState::Excluded) {
+            if ((!pinState || *pinState != PinState::Excluded) && FileSystem::fileExists(relativePath.toString())) {
                 if (!_vfs->setPinState(relativePath.toString(), PinState::Excluded)) {
                     qCWarning(lcFolder) << "Could not set pin state of" << relativePath << "to excluded";
                 }
@@ -646,6 +646,7 @@ void Folder::slotWatchedPathChanged(const QStringView &path, const ChangeReason
         qCDebug(lcFolder) << "Changed path was touched by SyncEngine, ignoring:" << path;
         return;
     }
+    qCDebug(lcFolder) << "Detected changes in paths:" << path;
 #endif
 
     SyncJournalFileRecord record;

src/gui/folderwatcher.cpp

@@ -279,7 +279,6 @@ void FolderWatcher::changeDetected(const QStringList &paths)
         return;
     }
 
-    qCInfo(lcFolderWatcher) << "Detected changes in paths:" << changedPaths;
     for (const auto &path : changedPaths) {
         emit pathChanged(path);
     }

src/gui/folderwatcher_win.cpp

@@ -125,7 +125,7 @@ void WatcherThread::watchChanges(size_t fileNotifyBufferSize,
                 const auto error = GetLastError();
                 if (longNameSize > 0) {
                     longfile = QString::fromWCharArray(fileNameBuffer, longNameSize);
-                } else {
+                } else if (error != ERROR_FILE_NOT_FOUND) {
                     qCWarning(lcFolderWatcher) << "Error converting file name" << longfile << "to full length, keeping original name." << Utility::formatWinError(error);
                 }
             }

src/libsync/filesystem.cpp

@@ -287,7 +287,6 @@ bool FileSystem::removeRecursively(const QString &path,
             } else {
                 removeOk = FileSystem::remove(di.filePath(), &removeError);
             }
-            qCInfo(lcFileSystem()) << "delete" << di.filePath();
             if (removeOk) {
                 if (onDeleted)
                     onDeleted(di.filePath(), false);
@@ -330,7 +329,6 @@ bool FileSystem::removeRecursively(const QString &path,
             allRemoved = false;
         }
 
-        qCInfo(lcFileSystem()) << "delete" << path;
         if (allRemoved) {
             if (onDeleted)
                 onDeleted(path, true);

src/libsync/propagatorjobs.cpp

@@ -53,6 +53,11 @@ bool PropagateLocalRemove::removeRecursively(const QString &path)
     const auto fileInfo = QFileInfo{absolute};
     const auto parentFolderPath = fileInfo.dir().absolutePath();
     const auto parentPermissionsHandler = FileSystem::FilePermissionsRestore{parentFolderPath, FileSystem::FolderPermissions::ReadWrite};
+
+    qCInfo(lcPropagateLocalRemove()) << "delete" << absolute;
+
+    Q_EMIT propagator()->touchedFile(absolute);
+
     const auto success = FileSystem::removeRecursively(absolute,
                                                        [&deleted](const QString &path, bool isDir) {
                                                            // by prepending, a folder deletion may be followed by content deletions
@@ -63,7 +68,6 @@ bool PropagateLocalRemove::removeRecursively(const QString &path)
                                                        [this] (const QString &itemPath, QString *removeError) -> bool {
                                                            auto result = false;
 
-                                                           qCInfo(lcPropagateLocalRemove()) << itemPath << _deleteToClientTrashBin;
                                                            if (_deleteToClientTrashBin.contains(itemPath)) {
                                                                result = FileSystem::moveToTrash(itemPath, removeError);
                                                                if (!result) {

src/libsync/syncengine.cpp

@@ -1171,6 +1171,8 @@ void SyncEngine::handleRemnantReadOnlyFolders()
             const auto deletionCallback = [this] (const QString &deleteItem, bool) {
                 slotAddTouchedFile(deleteItem);
             };
+
+            qCInfo(lcEngine()) << "delete" << _localPath + oneFolder->_file;
             FileSystem::removeRecursively(_localPath + oneFolder->_file, deletionCallback, nullptr, deletionCallback);
         } else {
             FileSystem::remove(_localPath + oneFolder->_file);

src/libsync/vfs/cfapi/cfapiwrapper.cpp

@@ -1013,6 +1013,10 @@ OCC::CfApiWrapper::FileHandle OCC::CfApiWrapper::handleForPath(const QString &pa
 
 OCC::CfApiWrapper::PlaceHolderInfo OCC::CfApiWrapper::findPlaceholderInfo(const QString &path)
 {
+    if (!FileSystem::fileExists(path)) {
+        return {};
+    }
+
     if (auto handle = handleForPath(path)) {
         std::vector<char> buffer(512);
         DWORD actualSize = {};