MRepo refactor

.clang-format

@@ -15,6 +15,7 @@ AllowShortLoopsOnASingleLine: 'false'
 AlwaysBreakTemplateDeclarations: 'true'
 BinPackArguments: false
 BinPackParameters: false
+BreakAfterAttributes: Leave
 BreakBeforeBinaryOperators: All
 BreakBeforeBraces: Allman
 BreakBeforeTernaryOperators: 'true'

Taskfile.dist.yml

@@ -11,11 +11,9 @@ vars:
   CMAKE_PRESET: 'mamba-unix-shared-debug-dev'
   CACHE_DIR: '{{.BUILD_DIR}}/pkgs'
   DOCS_DIR: '{{.BUILD_DIR}}/docs'
-  DOCS_DOXYGEN_XML_DIR:
-    sh: realpath -m '{{.DOCS_DIR}}/doxygen-xml'
+  DOCS_DOXYGEN_XML_DIR: '{{.PWD}}/{{.DOCS_DIR}}/doxygen-xml'
   MAMBA_NAME: 'mamba'  # Depend on preset...
-  TEST_MAMBA_EXE:
-    sh: 'realpath -m {{.CMAKE_BUILD_DIR}}/micromamba/{{.MAMBA_NAME}}'
+  TEST_MAMBA_EXE: '{{.PWD}}/{{.CMAKE_BUILD_DIR}}/micromamba/{{.MAMBA_NAME}}'
   CPU_PERCENTAGE: 75
   CPU_TOTAL:
     sh: >-

libmamba/CMakeLists.txt

@@ -151,6 +151,7 @@ set(
     # Filesystem library
     ${LIBMAMBA_SOURCE_DIR}/fs/filesystem.cpp
     # C++ utility library
+    ${LIBMAMBA_SOURCE_DIR}/util/cfile.cpp
     ${LIBMAMBA_SOURCE_DIR}/util/cryptography.cpp
     ${LIBMAMBA_SOURCE_DIR}/util/encoding.cpp
     ${LIBMAMBA_SOURCE_DIR}/util/environment.cpp
@@ -161,13 +162,6 @@ set(
     ${LIBMAMBA_SOURCE_DIR}/util/string.cpp
     ${LIBMAMBA_SOURCE_DIR}/util/url.cpp
     ${LIBMAMBA_SOURCE_DIR}/util/url_manip.cpp
-    # C++ wrapping of libsolv
-    ${LIBMAMBA_SOURCE_DIR}/solv-cpp/pool.cpp
-    ${LIBMAMBA_SOURCE_DIR}/solv-cpp/queue.cpp
-    ${LIBMAMBA_SOURCE_DIR}/solv-cpp/repo.cpp
-    ${LIBMAMBA_SOURCE_DIR}/solv-cpp/solvable.cpp
-    ${LIBMAMBA_SOURCE_DIR}/solv-cpp/solver.cpp
-    ${LIBMAMBA_SOURCE_DIR}/solv-cpp/transaction.cpp
     # Implementation of version and matching specs
     ${LIBMAMBA_SOURCE_DIR}/specs/archive.cpp
     ${LIBMAMBA_SOURCE_DIR}/specs/authentication_info.cpp
@@ -182,6 +176,17 @@ set(
     ${LIBMAMBA_SOURCE_DIR}/specs/unresolved_channel.cpp
     ${LIBMAMBA_SOURCE_DIR}/specs/version.cpp
     ${LIBMAMBA_SOURCE_DIR}/specs/version_spec.cpp
+    # C++ wrapping of libsolv
+    ${LIBMAMBA_SOURCE_DIR}/solv-cpp/pool.cpp
+    ${LIBMAMBA_SOURCE_DIR}/solv-cpp/queue.cpp
+    ${LIBMAMBA_SOURCE_DIR}/solv-cpp/repo.cpp
+    ${LIBMAMBA_SOURCE_DIR}/solv-cpp/solvable.cpp
+    ${LIBMAMBA_SOURCE_DIR}/solv-cpp/solver.cpp
+    ${LIBMAMBA_SOURCE_DIR}/solv-cpp/transaction.cpp
+    # Solver interface
+    ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/helpers.cpp
+    ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/parameters.cpp
+    ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/repo_info.cpp
     # Artifacts validation
     ${LIBMAMBA_SOURCE_DIR}/validation/tools.cpp
     ${LIBMAMBA_SOURCE_DIR}/validation/errors.cpp
@@ -220,7 +225,6 @@ set(
     ${LIBMAMBA_SOURCE_DIR}/core/package_fetcher.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/package_paths.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/query.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/repo.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/run.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/shell_init.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/solver.cpp
@@ -262,6 +266,7 @@ set(
     # Utility library
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/build.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/cast.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/util/cfile.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/compare.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/conditional.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/cryptography.hpp
@@ -300,6 +305,9 @@ set(
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/unresolved_channel.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/version.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/version_spec.hpp
+    # Solver Interface
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/parameters.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/repo_info.hpp
     # Artifacts validation
     ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/tools.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/validation/errors.hpp
@@ -332,7 +340,6 @@ set(
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/progress_bar.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/pinning.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/query.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/repo.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/run.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/shell_init.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/solution.hpp

libmamba/include/mamba/api/install.hpp

@@ -16,8 +16,8 @@
 
 #include "mamba/core/package_cache.hpp"
 #include "mamba/core/pool.hpp"
-#include "mamba/core/repo.hpp"
 #include "mamba/fs/filesystem.hpp"
+#include "mamba/solver/libsolv/repo_info.hpp"
 #include "mamba/specs/match_spec.hpp"
 #include "mamba/specs/package_info.hpp"
 

libmamba/include/mamba/core/pool.hpp

@@ -12,12 +12,22 @@
 
 #include <solv/pooltypes.h>
 
+#include "mamba/core/error_handling.hpp"
+#include "mamba/solver/libsolv/parameters.hpp"
+#include "mamba/solver/libsolv/repo_info.hpp"
 #include "mamba/specs/package_info.hpp"
 
 namespace mamba
 {
     class ChannelContext;
     class Context;
+    class PrefixData;
+    class MSubdirData;
+
+    namespace fs
+    {
+        class u8path;
+    }
 
     namespace solv
     {
@@ -61,6 +71,45 @@ namespace mamba
         solv::ObjPool& pool();
         const solv::ObjPool& pool() const;
 
+        auto add_repo_from_repodata_json(
+            const fs::u8path& path,
+            std::string_view url,
+            solver::libsolv::PipAsPythonDependency add = solver::libsolv::PipAsPythonDependency::No,
+            solver::libsolv::RepodataParser parser = solver::libsolv::RepodataParser::Mamba
+        ) -> expected_t<solver::libsolv::RepoInfo>;
+
+        auto add_repo_from_native_serialization(
+            const fs::u8path& path,
+            const solver::libsolv::RepodataOrigin& expected,
+            solver::libsolv::PipAsPythonDependency add = solver::libsolv::PipAsPythonDependency::No
+        ) -> expected_t<solver::libsolv::RepoInfo>;
+
+        template <typename Iter>
+        auto add_repo_from_packages(
+            Iter first_package,
+            Iter last_package,
+            std::string_view name = "",
+            solver::libsolv::PipAsPythonDependency add = solver::libsolv::PipAsPythonDependency::No
+        ) -> solver::libsolv::RepoInfo;
+
+        template <typename Range>
+        auto add_repo_from_packages(
+            const Range& packages,
+            std::string_view name = "",
+            solver::libsolv::PipAsPythonDependency add = solver::libsolv::PipAsPythonDependency::No
+        ) -> solver::libsolv::RepoInfo;
+
+        auto native_serialize_repo(
+            const solver::libsolv::RepoInfo& repo,
+            const fs::u8path& path,
+            const solver::libsolv::RepodataOrigin& metadata
+        ) -> expected_t<solver::libsolv::RepoInfo>;
+
+        void set_installed_repo(const solver::libsolv::RepoInfo& repo);
+
+        void
+        set_repo_priority(const solver::libsolv::RepoInfo& repo, solver::libsolv::Priorities priorities);
+
         void remove_repo(::Id repo_id, bool reuse_ids);
 
         ChannelContext& channel_context() const;
@@ -84,7 +133,55 @@ namespace mamba
          *    - Facilitate (potential) future investigation of parallel solves.
          */
         std::shared_ptr<MPoolData> m_data;
+
+        auto add_repo_from_packages_impl_pre(std::string_view name) -> solver::libsolv::RepoInfo;
+        void add_repo_from_packages_impl_loop(
+            const solver::libsolv::RepoInfo& repo,
+            const specs::PackageInfo& pkg
+        );
+        void add_repo_from_packages_impl_post(
+            const solver::libsolv::RepoInfo& repo,
+            solver::libsolv::PipAsPythonDependency add
+        );
     };
-}  // namespace mamba
+
+    // TODO machinery functions in separate files
+    auto load_subdir_in_pool(const Context& ctx, MPool& pool, const MSubdirData& subdir)
+        -> expected_t<solver::libsolv::RepoInfo>;
+
+    auto load_installed_packages_in_pool(const Context& ctx, MPool& pool, const PrefixData& prefix)
+        -> solver::libsolv::RepoInfo;
+
+    /********************
+     *  Implementation  *
+     ********************/
+
+    template <typename Iter>
+    auto MPool::add_repo_from_packages(
+        Iter first_package,
+        Iter last_package,
+        std::string_view name,
+        solver::libsolv::PipAsPythonDependency add
+    ) -> solver::libsolv::RepoInfo
+    {
+        auto repo = add_repo_from_packages_impl_pre(name);
+        for (; first_package != last_package; ++first_package)
+        {
+            add_repo_from_packages_impl_loop(repo, *first_package);
+        }
+        add_repo_from_packages_impl_post(repo, add);
+        return repo;
+    }
+
+    template <typename Range>
+    auto MPool::add_repo_from_packages(
+        const Range& packages,
+        std::string_view name,
+        solver::libsolv::PipAsPythonDependency add
+    ) -> solver::libsolv::RepoInfo
+    {
+        return add_repo_from_packages(packages.begin(), packages.end(), name, add);
+    }
+}
 
 #endif  // MAMBA_POOL_HPP