updated CHANGELOG.md

CHANGELOG.md

@@ -9,6 +9,7 @@
 * ~~\#22 [Unit Test] Complete FUSE unit tests~~
 * ~~\#33 Complete initial v2.0 documentation~~
 * \#42 [bug] Remote mount directory listing on Windows connected to Linux is failing
+* ~~\#43 [bug] Directories are not importing properly for Sia~~
 
 ### Changes from v2.0.5-rc
 

repertory/librepertory/include/comm/curl/curl_comm.hpp

@@ -213,7 +213,6 @@ public:
     }
 
     auto url = construct_url(curl, request.get_path(), cfg) + parameters;
-    fmt::println("url|{}", url);
     curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
 
     multi_request curl_request(curl, stop_requested);

repertory/librepertory/src/providers/base_provider.cpp

@@ -584,8 +584,6 @@ void base_provider::process_removed_items(stop_type &stop_requested) {
                     }
 
                     if (utils::string::to_bool(meta[META_DIRECTORY])) {
-                      fmt::println("checking|{}|{}", api_path,
-                                   json(meta).dump());
                       bool exists{};
                       if (is_directory(api_path, exists) !=
                           api_error::success) {
@@ -596,8 +594,6 @@ void base_provider::process_removed_items(stop_type &stop_requested) {
                         return;
                       }
 
-                      fmt::println("not found|{}|{}", api_path,
-                                   json(meta).dump());
                       process_removed_directories(
                           {
                               removed_item{api_path, true, ""},

repertory/librepertory/src/providers/sia/sia_provider.cpp

@@ -369,7 +369,6 @@ auto sia_provider::get_object_info(const std::string &api_path,
     get.path = "/api/bus/object" + api_path;
     get.query["bucket"] = get_bucket(get_sia_config());
     get.query["onlymetadata"] = "true";
-    fmt::println("bucket|{}|{}", get.query["bucket"], get.path);
 
     std::string error_data;
     get.response_handler = [&error_data, &object_info](auto &&data,
@@ -512,7 +511,6 @@ auto sia_provider::is_directory(const std::string &api_path, bool &exists) const
     exists = false;
 
     json file_data{};
-    fmt::println("{}", api_path + '/');
     auto res{get_object_info(api_path + '/', file_data)};
     if (res == api_error::item_not_found) {
       return api_error::success;
@@ -638,7 +636,6 @@ auto sia_provider::read_file_bytes(const std::string &api_path,
          ++idx) {
       long response_code{};
       const auto notify_retry = [&]() {
-        fmt::println("{}", std::string(buffer.begin(), buffer.end()));
         if (response_code == 0) {
           utils::error::raise_api_path_error(
               function_name, api_path, api_error::comm_error,

repertory/repertory_test/include/fixtures/fuse_fixture.hpp

@@ -78,7 +78,7 @@ struct remote_sia final {
 struct remote_linux_to_winfsp final {
   static constexpr const provider_type type{provider_type::remote};
   static constexpr const provider_type type2{provider_type::unknown};
-  static constexpr const std::uint16_t port{30001U};
+  static constexpr const std::uint16_t port{40001U};
 };
 
 template <typename provider_t> class fuse_test : public ::testing::Test {
@@ -123,7 +123,7 @@ protected:
 
           auto r_cfg = config->get_remote_mount();
           r_cfg.enable = true;
-          r_cfg.api_port = 30000U;
+          r_cfg.api_port = 40000U;
           config->set_remote_mount(r_cfg);
         }
 
@@ -170,7 +170,7 @@ protected:
 
           auto r_cfg = config->get_remote_mount();
           r_cfg.enable = true;
-          r_cfg.api_port = 30000U;
+          r_cfg.api_port = 40000U;
           config->set_remote_mount(r_cfg);
         }
 
@@ -188,7 +188,7 @@ protected:
       execute_mount(drive_args, mount_location);
     };
 
-    const auto mount_remote = [&](std::uint16_t port = 30000U) {
+    const auto mount_remote = [&](std::uint16_t port = 40000U) {
       {
         mount_location2 = mount_location;
 

repertory/repertory_test/include/fixtures/winfsp_fixture.hpp

@@ -69,7 +69,7 @@ struct remote_sia final {
 struct remote_winfsp_to_linux final {
   static constexpr const provider_type type{provider_type::remote};
   static constexpr const provider_type type2{provider_type::unknown};
-  static constexpr const std::uint16_t port{30001U};
+  static constexpr const std::uint16_t port{40001U};
 };
 
 template <typename provider_t> class winfsp_test : public ::testing::Test {
@@ -112,7 +112,7 @@ protected:
 
           auto r_cfg = config->get_remote_mount();
           r_cfg.enable = true;
-          r_cfg.api_port = 30000U;
+          r_cfg.api_port = 40000U;
           config->set_remote_mount(r_cfg);
         }
 
@@ -154,7 +154,7 @@ protected:
 
           auto r_cfg = config->get_remote_mount();
           r_cfg.enable = true;
-          r_cfg.api_port = 30000U;
+          r_cfg.api_port = 40000U;
           config->set_remote_mount(r_cfg);
         }
 
@@ -170,7 +170,7 @@ protected:
       execute_mount(drive_args, mount_location);
     };
 
-    const auto mount_remote = [&](std::uint16_t port = 30000U) {
+    const auto mount_remote = [&](std::uint16_t port = 40000U) {
       {
         auto test_directory = utils::path::combine(
             test::get_test_output_dir(),
@@ -244,7 +244,9 @@ protected:
   static void TearDownTestCase() {
     if (provider_t::type == provider_type::remote) {
       execute_unmount(drive_args2, mount_location);
+      if (provider_t::type2 != provider_type::unknown) {
         execute_unmount(drive_args, mount_location2);
+      }
     } else {
       execute_unmount(drive_args, mount_location);
     }
@@ -298,7 +300,8 @@ std::string winfsp_test<provider_t>::mount_location2;
 
 // using winfsp_provider_types = ::testing::Types<local_s3, remote_s3,
 // local_sia, remote_sia>;
-using winfsp_provider_types = ::testing::Types<local_s3, remote_s3>;
+// using winfsp_provider_types = ::testing::Types<local_s3, remote_s3>;
+using winfsp_provider_types = ::testing::Types<remote_winfsp_to_linux>;
 } // namespace repertory
 
 #endif // defined(_WIN32)