From b486be5eb3b12c0a6fa0a81992768340317ec5c2 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Sun, 15 Oct 2017 23:24:34 -0700
Subject: Introduce VcpkgPaths::get_available_triplets()

---
 toolsrc/src/vcpkg/help.cpp       |  4 ++--
 toolsrc/src/vcpkg/vcpkgpaths.cpp | 25 ++++++++++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'toolsrc/src')

diff --git a/toolsrc/src/vcpkg/help.cpp b/toolsrc/src/vcpkg/help.cpp
index 7867f71d2..2a0578211 100644
--- a/toolsrc/src/vcpkg/help.cpp
+++ b/toolsrc/src/vcpkg/help.cpp
@@ -16,9 +16,9 @@ namespace vcpkg::Help
     void help_topic_valid_triplet(const VcpkgPaths& paths)
     {
         System::println("Available architecture triplets:");
-        for (auto&& path : paths.get_filesystem().get_files_non_recursive(paths.triplets))
+        for (auto&& triplet : paths.get_available_triplets())
         {
-            System::println("  %s", path.stem().filename().string());
+            System::println("  %s", triplet);
         }
     }
 
diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp
index 07ce5c961..c57077eaa 100644
--- a/toolsrc/src/vcpkg/vcpkgpaths.cpp
+++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp
@@ -255,18 +255,25 @@ namespace vcpkg
         return this->vcpkg_dir_info / (pgh.fullstem() + ".list");
     }
 
-    bool VcpkgPaths::is_valid_triplet(const Triplet& t) const
+    const std::vector<std::string>& VcpkgPaths::get_available_triplets() const
     {
-        for (auto&& path : get_filesystem().get_files_non_recursive(this->triplets))
-        {
-            const std::string triplet_file_name = path.stem().generic_u8string();
-            if (t.canonical_name() == triplet_file_name) // TODO: fuzzy compare
+        return this->available_triplets.get_lazy([this]() -> std::vector<std::string> {
+
+            std::vector<std::string> output;
+            for (auto&& path : this->get_filesystem().get_files_non_recursive(this->triplets))
             {
-                // t.value = triplet_file_name; // NOTE: uncomment when implementing fuzzy compare
-                return true;
+                output.push_back(path.stem().filename().string());
             }
-        }
-        return false;
+
+            return output;
+        });
+    }
+
+    bool VcpkgPaths::is_valid_triplet(const Triplet& t) const
+    {
+        auto it = Util::find_if(this->get_available_triplets(),
+                                [&](auto&& available_triplet) { return t.canonical_name() == available_triplet; });
+        return it != this->get_available_triplets().cend();
     }
 
     const fs::path& VcpkgPaths::get_cmake_exe() const
-- 
cgit v1.2.3