Filesystem library (#2879)

* move mamba_fs.hpp * Header cleanup * No util:: dependency in filesystem * Change header names * Use std::replace in filesystem
mamba-org · Oct 5, 2023 · 5a302fc · 5a302fc
1 parent 91b6c44
commit 5a302fc
Show file tree

Hide file tree

Showing 59 changed files with 184 additions and 163 deletions.
diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt
@@ -118,6 +118,8 @@ endforeach()
 set(LIBMAMBA_SOURCES
     longpath.manifest
     ${LIBMAMBA_SOURCE_DIR}/version.cpp
+    # Filesystem library
+    ${LIBMAMBA_SOURCE_DIR}/fs/filesystem.cpp
     # C++ utility library
     ${LIBMAMBA_SOURCE_DIR}/util/string.cpp
     ${LIBMAMBA_SOURCE_DIR}/util/path_manip.cpp
@@ -155,7 +157,6 @@ set(LIBMAMBA_SOURCES
     ${LIBMAMBA_SOURCE_DIR}/core/transaction_context.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/link.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/history.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/mamba_fs.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/match_spec.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/menuinst.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/output.cpp
@@ -209,6 +210,8 @@ endforeach()
 
 set(LIBMAMBA_PUBLIC_HEADERS
     ${LIBMAMBA_INCLUDE_DIR}/mamba/version.hpp
+    # Filesystem library
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/fs/filesystem.hpp
     # Utility library
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/json.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/util/deprecation.hpp
@@ -248,7 +251,6 @@ set(LIBMAMBA_PUBLIC_HEADERS
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/satisfiability_error.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/history.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/link.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/mamba_fs.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/match_spec.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/menuinst.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/output.hpp

diff --git a/libmamba/include/mamba/api/configuration.hpp b/libmamba/include/mamba/api/configuration.hpp
@@ -15,8 +15,8 @@
 #include "mamba/api/constants.hpp"
 #include "mamba/core/context.hpp"
 #include "mamba/core/environment.hpp"
-#include "mamba/core/mamba_fs.hpp"
 #include "mamba/core/output.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 
 namespace mamba

diff --git a/libmamba/include/mamba/api/configuration_impl.hpp b/libmamba/include/mamba/api/configuration_impl.hpp
@@ -9,7 +9,7 @@
 
 #include "mamba/core/common_types.hpp"
 #include "mamba/core/context.hpp"
-#include "mamba/core/mamba_fs.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 namespace mamba
 {
@@ -304,21 +304,21 @@ namespace YAML
     };
 
     template <>
-    struct convert<fs::u8path>
+    struct convert<mamba::fs::u8path>
     {
-        static Node encode(const fs::u8path& rhs)
+        static Node encode(const mamba::fs::u8path& rhs)
         {
             return Node(rhs.string());
         }
 
-        static bool decode(const Node& node, fs::u8path& rhs)
+        static bool decode(const Node& node, mamba::fs::u8path& rhs)
         {
             if (!node.IsScalar())
             {
                 return false;
             }
 
-            rhs = fs::u8path(node.as<std::string>());
+            rhs = mamba::fs::u8path(node.as<std::string>());
             return true;
         }
     };

diff --git a/libmamba/include/mamba/api/create.hpp b/libmamba/include/mamba/api/create.hpp
@@ -9,7 +9,7 @@
 
 #include <string>
 
-#include "mamba/core/mamba_fs.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 namespace mamba
 {

diff --git a/libmamba/include/mamba/api/install.hpp b/libmamba/include/mamba/api/install.hpp
@@ -15,12 +15,12 @@
 #include <yaml-cpp/yaml.h>
 
 #include "mamba/core/context.hpp"
-#include "mamba/core/mamba_fs.hpp"
 #include "mamba/core/package_cache.hpp"
 #include "mamba/core/package_info.hpp"
 #include "mamba/core/pool.hpp"
 #include "mamba/core/repo.hpp"
 #include "mamba/core/solver.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 namespace mamba
 {

diff --git a/libmamba/include/mamba/api/shell.hpp b/libmamba/include/mamba/api/shell.hpp
@@ -10,8 +10,8 @@
 #include <string>
 #include <string_view>
 
-#include "mamba/core/mamba_fs.hpp"
 #include "mamba/core/palette.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 namespace mamba
 {

diff --git a/libmamba/include/mamba/api/update.hpp b/libmamba/include/mamba/api/update.hpp
@@ -10,8 +10,8 @@
 #include <string>
 #include <vector>
 
-#include "mamba/core/mamba_fs.hpp"
 #include "mamba/core/query.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 
 namespace mamba

diff --git a/libmamba/include/mamba/core/activation.hpp b/libmamba/include/mamba/core/activation.hpp
@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>
 
-#include "mamba_fs.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 // TODO write a map that keeps insertion order
 

diff --git a/libmamba/include/mamba/core/context.hpp b/libmamba/include/mamba/core/context.hpp
@@ -13,9 +13,9 @@
 #include <vector>
 
 #include "mamba/core/common_types.hpp"
-#include "mamba/core/mamba_fs.hpp"
 #include "mamba/core/palette.hpp"
 #include "mamba/core/tasksync.hpp"
+#include "mamba/fs/filesystem.hpp"
 #include "mamba/specs/authentification_info.hpp"
 #include "mamba/specs/platform.hpp"
 #include "mamba/version.hpp"

diff --git a/libmamba/include/mamba/core/env_lockfile.hpp b/libmamba/include/mamba/core/env_lockfile.hpp
@@ -15,6 +15,8 @@
 
 #include <tl/expected.hpp>
 
+#include "mamba/fs/filesystem.hpp"
+
 #include "error_handling.hpp"
 #include "fsutil.hpp"
 #include "package_info.hpp"
@@ -111,7 +113,7 @@ namespace mamba
     /// Read an environment lock YAML file and returns it's structured content or an error if
     /// failed.
     tl::expected<EnvironmentLockFile, mamba_error>
-    read_environment_lockfile(ChannelContext& channel_context, const fs::u8path& lockfile_location);
+    read_environment_lockfile(ChannelContext& channel_context, const mamba::fs::u8path& lockfile_location);
 
 
     /// Returns `true` if the filename matches names of files which should be interpreted as conda

diff --git a/libmamba/include/mamba/core/environment.hpp b/libmamba/include/mamba/core/environment.hpp
@@ -13,7 +13,7 @@
 #include <optional>
 #include <vector>
 
-#include "mamba_fs.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 #ifdef _WIN32
 #include <Shlobj.h>

diff --git a/libmamba/include/mamba/core/fsutil.hpp b/libmamba/include/mamba/core/fsutil.hpp
@@ -9,13 +9,13 @@
 
 #include <system_error>
 
-namespace fs
-{
-    class u8path;
-}
-
 namespace mamba
 {
+    namespace fs
+    {
+        class u8path;
+    }
+
     namespace path
     {
         bool starts_with_home(const fs::u8path& p);

diff --git a/libmamba/include/mamba/core/history.hpp b/libmamba/include/mamba/core/history.hpp
@@ -12,7 +12,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "mamba_fs.hpp"
+#include "mamba/fs/filesystem.hpp"
+
 #include "match_spec.hpp"
 
 namespace mamba

diff --git a/libmamba/include/mamba/core/link.hpp b/libmamba/include/mamba/core/link.hpp
@@ -13,9 +13,9 @@
 #include <tuple>
 #include <vector>
 
+#include "mamba/fs/filesystem.hpp"
 #include "mamba/util/build.hpp"
 
-#include "mamba_fs.hpp"
 #include "match_spec.hpp"
 #include "package_paths.hpp"
 #include "transaction.hpp"

diff --git a/libmamba/include/mamba/core/menuinst.hpp b/libmamba/include/mamba/core/menuinst.hpp
@@ -1,4 +1,5 @@
-#include "mamba_fs.hpp"
+#include "mamba/fs/filesystem.hpp"
+
 #include "transaction_context.hpp"
 
 namespace mamba

diff --git a/libmamba/include/mamba/core/package_cache.hpp b/libmamba/include/mamba/core/package_cache.hpp
@@ -11,8 +11,9 @@
 #include <string>
 #include <vector>
 
+#include "mamba/fs/filesystem.hpp"
+
 #include "fsutil.hpp"
-#include "mamba_fs.hpp"
 #include "package_info.hpp"
 
 #define PACKAGE_CACHE_MAGIC_FILE "urls.txt"

diff --git a/libmamba/include/mamba/core/package_download.hpp b/libmamba/include/mamba/core/package_download.hpp
@@ -15,8 +15,9 @@
 #include <tuple>
 #include <vector>
 
+#include "mamba/fs/filesystem.hpp"
+
 #include "fetch.hpp"
-#include "mamba_fs.hpp"
 #include "package_cache.hpp"
 #include "progress_bar.hpp"
 #include "tasksync.hpp"

diff --git a/libmamba/include/mamba/core/package_handling.hpp b/libmamba/include/mamba/core/package_handling.hpp
@@ -11,7 +11,7 @@
 #include <system_error>
 #include <vector>
 
-#include "mamba_fs.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 namespace mamba
 {

diff --git a/libmamba/include/mamba/core/pool.hpp b/libmamba/include/mamba/core/pool.hpp
@@ -18,6 +18,7 @@ namespace mamba
 {
     class MatchSpec;
     class ChannelContext;
+    class Context;
 
     namespace solv
     {

diff --git a/libmamba/include/mamba/core/repo.hpp b/libmamba/include/mamba/core/repo.hpp
@@ -24,13 +24,14 @@ extern "C"
     typedef struct s_Repodata Repodata;
 }
 
-namespace fs
-{
-    class u8path;
-}
-
 namespace mamba
 {
+
+    namespace fs
+    {
+        class u8path;
+    }
+
     class PackageInfo;
     class PrefixData;
 

diff --git a/libmamba/include/mamba/core/run.hpp b/libmamba/include/mamba/core/run.hpp
@@ -9,8 +9,8 @@
 
 #include <nlohmann/json.hpp>
 
-#include "mamba/core/mamba_fs.hpp"
 #include "mamba/core/util.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 namespace mamba
 {

diff --git a/libmamba/include/mamba/core/shell_init.hpp b/libmamba/include/mamba/core/shell_init.hpp
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "mamba_fs.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 extern const char data_micromamba_sh[];
 extern const char data_micromamba_csh[];

diff --git a/libmamba/include/mamba/core/subdirdata.hpp b/libmamba/include/mamba/core/subdirdata.hpp
@@ -8,7 +8,6 @@
 #define MAMBA_CORE_SUBDIRDATA_HPP
 
 #include <memory>
-#include <regex>
 #include <string>
 
 #include <nlohmann/json_fwd.hpp>
@@ -17,11 +16,12 @@
 #include "mamba/core/context.hpp"
 #include "mamba/core/download.hpp"
 #include "mamba/core/error_handling.hpp"
-#include "mamba/core/mamba_fs.hpp"
+#include "mamba/core/fetch.hpp"
 #include "mamba/core/package_cache.hpp"
 #include "mamba/core/pool.hpp"
 #include "mamba/core/repo.hpp"
 #include "mamba/core/util.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 #include "package_handling.hpp"
 

diff --git a/libmamba/include/mamba/core/transaction.hpp b/libmamba/include/mamba/core/transaction.hpp
@@ -12,8 +12,8 @@
 #include <vector>
 
 #include "mamba/api/install.hpp"
+#include "mamba/fs/filesystem.hpp"
 
-#include "mamba_fs.hpp"
 #include "match_spec.hpp"
 #include "package_cache.hpp"
 #include "package_info.hpp"

diff --git a/libmamba/include/mamba/core/transaction_context.hpp b/libmamba/include/mamba/core/transaction_context.hpp
@@ -11,8 +11,9 @@
 
 #include <reproc++/reproc.hpp>
 
+#include "mamba/fs/filesystem.hpp"
+
 #include "context.hpp"
-#include "mamba_fs.hpp"
 #include "match_spec.hpp"
 #include "util.hpp"
 

diff --git a/libmamba/include/mamba/core/util.hpp b/libmamba/include/mamba/core/util.hpp
@@ -7,28 +7,19 @@
 #ifndef MAMBA_CORE_UTIL_HPP
 #define MAMBA_CORE_UTIL_HPP
 
-#include <array>
 #include <chrono>
-#include <limits>
+#include <fstream>
+#include <map>
 #include <optional>
-#include <sstream>
 #include <string>
 #include <string_view>
-#include <unordered_map>
 #include <vector>
 
-#include <time.h>
-
 #include "mamba/core/error_handling.hpp"
-#include "mamba/core/mamba_fs.hpp"
+#include "mamba/fs/filesystem.hpp"
 
-#include "nlohmann/json.hpp"
 #include "tl/expected.hpp"
 
-#if defined(__PPC64__) || defined(__ppc64__) || defined(_ARCH_PPC64)
-#include <iomanip>
-#endif
-
 #define MAMBA_EMPTY_SHA "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855";
 
 namespace mamba

diff --git a/libmamba/include/mamba/core/validate.hpp b/libmamba/include/mamba/core/validate.hpp
@@ -14,9 +14,9 @@
 
 #include <nlohmann/json.hpp>
 
-#include "mamba/core/mamba_fs.hpp"
 #include "mamba/core/timeref.hpp"
 #include "mamba/core/util.hpp"
+#include "mamba/fs/filesystem.hpp"
 
 namespace mamba::validation
 {