generic boost based file scanning

src/cpp/core/CMakeLists.txt

@@ -137,8 +137,8 @@ else()
    set(CORE_SOURCE_FILES ${CORE_SOURCE_FILES}
       Win32StringUtils.cpp
       system/DirectoryMonitor.cpp
+      system/FileScanner.cpp
       system/RegistryKey.cpp
-      system/Win32FileScanner.cpp
       system/Win32ParentProcessMonitor.cpp
       system/Win32OutputCapture.cpp
       system/Win32System.cpp

src/cpp/core/system/FileScanner.cpp

@@ -13,18 +13,88 @@
 
 #include <core/system/FileScanner.hpp>
 
+#include <boost/foreach.hpp>
+
 #include <core/Error.hpp>
+#include <core/FileInfo.hpp>
+#include <core/FilePath.hpp>
 
 namespace core {
 namespace system {
 
+namespace {
+
+inline FileInfo toFileInfo(const FilePath& filePath)
+{
+   return FileInfo(filePath);
+}
+
+} // anonymous namespace
+
 Error scanFiles(const FileInfo& fromRoot,
                 bool recursive,
                 tree<FileInfo>* pTree)
 {
    return scanFiles(pTree->set_head(fromRoot), recursive, pTree);
 }
 
+Error scanFiles(const tree<FileInfo>::iterator_base& fromNode,
+                bool recursive,
+                tree<FileInfo>* pTree)
+{
+   // clear all existing
+   pTree->erase_children(fromNode);
+
+   // create FilePath for root
+   FilePath rootPath(fromNode->absolutePath());
+
+   // read directory entries
+   std::vector<FilePath> children;
+   Error error = rootPath.children(&children);
+   if (error)
+      return error;
+
+   // convert to FileInfo and sort using alphasort equivilant (for
+   // compatability with scandir, which is what is used in our
+   // posix-specific implementation
+   std::vector<FileInfo> childrenFileInfo;
+   std::transform(children.begin(),
+                  children.end(),
+                  std::back_inserter(childrenFileInfo),
+                  toFileInfo);
+   std::sort(childrenFileInfo.begin(),
+             childrenFileInfo.end(),
+             fileInfoPathLessThan);
+
+   // iterate over entries
+   BOOST_FOREACH(const FileInfo& childFileInfo, childrenFileInfo)
+   {
+      // add the correct type of FileEntry
+      if (childFileInfo.isDirectory())
+      {
+         tree<FileInfo>::iterator_base child =
+                              pTree->append_child(fromNode, childFileInfo);
+         if (recursive)
+         {
+            Error error = scanFiles(child, true, pTree);
+            if (error)
+            {
+               LOG_ERROR(error);
+               continue;
+            }
+         }
+      }
+      else
+      {
+         pTree->append_child(fromNode, childFileInfo);
+      }
+   }
+
+   // return success
+   return Success();
+}
+
+
 } // namespace system
 } // namespace core
 

src/cpp/core/system/PosixFileScanner.cpp

@@ -35,6 +35,13 @@ int entryFilter(struct dirent *entry)
 
 } // anonymous namespace
 
+Error scanFiles(const FileInfo& fromRoot,
+                bool recursive,
+                tree<FileInfo>* pTree)
+{
+   return scanFiles(pTree->set_head(fromRoot), recursive, pTree);
+}
+
 Error scanFiles(const tree<FileInfo>::iterator_base& fromNode,
                 bool recursive,
                 tree<FileInfo>* pTree)

src/cpp/core/system/file_monitor/FileMonitor.cpp

@@ -13,6 +13,8 @@
 
 // TODO: see if there are filesystems/scenarios where filemon won't work
 
+// TODO: think more deeply about failure cases during scanning
+
 #include <core/system/FileMonitor.hpp>
 
 #include <list>