Addresses Hervé's code review comments: asserts on unset attributes

Infomaniak · Oct 2, 2024 · 2e4abb8 · 2e4abb8
1 parent e7f9dc8
commit 2e4abb8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/libsyncengine/syncpal/virtualfilescleaner.cpp b/src/libsyncengine/syncpal/virtualfilescleaner.cpp
@@ -42,11 +42,12 @@ VirtualFilesCleaner::VirtualFilesCleaner(const SyncPath &path, int syncDbId) :
 
 bool VirtualFilesCleaner::run() {
     // Clear xattr on root path
+    assert(_vfsClearFileAttributes);
     _vfsClearFileAttributes(_syncDbId, _rootPath);
-    return removePlaceholdersRecursivly(_rootPath);
+    return removePlaceholdersRecursively(_rootPath);
 }
 
-bool VirtualFilesCleaner::removePlaceholdersRecursivly(const SyncPath &parentPath) {
+bool VirtualFilesCleaner::removePlaceholdersRecursively(const SyncPath &parentPath) {
     const SyncName rootPathStr = _rootPath.native();
     try {
         std::filesystem::recursive_directory_iterator dirIt;
@@ -91,6 +92,7 @@ bool VirtualFilesCleaner::removePlaceholdersRecursivly(const SyncPath &parentPat
             bool isHydrated = false;
             bool isSyncing = false;
             int progress = 0;
+            assert(_vfsStatus);
             if (!_vfsStatus(_syncDbId, dirIt->path(), isPlaceholder, isHydrated, isSyncing, progress)) {
                 LOGW_WARN(_logger, L"Error in vfsStatus for path=" << Path2WStr(dirIt->path()).c_str());
                 _exitCode = ExitCode::SystemError;
@@ -163,13 +165,15 @@ bool VirtualFilesCleaner::removePlaceholdersRecursivly(const SyncPath &parentPat
             }
 
             // Clear xattr
+            assert(_vfsClearFileAttributes);
             _vfsClearFileAttributes(_syncDbId, dirIt->path());
         }
     } catch (std::filesystem::filesystem_error &e) {
-        LOG_WARN(_logger, "Error caught in VirtualFilesCleaner::removePlaceholdersRecursivly: " << e.code() << " - " << e.what());
+        LOG_WARN(_logger,
+                 "Error caught in VirtualFilesCleaner::removePlaceholdersRecursively: " << e.code() << " - " << e.what());
         return false;
     } catch (...) {
-        LOG_WARN(_logger, "Error caught in VirtualFilesCleaner::removePlaceholdersRecursivly");
+        LOG_WARN(_logger, "Error caught in VirtualFilesCleaner::removePlaceholdersRecursively");
         return false;
     }
 

diff --git a/src/libsyncengine/syncpal/virtualfilescleaner.h b/src/libsyncengine/syncpal/virtualfilescleaner.h
@@ -41,7 +41,7 @@ class VirtualFilesCleaner {
         inline ExitCause exitCause() const { return _exitCause; }
 
     private:
-        bool removePlaceholdersRecursivly(const SyncPath &parentPath);
+        bool removePlaceholdersRecursively(const SyncPath &parentPath);
         bool recursiveDirectoryIterator(const SyncPath &path, std::filesystem::recursive_directory_iterator &dirIt);
         bool folderCanBeProcessed(std::filesystem::recursive_directory_iterator &dirIt);
 
@@ -51,8 +51,8 @@ class VirtualFilesCleaner {
         int _syncDbId{-1};
         std::shared_ptr<SyncDb> _syncDb = nullptr;
         bool (*_vfsStatus)(int syncDbId, const SyncPath &itemPath, bool &isPlaceholder, bool &isHydrated, bool &isSyncing,
-                           int &progress){nullptr};
-        bool (*_vfsClearFileAttributes)(int syncDbId, const SyncPath &itemPath){nullptr};
+                           int &progress) = nullptr;
+        bool (*_vfsClearFileAttributes)(int syncDbId, const SyncPath &itemPath) = nullptr;
 
         ExitCode _exitCode = ExitCode::Unknown;
         ExitCause _exitCause = ExitCause::Unknown;