add onBeforeScanDir hook to FileScanner

rstudio · Sep 7, 2011 · 409011f · 409011f
1 parent cb072e9
commit 409011f
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 17 deletions.
diff --git a/src/cpp/core/include/core/system/FileScanner.hpp b/src/cpp/core/include/core/system/FileScanner.hpp
@@ -17,6 +17,7 @@
 
 #include <boost/function.hpp>
 
+#include <core/Error.hpp>
 #include <core/FileInfo.hpp>
 
 #include <core/collection/Tree.hpp>
@@ -34,15 +35,49 @@ class Error;
 
 namespace system {
 
-Error scanFiles(const FileInfo& fromRoot,
+Error scanFiles(const tree<FileInfo>::iterator_base& fromNode,
                 bool recursive,
                 const boost::function<bool(const FileInfo&)>& filter,
+                const boost::function<void(const FileInfo&)>& onBeforeScanDir,
                 tree<FileInfo>* pTree);
 
+Error scanFiles(const FileInfo& fromRoot,
+                bool recursive,
+                const boost::function<bool(const FileInfo&)>& filter,
+                const boost::function<void(const FileInfo&)>& onBeforeScanDir,
+                tree<FileInfo>* pTree)
+{
+   return scanFiles(pTree->set_head(fromRoot),
+                    recursive,
+                    filter,
+                    onBeforeScanDir,
+                    pTree);
+}
+
+
+Error scanFiles(const FileInfo& fromRoot,
+                bool recursive,
+                const boost::function<bool(const FileInfo&)>& filter,
+                tree<FileInfo>* pTree)
+{
+   return scanFiles(fromRoot,
+                    recursive,
+                    filter,
+                    boost::function<void(const FileInfo&)>(),
+                    pTree);
+}
+
 Error scanFiles(const tree<FileInfo>::iterator_base& fromNode,
                 bool recursive,
                 const boost::function<bool(const FileInfo&)>& filter,
-                tree<FileInfo>* pTree);
+                tree<FileInfo>* pTree)
+{
+   return scanFiles(fromNode,
+                    recursive,
+                    filter,
+                    boost::function<void(const FileInfo&)>(),
+                    pTree);
+}
 
 } // namespace system
 } // namespace core

diff --git a/src/cpp/core/system/PosixFileScanner.cpp b/src/cpp/core/system/PosixFileScanner.cpp
@@ -38,17 +38,10 @@ int entryFilter(const struct dirent *entry)
 
 } // anonymous namespace
 
-Error scanFiles(const FileInfo& fromRoot,
-                bool recursive,
-                const boost::function<bool(const FileInfo&)>& filter,
-                tree<FileInfo>* pTree)
-{
-   return scanFiles(pTree->set_head(fromRoot), recursive, filter, pTree);
-}
-
 Error scanFiles(const tree<FileInfo>::iterator_base& fromNode,
                 bool recursive,
                 const boost::function<bool(const FileInfo&)>& filter,
+                const boost::function<void(const FileInfo&)>& onBeforeScanDir,
                 tree<FileInfo>* pTree)
 {
    // clear all existing
@@ -57,6 +50,10 @@ Error scanFiles(const tree<FileInfo>::iterator_base& fromNode,
    // create FilePath for root
    FilePath rootPath(fromNode->absolutePath());
 
+   // call onBeforeScanDir hook
+   if (onBeforeScanDir)
+      onBeforeScanDir(*fromNode);
+
    // read directory contents
    struct dirent **namelist;
    int entries = ::scandir(fromNode->absolutePath().c_str(),

diff --git a/src/cpp/core/system/Win32FileScanner.cpp b/src/cpp/core/system/Win32FileScanner.cpp
@@ -46,13 +46,6 @@ FileInfo toFileInfo(const FilePath& filePath)
 
 } // anonymous namespace
 
-Error scanFiles(const FileInfo& fromRoot,
-                bool recursive,
-                const boost::function<bool(const FileInfo&)>& filter,
-                tree<FileInfo>* pTree)
-{
-   return scanFiles(pTree->set_head(fromRoot), recursive, filter, pTree);
-}
 
 // NOTE: we bail with an error if the top level directory can't be
 // enumerated however we merely log errors for children. this reflects
@@ -65,6 +58,7 @@ Error scanFiles(const FileInfo& fromRoot,
 Error scanFiles(const tree<FileInfo>::iterator_base& fromNode,
                 bool recursive,
                 const boost::function<bool(const FileInfo&)>& filter,
+                const boost::function<void(const FileInfo&)>& onBeforeScanDir,
                 tree<FileInfo>* pTree)
 {
    // clear all existing
@@ -73,6 +67,10 @@ Error scanFiles(const tree<FileInfo>::iterator_base& fromNode,
    // create FilePath for root
    FilePath rootPath(fromNode->absolutePath());
 
+   // call onBeforeScanDir hook
+   if (onBeforeScanDir)
+      onBeforeScanDir(*fromNode);
+
    // read directory entries
    std::vector<FilePath> children;
    Error error = rootPath.children(&children);

diff --git a/src/cpp/core/system/file_monitor/LinuxFileMonitor.cpp b/src/cpp/core/system/file_monitor/LinuxFileMonitor.cpp
@@ -31,6 +31,8 @@
 
 #include "FileMonitorImpl.hpp"
 
+// TODO: what happens if a symlink is the root entry
+
 // TODO: investigate parallel package (multicore) interactions with file monitor
 
 namespace core {