Add ChannelContext::from_path

mamba-org · Oct 10, 2023 · ecaaf7e · ecaaf7e
1 parent 3218a52
commit ecaaf7e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/libmamba/include/mamba/core/channel.hpp b/libmamba/include/mamba/core/channel.hpp
@@ -158,7 +158,9 @@ namespace mamba
             const std::string& channel_canonical_name
         );
 
+        Channel from_any_path(specs::ChannelSpec&& spec);
         Channel from_package_path(specs::ChannelSpec&& spec);
+        Channel from_path(specs::ChannelSpec&& spec);
         Channel from_url(specs::ChannelSpec&& spec);
         Channel from_name(const std::string& name);
         Channel from_value(const std::string& value);

diff --git a/libmamba/src/core/channel.cpp b/libmamba/src/core/channel.cpp
@@ -393,9 +393,22 @@ namespace mamba
             }
             return std::array{ head.substr(0, head.size() - 1), tail };
         }
+
+        auto
+        make_platforms(util::flat_set<std::string> filters, const std::vector<std::string>& defaults)
+        {
+            if (filters.empty())
+            {
+                for (const auto& plat : defaults)
+                {
+                    filters.insert(plat);
+                }
+            }
+            return filters;
+        };
     }
 
-    Channel ChannelContext::from_package_path(specs::ChannelSpec&& spec)
+    Channel ChannelContext::from_any_path(specs::ChannelSpec&& spec)
     {
         assert(util::url_get_scheme(spec.location()) == "file");
 
@@ -413,7 +426,7 @@ namespace mamba
             );
         }
 
-        auto path = uri.path();
+        auto path = uri.pretty_path();
         auto [loc, name] = rsplit_once(path, '/');
         for (const auto& [canonical_name, chan] : get_custom_channels())
         {
@@ -437,6 +450,21 @@ namespace mamba
         );
     }
 
+    Channel ChannelContext::from_package_path(specs::ChannelSpec&& spec)
+    {
+        assert(spec.type() == specs::ChannelSpec::Type::PackagePath);
+        return from_any_path(std::move(spec));
+    }
+
+    Channel ChannelContext::from_path(specs::ChannelSpec&& spec)
+    {
+        assert(spec.type() == specs::ChannelSpec::Type::Path);
+        auto platforms = make_platforms(spec.clear_platform_filters(), m_context.platforms());
+        auto chan = from_any_path(std::move(spec));
+        chan.m_platforms = std::move(platforms);
+        return chan;
+    }
+
     namespace
     {
         // Channel configuration
@@ -706,12 +734,15 @@ namespace mamba
                 {
                     return from_package_path(std::move(spec));
                 }
+                case specs::ChannelSpec::Type::Path:
+                {
+                    return from_path(std::move(spec));
+                }
                 case specs::ChannelSpec::Type::PackageURL:
                 {
                     return from_url(std::move(spec));
                 }
                 case specs::ChannelSpec::Type::URL:
-                case specs::ChannelSpec::Type::Path:
                 {
                     auto plats = get_platforms();
                     auto chan = from_url(std::move(spec));