Merge pull request #1 from Microsoft/master

pull

1 files changed, 46 insertions, 7 deletions

diff --git a/toolsrc/include/vcpkg_Files.h b/toolsrc/include/vcpkg_Files.h
index 445713965..3f9570946 100644
--- a/toolsrc/include/vcpkg_Files.h
+++ b/toolsrc/include/vcpkg_Files.h
@@ -1,17 +1,56 @@
 #pragma once
 
 #include "expected.h"
-#include <filesystem>
+#include "filesystem_fs.h"
+#include <iterator>
 
-namespace vcpkg {namespace Files
+namespace vcpkg::Files
 {
     static const char* FILESYSTEM_INVALID_CHARACTERS = R"(\/:*?"<>|)";
 
-    void check_is_directory(const std::tr2::sys::path& dirpath);
+    void check_is_directory(const fs::path& dirpath);
 
-    bool has_invalid_chars_for_filesystem(const std::string s);
+    bool has_invalid_chars_for_filesystem(const std::string& s);
 
-    expected<std::string> get_contents(const std::tr2::sys::path& file_path) noexcept;
+    expected<std::string> read_contents(const fs::path& file_path) noexcept;
 
-    std::tr2::sys::path find_file_recursively_up(const std::tr2::sys::path& starting_dir, const std::string& filename);
-}}
+    expected<std::vector<std::string>> read_all_lines(const fs::path& file_path);
+
+    void write_all_lines(const fs::path& file_path, const std::vector<std::string>& lines);
+
+    fs::path find_file_recursively_up(const fs::path& starting_dir, const std::string& filename);
+
+    template <class Pred>
+    void non_recursive_find_matching_paths_in_dir(const fs::path& dir, const Pred predicate, std::vector<fs::path>* output)
+    {
+        std::copy_if(fs::directory_iterator(dir), fs::directory_iterator(), std::back_inserter(*output), predicate);
+    }
+
+    template <class Pred>
+    void recursive_find_matching_paths_in_dir(const fs::path& dir, const Pred predicate, std::vector<fs::path>* output)
+    {
+        std::copy_if(fs::recursive_directory_iterator(dir), fs::recursive_directory_iterator(), std::back_inserter(*output), predicate);
+    }
+
+    template <class Pred>
+    std::vector<fs::path> recursive_find_matching_paths_in_dir(const fs::path& dir, const Pred predicate)
+    {
+        std::vector<fs::path> v;
+        recursive_find_matching_paths_in_dir(dir, predicate, &v);
+        return v;
+    }
+
+    void recursive_find_files_with_extension_in_dir(const fs::path& dir, const std::string& extension, std::vector<fs::path>* output);
+
+    std::vector<fs::path> recursive_find_files_with_extension_in_dir(const fs::path& dir, const std::string& extension);
+
+    void recursive_find_all_files_in_dir(const fs::path& dir, std::vector<fs::path>* output);
+
+    std::vector<fs::path> recursive_find_all_files_in_dir(const fs::path& dir);
+
+    void non_recursive_find_all_files_in_dir(const fs::path& dir, std::vector<fs::path>* output);
+
+    std::vector<fs::path> non_recursive_find_all_files_in_dir(const fs::path& dir);
+
+    void print_paths(const std::vector<fs::path>& paths);
+}