More expressive checks in triplet

include/vcpkg/triplet.h

@@ -78,6 +78,10 @@ namespace vcpkg
 
         Path get_triplet_file_path(Triplet triplet) const;
         bool is_valid_triplet_name(StringView name) const;
+        bool is_community_triplet_path(const Path& triplet_dir) const;
+        bool is_community_triplet(Triplet triplet) const;
+        bool is_overlay_triplet_path(const Path& triplet_dir) const;
+        bool is_overlay_triplet(Triplet triplet) const;
         bool is_valid_triplet_canonical_name(StringView name) const;
     };
 }

include/vcpkg/vcpkgpaths.h

@@ -103,6 +103,8 @@ namespace vcpkg
     public:
         std::vector<std::string> overlay_ports;
 
+        bool is_overlay_port(StringView port_name) const;
+
         std::string get_toolver_diagnostics() const;
 
         const Filesystem& get_filesystem() const;

src/vcpkg/commands.build.cpp

@@ -916,15 +916,15 @@ namespace vcpkg
         const auto& triplet_db = paths.get_triplet_db();
         const auto& triplet_file_path = triplet_db.get_triplet_file_path(triplet);
 
-        if (Strings::starts_with(triplet_file_path, triplet_db.community_triplet_directory))
+        if (triplet_db.is_community_triplet_path(triplet_file_path))
         {
             msg::print(LocalizedString::from_raw(triplet_file_path)
                            .append_raw(": ")
                            .append_raw(InfoPrefix)
                            .append(msgLoadedCommunityTriplet)
                            .append_raw('\n'));
         }
-        else if (!Strings::starts_with(triplet_file_path, triplet_db.default_triplet_directory))
+        else if (triplet_db.is_overlay_triplet_path(triplet_file_path))
         {
             msg::print(LocalizedString::from_raw(triplet_file_path)
                            .append_raw(": ")
@@ -933,7 +933,7 @@ namespace vcpkg
                            .append_raw('\n'));
         }
 
-        if (!Strings::starts_with(scfl.control_path, paths.builtin_ports_directory()))
+        if (paths.is_overlay_port(action.spec.name()))
         {
             msg::print(LocalizedString::from_raw(scfl.port_directory())
                            .append_raw(": ")

src/vcpkg/triplet.cpp

@@ -148,6 +148,26 @@ namespace vcpkg
         return is_valid_triplet_canonical_name(Strings::ascii_to_lowercase(name));
     }
 
+    bool TripletDatabase::is_community_triplet_path(const Path& path) const
+    {
+        return Strings::starts_with(path, community_triplet_directory);
+    }
+
+    bool TripletDatabase::is_community_triplet(Triplet triplet) const
+    {
+        return is_community_triplet_path(get_triplet_file_path(triplet));
+    }
+
+    bool TripletDatabase::is_overlay_triplet_path(const Path& path) const
+    {
+        return !Strings::starts_with(path, default_triplet_directory) && !is_community_triplet_path(path);
+    }
+
+    bool TripletDatabase::is_overlay_triplet(Triplet triplet) const
+    {
+        return is_overlay_triplet_path(get_triplet_file_path(triplet));
+    }
+
     bool TripletDatabase::is_valid_triplet_canonical_name(StringView name) const
     {
         return Util::any_of(available_triplets, [=](const TripletFile& tf) { return tf.name == name; });

src/vcpkg/vcpkgpaths.cpp

@@ -834,6 +834,13 @@ namespace vcpkg
             .map([](Path&& dot_git_parent) { return std::move(dot_git_parent) / ".git"; });
     }
 
+    bool VcpkgPaths::is_overlay_port(StringView port_name) const
+    {
+        return std::find_if(overlay_ports.begin(), overlay_ports.end(), [&port_name](StringView port_dir) {
+                   return Strings::ends_with(port_dir, port_name);
+               }) != overlay_ports.end();
+    }
+
     std::string VcpkgPaths::get_toolver_diagnostics() const
     {
         std::string ret;