Rename wipeVirtualFiles -> wipeDehydratedVirtualFiles and document

src/common/vfs.cpp

@@ -145,21 +145,30 @@ Vfs::AvailabilityResult Vfs::availabilityInDb(const QString &folderPath)
     return AvailabilityError::NoSuchItem;
 }
 
-void Vfs::wipeVirtualFiles()
+void Vfs::wipeDehydratedVirtualFiles()
 {
+    if (mode() == Vfs::Mode::Off) {
+        // there are no placeholders
+        return;
+    }
     _setupParams->journal->getFilesBelowPath(QByteArray(), [&](const SyncJournalFileRecord &rec) {
-        if (rec._type != ItemTypeVirtualFile && rec._type != ItemTypeVirtualFileDownload)
+        // only handle dehydrated files
+        if (rec._type != ItemTypeVirtualFile && rec._type != ItemTypeVirtualFileDownload) {
             return;
-
-        qCDebug(lcVfs) << "Removing db record for" << rec._path;
-        _setupParams->journal->deleteFileRecord(QString::fromUtf8(rec._path));
+        }
+        const QString relativePath = QString::fromUtf8(rec._path);
+        qCDebug(lcVfs) << "Removing db record for dehydrated file" << relativePath;
+        _setupParams->journal->deleteFileRecord(relativePath);
 
         // If the local file is a dehydrated placeholder, wipe it too.
         // Otherwise leave it to allow the next sync to have a new-new conflict.
-        QString localFile = _setupParams->filesystemPath + QString::fromUtf8(rec._path);
-        if (QFile::exists(localFile) && isDehydratedPlaceholder(localFile)) {
-            qCDebug(lcVfs) << "Removing local dehydrated placeholder" << rec._path;
-            FileSystem::remove(localFile);
+        const QString absolutePath = _setupParams->filesystemPath + relativePath;
+        if (QFile::exists(absolutePath)) {
+            // according to our db this is a dehydrated file, check it  to be sure
+            if (isDehydratedPlaceholder(absolutePath)) {
+                qCDebug(lcVfs) << "Removing local dehydrated placeholder" << relativePath;
+                FileSystem::remove(absolutePath);
+            }
         }
     });
 

src/common/vfs.h

@@ -229,9 +229,8 @@ class OCSYNC_EXPORT Vfs : public QObject
      *
      * Particularly useful when switching off vfs mode or switching to a
      * different kind of vfs.
-     *
      */
-    void wipeVirtualFiles();
+    void wipeDehydratedVirtualFiles();
 
 public slots:
     /** Update in-sync state based on SyncFileStatusTracker signal.

src/gui/folder.cpp

@@ -169,7 +169,7 @@ Folder::Folder(const FolderDefinition &definition,
             if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
                 if (auto winvfs = VfsPluginManager::instance().createVfsFromPlugin(Vfs::WindowsCfApi)) {
                     // Wipe the existing suffix files from fs and journal
-                    _vfs->wipeVirtualFiles();
+                    _vfs->wipeDehydratedVirtualFiles();
 
                     // Then switch to winvfs mode
                     _vfs.reset(winvfs.release());
@@ -771,7 +771,7 @@ void Folder::setVirtualFilesEnabled(bool enabled)
     if (newMode != _definition.virtualFilesMode) {
         // TODO: Must wait for current sync to finish!
         OC_ENFORCE(!isSyncRunning());
-        _vfs->wipeVirtualFiles();
+        _vfs->wipeDehydratedVirtualFiles();
 
         _vfs->stop();
         _vfs->unregisterFolder();
@@ -1281,7 +1281,7 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction direction)
             // reset the db upload all local files or download all remote files
             FileSystem::setFolderMinimumPermissions(path());
             // will remove all dehydrated placeholders
-            _vfs->wipeVirtualFiles();
+            _vfs->wipeDehydratedVirtualFiles();
             journalDb()->clearFileTable();
         }
         // if all local files where placeholders, they might be gone after the next sync

test/testsyncvirtualfiles.cpp

@@ -891,7 +891,7 @@ private slots:
         QVERIFY(fakeFolder.applyLocalModificationsWithoutSync());
 
         // Now wipe the virtuals
-        fakeFolder.syncEngine().syncOptions()._vfs->wipeVirtualFiles();
+        fakeFolder.syncEngine().syncOptions()._vfs->wipeDehydratedVirtualFiles();
 
         QVERIFY(!fakeFolder.currentLocalState().find(QStringLiteral("f1") + Theme::instance()->appDotVirtualFileSuffix()));
         QVERIFY(!fakeFolder.currentLocalState().find(QStringLiteral("A/a1") + Theme::instance()->appDotVirtualFileSuffix()));