Fixed python bindings

mamba-org · Sep 26, 2023 · 43488f7 · 43488f7
1 parent 431a0e2
commit 43488f7
Show file tree

Hide file tree

Showing 8 changed files with 508 additions and 193 deletions.
diff --git a/libmamba/include/mamba/core/download.hpp b/libmamba/include/mamba/core/download.hpp
@@ -97,7 +97,7 @@ namespace mamba
         bool sort = true;
         termination_function on_unexpected_termination = std::nullopt;
     };
-    
+
     class DownloadMonitor
     {
     public:
@@ -118,8 +118,12 @@ namespace mamba
         DownloadMonitor() = default;
     };
 
-    MultiDownloadResult
-    download(MultiDownloadRequest requests, const Context& context, DownloadOptions options = {}, DownloadMonitor* monitor = nullptr);
+    MultiDownloadResult download(
+        MultiDownloadRequest requests,
+        const Context& context,
+        DownloadOptions options = {},
+        DownloadMonitor* monitor = nullptr
+    );
 
 }
 

diff --git a/libmamba/src/api/channel_loader.cpp b/libmamba/src/api/channel_loader.cpp
@@ -102,7 +102,7 @@ namespace mamba
         expected_t<void> download_res;
         if (DownloadProgressBar::can_monitor(ctx))
         {
-            DownloadProgressBar check_monitor({true, true});
+            DownloadProgressBar check_monitor({ true, true });
             DownloadProgressBar index_monitor;
             download_res = MSubdirData::download_indexes(subdirs, ctx, &check_monitor, &index_monitor);
         }
@@ -120,7 +120,6 @@ namespace mamba
             {
                 return tl::unexpected(mamba_aggregated_error(std::move(error_list)));
             }
-
         }
 
         if (ctx.offline)

diff --git a/libmamba/src/core/download.cpp b/libmamba/src/core/download.cpp
@@ -790,8 +790,12 @@ namespace mamba
     {
     }
 
-    MultiDownloadResult
-    download(MultiDownloadRequest requests, const Context& context, DownloadOptions options, DownloadMonitor* monitor)
+    MultiDownloadResult download(
+        MultiDownloadRequest requests,
+        const Context& context,
+        DownloadOptions options,
+        DownloadMonitor* monitor
+    )
     {
         if (!context.remote_fetch_params.curl_initialized)
         {

diff --git a/libmamba/src/core/download_progress_bar.cpp b/libmamba/src/core/download_progress_bar.cpp
@@ -8,7 +8,7 @@ namespace mamba
         : m_options(std::move(options))
     {
     }
-    
+
     void DownloadProgressBar::reset_options(MonitorOptions options)
     {
         m_options = std::move(options);
@@ -43,7 +43,7 @@ namespace mamba
         {
             pbar_manager.watch_print();
         }
-        
+
         options.on_unexpected_termination = [this]() { on_unexpected_termination(); };
     }
 

diff --git a/libmamba/src/core/subdirdata.cpp b/libmamba/src/core/subdirdata.cpp
@@ -473,7 +473,7 @@ namespace mamba
             }
         }
         download(std::move(check_requests), context, {}, check_monitor);
-         
+
         if (is_sig_interrupted())
         {
             return make_unexpected("Interrupted by user", mamba_error_code::user_interrupted);
-Original file line number
+Diff line change
@@ Expand Up / @@ -473,7 +473,7 @@ namespace mamba @@
                 }
             }
             download(std::move(check_requests), context, {}, check_monitor);
             if (is_sig_interrupted())
             {
                 return make_unexpected("Interrupted by user", mamba_error_code::user_interrupted);
@@ Expand Down @@