refactor

Reviewed-on: #40

.cspell/words.txt

@@ -17,7 +17,6 @@ bugprone
 cflags
 chrono
 cmake_current_source_dir
-coinit_apartmentthreaded
 comdlg32
 cppcoreguidelines
 cppdbg
@@ -116,7 +115,6 @@ googletest
 gpath
 gtest_version
 has_setxattr
-hkey
 httpapi
 httplib
 icudata
@@ -146,7 +144,6 @@ libuuid_include_dirs
 libvlc
 linkflags
 localappdata
-lpbyte
 lptr
 lpwstr
 markdownlint

.vimspector.json

@@ -0,0 +1,36 @@
+{
+    "configurations": {
+        "UnixDebug": {
+            "adapter": "vscode-cpptools",
+            "configuration": {
+                "request": "launch",
+                "program": "${workspaceRoot}/build/debug/repertory",
+                "args": ["-f", "/home/sgraves/mnt"],
+                "cwd": "${workspaceRoot}/build/debug",
+                "environment": [],
+                "externalConsole": true,
+                "MIMode": "gdb",
+                "stopAtEntry": true,
+                "logging": {
+                    "engineLogging": false
+                }
+            }
+        },
+        "UnixDebugTest": {
+            "adapter": "vscode-cpptools",
+            "configuration": {
+                "request": "launch",
+                "program": "${workspaceRoot}/build/debug/unittests",
+                "args": ["--gtest_filter=file_manager.can_close_after_download_timeout"],
+                "cwd": "${workspaceRoot}/build",
+                "environment": [],
+                "externalConsole": true,
+                "MIMode": "gdb",
+                "stopAtEntry": true,
+                "logging": {
+                    "engineLogging": false
+                }
+            }
+        }
+    }
+}

CHANGELOG.md

@@ -1,41 +1,18 @@
 # Changelog
 
-## v2.0.6-release
+## v2.0.5-rc
 
 ### Issues
 
 * ~~\#12 [Unit Test] Complete all providers unit tests~~
 * ~~\#21 [Unit Test] Complete WinFSP unit tests~~
 * ~~\#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
-* \#44 [bug] Windows-to-Linux remote mount ignores `CREATE_NEW`
-* \#45 [bug] Windows-to-Linux remote mount is not handling attempts to remove a non-empty directory properly
-* \#46 [bug] Changes to maximum cache size should be updated live
-* \#47 [bug] Windows-to-Linux remote mount is allowing directory rename when directory is not empty
-* \#48 [bug] Windows-to-Linux remote mount overlapped I/O is not detecting EOF for read operations
-* \#49 [ui] Implement provider test button
-
-### Changes from v2.0.5-rc
-
-* Drive letters in UI should always be lowercase
-* Fixed WinFSP directory rename for non-empty directories
-* Migrated to v2 error handling
-
-## v2.0.5-rc
-
-<!-- markdownlint-disable-next-line -->
-### Issues
-
 * \#39 Create management portal in Flutter
 
 ### Changes from v2.0.4-rc
 
 * Continue documentation updates
-* Fixed `-status` command erasing active mount information
+* Prevent overlapping `repertory` `ApiPort`'s
-* Fixed overlapping HTTP REST API port's
-* Refactored/fixed instance locking
 * Removed passwords and secret key values from API calls
 * Renamed setting `ApiAuth` to `ApiPassword`
 * Require `--name,-na` option for encryption provider
@@ -93,7 +70,6 @@
 
 ## v2.0.2-rc
 
-<!-- markdownlint-disable-next-line -->
 ### BREAKING CHANGES
 
 * Refactored `config.json` - will need to verify configuration settings prior to mounting

cmake/hashes.cmake

@@ -1,20 +1,20 @@
-set(BINUTILS_HASH ce2017e059d63e67ddb9240e9d4ec49c2893605035cd60e92ad53177f4377237)
+set(BINUTILS_HASH b53606f443ac8f01d1d5fc9c39497f2af322d99e14cea5c0b4b124d630379365)
-set(BOOST_HASH 3621533e820dcab1e8012afd583c0c73cf0f77694952b81352bf38c1488f9cb4)
 set(BOOST2_HASH 7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca)
-set(CPP_HTTPLIB_HASH 18064587e0cc6a0d5d56d619f4cbbcaba47aa5d84d86013abbd45d95c6653866)
+set(BOOST_HASH f55c340aa49763b1925ccf02b2e83f35fdcf634c9d5164a2acb87540173c741d)
-set(CURL_HASH ccc5ba45d9f5320c70ffb24e5411b66ba55ea1f333bf78be0963ed90a9328699)
+set(CPP_HTTPLIB_HASH c9b9e0524666e1cd088f0874c57c1ce7c0eaa8552f9f4e15c755d5201fc8c608)
-set(EXPAT_HASH 85372797ff0673a8fc4a6be16466bb5a0ca28c0dcf3c6f7ac1686b4a3ba2aabb)
+set(CURL_HASH 6edc063d1ebaf9cf3b3b46e9fef2f3cd8932694989ecd43d005d6e828426d09f)
-set(GCC_HASH 51b9919ea69c980d7a381db95d4be27edf73b21254eb13d752a08003b4d013b1)
+set(EXPAT_HASH 372b18f6527d162fa9658f1c74d22a37429b82d822f5a1e1fc7e00f6045a06a2)
+set(GCC_HASH 7d376d445f93126dc545e2c0086d0f647c3094aae081cdb78f42ce2bc25e7293)
 set(GTEST_HASH 78c676fc63881529bf97bf9d45948d905a66833fbfa5318ea2cd7478cb98f399)
 set(ICU_HASH a2c443404f00098e9e90acf29dc318e049d2dc78d9ae5f46efb261934a730ce2)
-set(JSON_HASH 4b92eb0c06d10683f7447ce9406cb97cd4b453be18d7279320f7b2f025c10187)
+set(JSON_HASH 0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406)
 set(LIBSODIUM_HASH 8e5aeca07a723a27bbecc3beef14b0068d37e7fc0e97f51b3f1c82d2a58005c1)
 set(MINGW_HASH cc41898aac4b6e8dd5cffd7331b9d9515b912df4420a3a612b5ea2955bbeed2f)
-set(OPENSSL_HASH 344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0)
+set(OPENSSL_HASH 002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3)
 set(PKG_CONFIG_HASH 6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591)
 set(PUGIXML_HASH 655ade57fa703fb421c2eb9a0113b5064bddb145d415dd1f88c79353d90d511a)
-set(ROCKSDB_HASH 3fdc9ca996971c4c039959866382c4a3a6c8ade4abf888f3b2ff77153e07bf28)
+set(ROCKSDB_HASH fdccab16133c9d927a183c2648bcea8d956fb41eb1df2aacaa73eb0b95e43724)
-set(SPDLOG_HASH 7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d)
+set(SPDLOG_HASH 25c843860f039a1600f232c6eb9e01e6627f7d030a2ae5e232bdd3c9205d26cc)
 set(SQLITE_HASH 6cebd1d8403fc58c30e93939b246f3e6e58d0765a5cd50546f16c00fd805d2c3)
 set(STDUUID_HASH b1176597e789531c38481acbbed2a6894ad419aab0979c10410d59eb0ebf40d3)
 set(ZLIB_HASH 17e88863f3600672ab49182f217281b6fc4d3c762bde361935e436a95214d05c)

cmake/versions.cmake

@@ -1,27 +1,28 @@
-set(BINUTILS_VERSION 2.44)
+set(BINUTILS_VERSION 2.43)
-set(BOOST_MAJOR_VERSION 1)
-set(BOOST_MINOR_VERSION 88)
-set(BOOST_PATCH_VERSION 0)
 set(BOOST2_MAJOR_VERSION 1)
 set(BOOST2_MINOR_VERSION 76)
 set(BOOST2_PATCH_VERSION 0)
-set(CPP_HTTPLIB_VERSION 0.20.0)
+set(BOOST_MAJOR_VERSION 1)
-set(CURL_VERSION 8.13.0)
+set(BOOST_MINOR_VERSION 87)
-set(CURL2_VERSION 8_13_0)
+set(BOOST_PATCH_VERSION 0)
-set(EXPAT_VERSION 2.7.1)
+set(CPP_HTTPLIB_VERSION 0.19.0)
-set(EXPAT2_VERSION 2_7_1)
+set(CURL2_VERSION 8_12_1)
-set(GCC_VERSION 15.1.0)
+set(CURL_VERSION 8.12.1)
+set(EXPAT2_VERSION 2_6_4)
+set(EXPAT_VERSION 2.6.4)
+set(GCC_VERSION 14.2.0)
 set(GTEST_VERSION 1.16.0)
 set(ICU_VERSION 76-1)
-set(JSON_VERSION 3.12.0)
+set(JSON_VERSION 3.11.3)
 set(LIBSODIUM_VERSION 1.0.20)
+set(MESA_VERSION 23.3.3)
 set(MINGW_VERSION 12.0.0)
-set(OPENSSL_VERSION 3.5.0)
+set(OPENSSL_VERSION 3.4.1)
 set(PKG_CONFIG_VERSION 0.29.2)
 set(PUGIXML_VERSION 1.15)
-set(ROCKSDB_VERSION 10.0.1)
+set(ROCKSDB_VERSION 9.10.0)
-set(SPDLOG_VERSION 1.15.2)
+set(SPDLOG_VERSION 1.15.1)
-set(SQLITE_VERSION 3490100)
 set(SQLITE2_VERSION 3.49.1)
+set(SQLITE_VERSION 3490100)
 set(STDUUID_VERSION 1.2.3)
 set(ZLIB_VERSION 1.3.1)

config.sh

@@ -10,7 +10,7 @@ PROJECT_DESC="Mount utility for Sia and S3"
 
 PROJECT_MAJOR_VERSION=2
 PROJECT_MINOR_VERSION=0
-PROJECT_REVISION_VERSION=6
+PROJECT_REVISION_VERSION=5
 PROJECT_RELEASE_NUM=0
 PROJECT_RELEASE_ITER=rc
 
@@ -21,7 +21,6 @@ PROJECT_PUBLIC_KEY=${DEVELOPER_PUBLIC_KEY}
 
 PROJECT_FLUTTER_BASE_HREF="/ui/"
 
-PROJECT_ENABLE_V2_ERRORS=ON
 PROJECT_ENABLE_WIN32_LONG_PATH_NAMES=OFF
 
 PROJECT_ENABLE_BACKWARD_CPP=OFF

docker/x86_64/mingw64

@@ -351,9 +351,9 @@ RUN cd /3rd_party/mingw64 && sha256sum -c ./expat-${MY_EXPAT_VERSION}.tar.gz.sha
 
 ARG FONTCONFIG_VERSION
 ENV MY_FONTCONFIG_VERSION=${FONTCONFIG_VERSION}
-RUN if [ -f "/3rd_party/fontconfig-${MY_FONTCONFIG_VERSION}.tar.xz" ]; then \
+RUN if [ -f "/3rd_party/fontconfig-${MY_FONTCONFIG_VERSION}.tar.gz" ]; then \
-      cd /3rd_party && sha256sum -c ./fontconfig-${MY_FONTCONFIG_VERSION}.tar.xz.sha256 && cd - \
+      cd /3rd_party && sha256sum -c ./fontconfig-${MY_FONTCONFIG_VERSION}.tar.gz.sha256 && cd - \
-      && tar xvJf /3rd_party/fontconfig-${MY_FONTCONFIG_VERSION}.tar.xz \
+      && tar xvzf /3rd_party/fontconfig-${MY_FONTCONFIG_VERSION}.tar.gz \
       && cd fontconfig-${MY_FONTCONFIG_VERSION} \
       && meson setup \
         --cross-file ${MY_TOOLCHAIN_FILE_MESON} \

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

@@ -53,6 +53,9 @@ private:
   std::optional<host_config> host_config_;
   std::optional<s3_config> s3_config_;
 
+private:
+  bool use_s3_path_style_{false};
+
 public:
   [[nodiscard]] static auto create_curl() -> CURL *;
 
@@ -64,7 +67,8 @@ public:
                                           const host_config &cfg)
       -> std::string;
 
-  [[nodiscard]] static auto create_host_config(const s3_config &cfg)
+  [[nodiscard]] static auto create_host_config(const s3_config &cfg,
+                                               bool use_s3_path_style)
       -> host_config;
 
   [[nodiscard]] static auto url_encode(CURL *curl, const std::string &data,
@@ -221,7 +225,8 @@ public:
     }
 
     if (curl_code != CURLE_OK) {
-      event_system::instance().raise<curl_error>(curl_code, function_name, url);
+      event_system::instance().raise<curl_error>(curl_code, function_name,
+                                                  url);
       return false;
     }
 
@@ -233,6 +238,8 @@ public:
   }
 
 public:
+  void enable_s3_path_style(bool enable) override;
+
   [[nodiscard]] auto make_request(const curl::requests::http_delete &del,
                                   long &response_code,
                                   stop_type &stop_requested) const

repertory/librepertory/include/comm/i_http_comm.hpp

@@ -34,29 +34,28 @@ struct i_http_comm {
   INTERFACE_SETUP(i_http_comm);
 
 public:
+  virtual void enable_s3_path_style(bool enable) = 0;
+
   [[nodiscard]] virtual auto
   make_request(const curl::requests::http_delete &del, long &response_code,
                stop_type &stop_requested) const -> bool = 0;
 
-  [[nodiscard]] virtual auto make_request(const curl::requests::http_get &get,
+  [[nodiscard]] virtual auto
-                                          long &response_code,
+  make_request(const curl::requests::http_get &get, long &response_code,
-                                          stop_type &stop_requested) const
+               stop_type &stop_requested) const -> bool = 0;
-      -> bool = 0;
 
-  [[nodiscard]] virtual auto make_request(const curl::requests::http_head &head,
+  [[nodiscard]] virtual auto
-                                          long &response_code,
+  make_request(const curl::requests::http_head &head, long &response_code,
-                                          stop_type &stop_requested) const
+               stop_type &stop_requested) const -> bool = 0;
-      -> bool = 0;
 
-  [[nodiscard]] virtual auto make_request(const curl::requests::http_post &post,
+  [[nodiscard]] virtual auto
-                                          long &response_code,
+  make_request(const curl::requests::http_post &post, long &response_code,
-                                          stop_type &stop_requested) const
+               stop_type &stop_requested) const -> bool = 0;
-      -> bool = 0;
 
   [[nodiscard]] virtual auto
   make_request(const curl::requests::http_put_file &put_file,
-               long &response_code, stop_type &stop_requested) const
+               long &response_code,
-      -> bool = 0;
+               stop_type &stop_requested) const -> bool = 0;
 };
 } // namespace repertory
 

repertory/librepertory/include/comm/packet/client_pool.hpp

@@ -94,7 +94,7 @@ private:
   bool shutdown_ = false;
 
 private:
-  static constexpr auto min_pool_size = 10U;
+  static constexpr const auto min_pool_size = 10U;
 
 public:
   void execute(const std::string &client_id, std::uint64_t thread_id,

repertory/librepertory/include/common.hpp

@@ -54,13 +54,12 @@ REPERTORY_IGNORE_WARNINGS_DISABLE()
 using namespace std::chrono_literals;
 using json = nlohmann::json;
 
-inline constexpr std::string_view REPERTORY{"repertory"};
+inline constexpr const std::string_view REPERTORY = "repertory";
-inline constexpr std::string_view REPERTORY_DATA_NAME{"repertory2"};
+inline constexpr const std::wstring_view REPERTORY_W = L"repertory";
-inline constexpr std::wstring_view REPERTORY_W{L"repertory"};
 
-inline constexpr std::uint64_t REPERTORY_CONFIG_VERSION{2ULL};
+inline constexpr const std::uint64_t REPERTORY_CONFIG_VERSION = 2ULL;
-inline constexpr std::string_view REPERTORY_MIN_REMOTE_VERSION{"2.0.0"};
+inline constexpr const std::string_view REPERTORY_DATA_NAME = "repertory2";
-inline constexpr std::string_view RENTERD_MIN_VERSION{"2.0.0"};
+inline constexpr const std::string_view REPERTORY_MIN_REMOTE_VERSION = "2.0.0";
 
 #define REPERTORY_INVALID_HANDLE INVALID_HANDLE_VALUE
 
@@ -222,11 +221,11 @@ using WCHAR = wchar_t;
 
 #define MAX_PATH 260
 
+#define STATUS_SUCCESS std::uint32_t{0U}
 #define STATUS_ACCESS_DENIED std::uint32_t{0xC0000022L}
 #define STATUS_DEVICE_BUSY std::uint32_t{0x80000011L}
 #define STATUS_DEVICE_INSUFFICIENT_RESOURCES std::uint32_t{0xC0000468L}
 #define STATUS_DIRECTORY_NOT_EMPTY std::uint32_t{0xC0000101L}
-#define STATUS_END_OF_FILE std::uint32_t{0xC0000011L}
 #define STATUS_FILE_IS_A_DIRECTORY std::uint32_t{0xC00000BAL}
 #define STATUS_FILE_TOO_LARGE std::uint32_t{0xC0000904L}
 #define STATUS_INSUFFICIENT_RESOURCES std::uint32_t{0xC000009AL}
@@ -235,13 +234,11 @@ using WCHAR = wchar_t;
 #define STATUS_INVALID_HANDLE std::uint32_t{0xC0000006L}
 #define STATUS_INVALID_IMAGE_FORMAT std::uint32_t{0xC000007BL}
 #define STATUS_INVALID_PARAMETER std::uint32_t{0xC000000DL}
-#define STATUS_NOT_IMPLEMENTED std::uint32_t{0xC0000002L}
 #define STATUS_NO_MEMORY std::uint32_t{0xC0000017L}
-#define STATUS_OBJECT_NAME_COLLISION std::uint32_t{0xC0000035L}
+#define STATUS_NOT_IMPLEMENTED std::uint32_t{0xC0000002L}
 #define STATUS_OBJECT_NAME_EXISTS std::uint32_t{0x40000000L}
 #define STATUS_OBJECT_NAME_NOT_FOUND std::uint32_t{0xC0000034L}
 #define STATUS_OBJECT_PATH_INVALID std::uint32_t{0xC0000039L}
-#define STATUS_SUCCESS std::uint32_t{0U}
 #define STATUS_UNEXPECTED_IO_ERROR std::uint32_t{0xC00000E9L}
 
 #define CONVERT_STATUS_NOT_IMPLEMENTED(e)                                      \

repertory/librepertory/include/drives/directory_iterator.hpp

@@ -50,14 +50,14 @@ public:
   [[nodiscard]] auto fill_buffer(const remote::file_offset &offset,
                                  fuse_fill_dir_t filler_function, void *buffer,
                                  populate_stat_callback populate_stat) -> int;
-#endif // !defined(_WIN32)
+#endif
 
   [[nodiscard]] auto get(std::size_t offset, std::string &item) -> int;
 
   [[nodiscard]] auto get_count() const -> std::size_t { return items_.size(); }
 
-  [[nodiscard]] auto get_directory_item(std::size_t offset, directory_item &di)
+  [[nodiscard]] auto get_directory_item(std::size_t offset,
-      -> api_error;
+                                        directory_item &di) -> api_error;
 
   [[nodiscard]] auto get_directory_item(const std::string &api_path,
                                         directory_item &di) -> api_error;
@@ -71,8 +71,8 @@ public:
   auto operator=(const directory_iterator &iterator) noexcept
       -> directory_iterator &;
 
-  auto operator=(directory_iterator &&iterator) noexcept
+  auto
-      -> directory_iterator &;
+  operator=(directory_iterator &&iterator) noexcept -> directory_iterator &;
 
   auto operator=(directory_item_list list) noexcept -> directory_iterator &;
 };

repertory/librepertory/include/drives/fuse/fuse_base.hpp

@@ -61,7 +61,7 @@ private:
   static auto instance() -> fuse_base &;
 
 private:
-  struct fuse_operations fuse_ops_{};
+  struct fuse_operations fuse_ops_ {};
 
 private:
   [[nodiscard]] auto
@@ -78,9 +78,9 @@ private:
   static void execute_void_callback(std::string_view function_name,
                                     const std::function<void()> &cb);
 
-  static auto execute_void_pointer_callback(std::string_view function_name,
+  static auto
-                                            const std::function<void *()> &cb)
+  execute_void_pointer_callback(std::string_view function_name,
-      -> void *;
+                                const std::function<void *()> &cb) -> void *;
 
   void raise_fuse_event(std::string_view function_name,
                         std::string_view api_path, int ret,
@@ -91,22 +91,22 @@ private:
 
 #if defined(__APPLE__)
   [[nodiscard]] static auto chflags_(const char *path, uint32_t flags) -> int;
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] static auto chmod_(const char *path, mode_t mode,
                                    struct fuse_file_info *fi) -> int;
-#else  // FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] static auto chmod_(const char *path, mode_t mode) -> int;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] static auto chown_(const char *path, uid_t uid, gid_t gid,
                                    struct fuse_file_info *fi) -> int;
-#else  // FUSE_USE_VERSION < 30
+#else
-  [[nodiscard]] static auto chown_(const char *path, uid_t uid, gid_t gid)
+  [[nodiscard]] static auto chown_(const char *path, uid_t uid,
-      -> int;
+                                   gid_t gid) -> int;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
   [[nodiscard]] static auto create_(const char *path, mode_t mode,
                                     struct fuse_file_info *fi) -> int;
@@ -114,19 +114,19 @@ private:
   static void destroy_(void *ptr);
 
   [[nodiscard]] static auto fallocate_(const char *path, int mode, off_t offset,
-                                       off_t length, struct fuse_file_info *fi)
+                                       off_t length,
-      -> int;
+                                       struct fuse_file_info *fi) -> int;
 
 #if FUSE_USE_VERSION < 30
   [[nodiscard]] static auto fgetattr_(const char *path, struct stat *st,
                                       struct fuse_file_info *fi) -> int;
-#endif // FUSE_USE_VERSION < 30
+#endif
 
 #if defined(__APPLE__)
   [[nodiscard]] static auto fsetattr_x_(const char *path,
                                         struct setattr_x *attr,
                                         struct fuse_file_info *fi) -> int;
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
   [[nodiscard]] static auto fsync_(const char *path, int datasync,
                                    struct fuse_file_info *fi) -> int;
@@ -137,27 +137,27 @@ private:
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] static auto getattr_(const char *path, struct stat *st,
                                      struct fuse_file_info *fi) -> int;
-#else  // FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] static auto getattr_(const char *path, struct stat *st) -> int;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
 #if defined(__APPLE__)
   [[nodiscard]] static auto getxtimes_(const char *path,
                                        struct timespec *bkuptime,
                                        struct timespec *crtime) -> int;
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] static auto init_(struct fuse_conn_info *conn,
                                   struct fuse_config *cfg) -> void *;
-#else  // FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] static auto init_(struct fuse_conn_info *conn) -> void *;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
   [[nodiscard]] static auto mkdir_(const char *path, mode_t mode) -> int;
 
-  [[nodiscard]] static auto open_(const char *path, struct fuse_file_info *fi)
+  [[nodiscard]] static auto open_(const char *path,
-      -> int;
+                                  struct fuse_file_info *fi) -> int;
 
   [[nodiscard]] static auto opendir_(const char *path,
                                      struct fuse_file_info *fi) -> int;
@@ -171,12 +171,12 @@ private:
                                      fuse_fill_dir_t fuse_fill_dir,
                                      off_t offset, struct fuse_file_info *fi,
                                      fuse_readdir_flags flags) -> int;
-#else  // FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] static auto readdir_(const char *path, void *buf,
                                      fuse_fill_dir_t fuse_fill_dir,
-                                     off_t offset, struct fuse_file_info *fi)
+                                     off_t offset,
-      -> int;
+                                     struct fuse_file_info *fi) -> int;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
   [[nodiscard]] static auto release_(const char *path,
                                      struct fuse_file_info *fi) -> int;
@@ -187,9 +187,9 @@ private:
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] static auto rename_(const char *from, const char *to,
                                     unsigned int flags) -> int;
-#else  // FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] static auto rename_(const char *from, const char *to) -> int;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
   [[nodiscard]] static auto rmdir_(const char *path) -> int;
 
@@ -199,36 +199,35 @@ private:
                                       char *value, size_t size,
                                       uint32_t position) -> int;
 
-#else  // !defined(__APPLE__)
+#else  // __APPLE__
   [[nodiscard]] static auto getxattr_(const char *path, const char *name,
                                       char *value, size_t size) -> int;
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
   [[nodiscard]] static auto listxattr_(const char *path, char *buffer,
                                        size_t size) -> int;
 
-  [[nodiscard]] static auto removexattr_(const char *path, const char *name)
+  [[nodiscard]] static auto removexattr_(const char *path,
-      -> int;
+                                         const char *name) -> int;
 
 #if defined(__APPLE__)
   [[nodiscard]] static auto setxattr_(const char *path, const char *name,
                                       const char *value, size_t size, int flags,
                                       uint32_t position) -> int;
 
-#else  // !defined(__APPLE__)
+#else  // __APPLE__
   [[nodiscard]] static auto setxattr_(const char *path, const char *name,
-                                      const char *value, size_t size, int flags)
+                                      const char *value, size_t size,
-      -> int;
+                                      int flags) -> int;
-#endif // defined(__APPLE__)
+#endif // __APPLE__
-#endif // defined(HAS_SETXATTR)
+#endif // HAS_SETXATTR
 
 #if defined(__APPLE__)
-  [[nodiscard]] static auto setattr_x_(const char *path, struct setattr_x *attr)
+  [[nodiscard]] static auto setattr_x_(const char *path,
-      -> int;
+                                       struct setattr_x *attr) -> int;
 
-  [[nodiscard]] static auto setbkuptime_(const char *path,
+  [[nodiscard]] static auto
-                                         const struct timespec *bkuptime)
+  setbkuptime_(const char *path, const struct timespec *bkuptime) -> int;
-      -> int;
 
   [[nodiscard]] static auto setchgtime_(const char *path,
                                         const struct timespec *chgtime) -> int;
@@ -238,20 +237,20 @@ private:
 
   [[nodiscard]] static auto setvolname_(const char *volname) -> int;
 
-  [[nodiscard]] static auto statfs_x_(const char *path, struct statfs *stbuf)
+  [[nodiscard]] static auto statfs_x_(const char *path,
-      -> int;
+                                      struct statfs *stbuf) -> int;
 
-#else  // !defined(__APPLE__)
+#else  // __APPLE__
-  [[nodiscard]] static auto statfs_(const char *path, struct statvfs *stbuf)
+  [[nodiscard]] static auto statfs_(const char *path,
-      -> int;
+                                    struct statvfs *stbuf) -> int;
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] static auto truncate_(const char *path, off_t size,
                                       struct fuse_file_info *fi) -> int;
-#else  // FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] static auto truncate_(const char *path, off_t size) -> int;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
   [[nodiscard]] static auto unlink_(const char *path) -> int;
 
@@ -259,18 +258,18 @@ private:
   [[nodiscard]] static auto utimens_(const char *path,
                                      const struct timespec tv[2],
                                      struct fuse_file_info *fi) -> int;
-#else  // FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] static auto utimens_(const char *path,
                                      const struct timespec tv[2]) -> int;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
   [[nodiscard]] static auto write_(const char *path, const char *buffer,
                                    size_t write_size, off_t write_offset,
                                    struct fuse_file_info *fi) -> int;
 
 protected:
-  [[nodiscard]] virtual auto access_impl(std::string /*api_path*/, int /*mask*/)
+  [[nodiscard]] virtual auto access_impl(std::string /*api_path*/,
-      -> api_error {
+                                         int /*mask*/) -> api_error {
     return api_error::not_implemented;
   }
 
@@ -279,40 +278,37 @@ protected:
                                           uint32_t /*flags*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto chmod_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                        mode_t /*mode*/,
+  chmod_impl(std::string /*api_path*/, mode_t /*mode*/,
-                                        struct fuse_file_info * /*fi*/)
+             struct fuse_file_info * /*fi*/) -> api_error {
-      -> api_error {
     return api_error::not_implemented;
   }
-#else //FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] virtual auto chmod_impl(std::string /*api_path*/,
                                         mode_t /*mode*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto chown_impl(std::string /*api_path*/, uid_t /*uid*/,
+  [[nodiscard]] virtual auto
-                                        gid_t /*gid*/,
+  chown_impl(std::string /*api_path*/, uid_t /*uid*/, gid_t /*gid*/,
-                                        struct fuse_file_info * /*fi*/)
+             struct fuse_file_info * /*fi*/) -> api_error {
-      -> api_error {
     return api_error::not_implemented;
   }
-#else // FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] virtual auto chown_impl(std::string /*api_path*/, uid_t /*uid*/,
                                         gid_t /*gid*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
-  [[nodiscard]] virtual auto create_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                         mode_t /*mode*/,
+  create_impl(std::string /*api_path*/, mode_t /*mode*/,
-                                         struct fuse_file_info * /*fi*/)
+              struct fuse_file_info * /*fi*/) -> api_error {
-      -> api_error {
     return api_error::not_implemented;
   }
 
@@ -320,87 +316,81 @@ protected:
 
   [[nodiscard]] virtual auto
   fallocate_impl(std::string /*api_path*/, int /*mode*/, off_t /*offset*/,
-                 off_t /*length*/, struct fuse_file_info * /*fi*/)
+                 off_t /*length*/,
-      -> api_error {
+                 struct fuse_file_info * /*fi*/) -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto fgetattr_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                           struct stat * /*st*/,
+  fgetattr_impl(std::string /*api_path*/, struct stat * /*st*/,
-                                           struct fuse_file_info * /*fi*/)
+                struct fuse_file_info * /*fi*/) -> api_error {
-      -> api_error {
     return api_error::not_implemented;
   }
 
 #if defined(__APPLE__)
-  [[nodiscard]] virtual auto fsetattr_x_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                             struct setattr_x * /*attr*/,
+  fsetattr_x_impl(std::string /*api_path*/, struct setattr_x * /*attr*/,
-                                             struct fuse_file_info * /*fi*/)
+                  struct fuse_file_info * /*fi*/) -> api_error {
-      -> api_error {
     return api_error::not_implemented;
   }
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
-  [[nodiscard]] virtual auto fsync_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                        int /*datasync*/,
+  fsync_impl(std::string /*api_path*/, int /*datasync*/,
-                                        struct fuse_file_info * /*fi*/)
+             struct fuse_file_info * /*fi*/) -> api_error {
-      -> api_error {
     return api_error::not_implemented;
   }
 
 #if FUSE_USE_VERSION < 30
-  [[nodiscard]] virtual auto ftruncate_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                            off_t /*size*/,
+  ftruncate_impl(std::string /*api_path*/, off_t /*size*/,
-                                            struct fuse_file_info * /*fi*/)
+                 struct fuse_file_info * /*fi*/) -> api_error {
-      -> api_error {
     return api_error::not_implemented;
   }
-#endif // FUSE_USE_VERSION < 30
+#endif
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto getattr_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                          struct stat * /*st*/,
+  getattr_impl(std::string /*api_path*/, struct stat * /*st*/,
-                                          struct fuse_file_info * /*fi*/)
+               struct fuse_file_info * /*fi*/) -> api_error {
-      -> api_error {
     return api_error::not_implemented;
   }
-#else // FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] virtual auto getattr_impl(std::string /*api_path*/,
                                           struct stat * /*st*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
 #if defined(__APPLE__)
-  [[nodiscard]] virtual auto getxtimes_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                            struct timespec * /*bkuptime*/,
+  getxtimes_impl(std::string /*api_path*/, struct timespec * /*bkuptime*/,
-                                            struct timespec * /*crtime*/)
+                 struct timespec * /*crtime*/) -> api_error {
-      -> api_error {
     return api_error::not_implemented;
   }
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
-  virtual auto init_impl(struct fuse_conn_info *conn, struct fuse_config *cfg)
+  virtual auto init_impl(struct fuse_conn_info *conn,
-      -> void *;
+                         struct fuse_config *cfg) -> void *;
-#else // FUSE_USE_VERSION < 30
+#else
   virtual auto init_impl(struct fuse_conn_info *conn) -> void *;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
   [[nodiscard]] virtual auto mkdir_impl(std::string /*api_path*/,
                                         mode_t /*mode*/) -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto open_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                       struct fuse_file_info * /*fi*/)
+  open_impl(std::string /*api_path*/,
-      -> api_error {
+            struct fuse_file_info * /*fi*/) -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto opendir_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                          struct fuse_file_info * /*fi*/)
+  opendir_impl(std::string /*api_path*/,
-      -> api_error {
+               struct fuse_file_info * /*fi*/) -> api_error {
     return api_error::not_implemented;
   }
 
@@ -415,28 +405,28 @@ protected:
   [[nodiscard]] virtual auto
   readdir_impl(std::string /*api_path*/, void * /*buf*/,
                fuse_fill_dir_t /*fuse_fill_dir*/, off_t /*offset*/,
-               struct fuse_file_info * /*fi*/, fuse_readdir_flags /*flags*/)
+               struct fuse_file_info * /*fi*/,
-      -> api_error {
+               fuse_readdir_flags /*flags*/) -> api_error {
     return api_error::not_implemented;
   }
-#else // FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] virtual auto
   readdir_impl(std::string /*api_path*/, void * /*buf*/,
                fuse_fill_dir_t /*fuse_fill_dir*/, off_t /*offset*/,
                struct fuse_file_info * /*fi*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
-  [[nodiscard]] virtual auto release_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                          struct fuse_file_info * /*fi*/)
+  release_impl(std::string /*api_path*/,
-      -> api_error {
+               struct fuse_file_info * /*fi*/) -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto releasedir_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                             struct fuse_file_info * /*fi*/)
+  releasedir_impl(std::string /*api_path*/,
-      -> api_error {
+                  struct fuse_file_info * /*fi*/) -> api_error {
     return api_error::not_implemented;
   }
 
@@ -446,13 +436,13 @@ protected:
                                          unsigned int /*flags*/) -> api_error {
     return api_error::not_implemented;
   }
-#else // FUSE_USE_VERSION < 30
+#else
-  [[nodiscard]] virtual auto rename_impl(std::string /*from_api_path*/,
+  [[nodiscard]] virtual auto
-                                         std::string /*to_api_path*/)
+  rename_impl(std::string /*from_api_path*/,
-      -> api_error {
+              std::string /*to_api_path*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
   [[nodiscard]] virtual auto rmdir_impl(std::string /*api_path*/) -> api_error {
     return api_error::not_implemented;
@@ -466,14 +456,14 @@ protected:
                 int & /*attribute_size*/) -> api_error {
     return api_error::not_implemented;
   }
-#else  // !defined(__APPLE__)
+#else  // __APPLE__
   [[nodiscard]] virtual auto
   getxattr_impl(std::string /*api_path*/, const char * /*name*/,
-                char * /*value*/, size_t /*size*/, int & /*attribute_size*/)
+                char * /*value*/, size_t /*size*/,
-      -> api_error {
+                int & /*attribute_size*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
   [[nodiscard]] virtual auto
   listxattr_impl(std::string /*api_path*/, char * /*buffer*/, size_t /*size*/,
@@ -481,9 +471,9 @@ protected:
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto removexattr_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                              const char * /*name*/)
+  removexattr_impl(std::string /*api_path*/,
-      -> api_error {
+                   const char * /*name*/) -> api_error {
     return api_error::not_implemented;
   }
 
@@ -495,20 +485,21 @@ protected:
                                            uint32_t /*position*/) -> api_error {
     return api_error::not_implemented;
   }
-#else  // !defined (__APPLE__)
+#else  // __APPLE__
-  [[nodiscard]] virtual auto
+  [[nodiscard]] virtual auto setxattr_impl(std::string /*api_path*/,
-  setxattr_impl(std::string /*api_path*/, const char * /*name*/,
+                                           const char * /*name*/,
-                const char * /*value*/, size_t /*size*/, int /*flags*/)
+                                           const char * /*value*/,
-      -> api_error {
+                                           size_t /*size*/,
+                                           int /*flags*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif // defined (__APPLE__)
+#endif // __APPLE__
-#endif // defined(HAS_SETXATTR)
+#endif // HAS_SETXATTR
 
 #if defined(__APPLE__)
-  [[nodiscard]] virtual auto setattr_x_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                            struct setattr_x * /*attr*/)
+  setattr_x_impl(std::string /*api_path*/,
-      -> api_error {
+                 struct setattr_x * /*attr*/) -> api_error {
     return api_error::not_implemented;
   }
 
@@ -519,74 +510,72 @@ protected:
   }
 
   [[nodiscard]] virtual auto
-  setchgtime_impl(std::string /*api_path*/, const struct timespec * /*chgtime*/)
+  setchgtime_impl(std::string /*api_path*/,
-      -> api_error {
+                  const struct timespec * /*chgtime*/) -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto setcrtime_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                            const struct timespec * /*crtime*/)
+  setcrtime_impl(std::string /*api_path*/,
-      -> api_error {
+                 const struct timespec * /*crtime*/) -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto setvolname_impl(const char * /*volname*/)
+  [[nodiscard]] virtual auto
-      -> api_error {
+  setvolname_impl(const char * /*volname*/) -> api_error {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] virtual auto statfs_x_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                           struct statfs * /*stbuf*/)
+  statfs_x_impl(std::string /*api_path*/,
-      -> api_error {
+                struct statfs * /*stbuf*/) -> api_error {
     return api_error::not_implemented;
   }
-#else  // !defined(__APPLE__)
+#else  // __APPLE__
-  [[nodiscard]] virtual auto statfs_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                         struct statvfs * /*stbuf*/)
+  statfs_impl(std::string /*api_path*/,
-      -> api_error {
+              struct statvfs * /*stbuf*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto truncate_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                           off_t /*size*/,
+  truncate_impl(std::string /*api_path*/, off_t /*size*/,
-                                           struct fuse_file_info * /*fi*/)
+                struct fuse_file_info * /*fi*/) -> api_error {
-      -> api_error {
     return api_error::not_implemented;
   }
-#else // FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] virtual auto truncate_impl(std::string /*api_path*/,
                                            off_t /*size*/) -> api_error {
     return api_error::not_implemented;
   }
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
-  [[nodiscard]] virtual auto unlink_impl(std::string /*api_path*/)
+  [[nodiscard]] virtual auto
-      -> api_error {
+  unlink_impl(std::string /*api_path*/) -> api_error {
     return api_error::not_implemented;
   }
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto utimens_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                          const struct timespec /*tv*/[2],
+  utimens_impl(std::string /*api_path*/, const struct timespec /*tv*/[2],
-                                          struct fuse_file_info * /*fi*/)
+               struct fuse_file_info * /*fi*/) -> api_error {
-      -> api_error {
     return api_error::not_implemented;
   }
-#else // FUSE_USE_VERSION < 30
+#else
-  [[nodiscard]] virtual auto utimens_impl(std::string /*api_path*/,
+  [[nodiscard]] virtual auto
-                                          const struct timespec /*tv*/[2])
+  utimens_impl(std::string /*api_path*/,
-      -> api_error {
+               const struct timespec /*tv*/[2]) -> api_error {
     return api_error::not_implemented;
   }
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
   [[nodiscard]] virtual auto
   write_impl(std::string /*api_path*/, const char * /*buffer*/,
              size_t /*write_size*/, off_t /*write_offset*/,
-             struct fuse_file_info * /*fi*/, std::size_t & /*bytes_written*/)
+             struct fuse_file_info * /*fi*/,
-      -> api_error {
+             std::size_t & /*bytes_written*/) -> api_error {
     return api_error::not_implemented;
   }
 
@@ -614,5 +603,5 @@ public:
 };
 } // namespace repertory
 
-#endif // !defined(_WIN32)
+#endif // _WIN32
 #endif // REPERTORY_INCLUDE_DRIVES_FUSE_FUSE_BASE_HPP_

repertory/librepertory/include/drives/fuse/fuse_drive.hpp

@@ -73,95 +73,92 @@ private:
 
 protected:
 #if defined(__APPLE__)
-  [[nodiscard]] auto chflags_impl(std::string api_path, uint32_t flags)
+  [[nodiscard]] auto chflags_impl(std::string api_path,
-      -> api_error override;
+                                  uint32_t flags) -> api_error override;
-#endif // defined(__APPLE__{}
+#endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] auto chmod_impl(std::string api_path, mode_t mode,
+  [[nodiscard]] auto
-                                struct fuse_file_info *file_info)
+  chmod_impl(std::string api_path, mode_t mode,
-      -> api_error override;
+             struct fuse_file_info *file_info) -> api_error override;
-#else  // FUSE_USE_VERSION < 30
+#else
-  [[nodiscard]] auto chmod_impl(std::string api_path, mode_t mode)
+  [[nodiscard]] auto chmod_impl(std::string api_path,
-      -> api_error override;
+                                mode_t mode) -> api_error override;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] auto chown_impl(std::string api_path, uid_t uid, gid_t gid,
+  [[nodiscard]] auto
-                                struct fuse_file_info *file_info)
+  chown_impl(std::string api_path, uid_t uid, gid_t gid,
-      -> api_error override;
+             struct fuse_file_info *file_info) -> api_error override;
-#else  // FUSE_USE_VERSION < 30
+#else
-  [[nodiscard]] auto chown_impl(std::string api_path, uid_t uid, gid_t gid)
+  [[nodiscard]] auto chown_impl(std::string api_path, uid_t uid,
-      -> api_error override;
+                                gid_t gid) -> api_error override;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
-  [[nodiscard]] auto create_impl(std::string api_path, mode_t mode,
+  [[nodiscard]] auto
-                                 struct fuse_file_info *file_info)
+  create_impl(std::string api_path, mode_t mode,
-      -> api_error override;
+              struct fuse_file_info *file_info) -> api_error override;
 
   void destroy_impl(void *ptr) override;
 
-  [[nodiscard]] auto fallocate_impl(std::string api_path, int mode,
+  [[nodiscard]] auto
-                                    off_t offset, off_t length,
+  fallocate_impl(std::string api_path, int mode, off_t offset, off_t length,
-                                    struct fuse_file_info *file_info)
+                 struct fuse_file_info *file_info) -> api_error override;
-      -> api_error override;
 
-  [[nodiscard]] auto fgetattr_impl(std::string api_path, struct stat *unix_st,
+  [[nodiscard]] auto
-                                   struct fuse_file_info *file_info)
+  fgetattr_impl(std::string api_path, struct stat *unix_st,
-      -> api_error override;
+                struct fuse_file_info *file_info) -> api_error override;
 
 #if defined(__APPLE__)
-  [[nodiscard]] auto fsetattr_x_impl(std::string api_path,
+  [[nodiscard]] auto
-                                     struct setattr_x *attr,
+  fsetattr_x_impl(std::string api_path, struct setattr_x *attr,
-                                     struct fuse_file_info *file_info)
+                  struct fuse_file_info *file_info) -> api_error override;
-      -> api_error override;
+#endif // __APPLE__
-#endif // defined(__APPLE__)
 
-  [[nodiscard]] auto fsync_impl(std::string api_path, int datasync,
+  [[nodiscard]] auto
-                                struct fuse_file_info *file_info)
+  fsync_impl(std::string api_path, int datasync,
-      -> api_error override;
+             struct fuse_file_info *file_info) -> api_error override;
 
 #if FUSE_USE_VERSION < 30
-  [[nodiscard]] auto ftruncate_impl(std::string api_path, off_t size,
+  [[nodiscard]] auto
-                                    struct fuse_file_info *file_info)
+  ftruncate_impl(std::string api_path, off_t size,
-      -> api_error override;
+                 struct fuse_file_info *file_info) -> api_error override;
-#endif // FUSE_USE_VERSION < 30
+#endif
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] auto getattr_impl(std::string api_path, struct stat *unix_st,
+  [[nodiscard]] auto
-                                  struct fuse_file_info *file_info)
+  getattr_impl(std::string api_path, struct stat *unix_st,
-      -> api_error override;
+               struct fuse_file_info *file_info) -> api_error override;
-#else  // FUSE_USE_VERSION < 30
+#else
-  [[nodiscard]] auto getattr_impl(std::string api_path, struct stat *unix_st)
+  [[nodiscard]] auto getattr_impl(std::string api_path,
-      -> api_error override;
+                                  struct stat *unix_st) -> api_error override;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
 #if defined(__APPLE__)
-  [[nodiscard]] auto getxtimes_impl(std::string api_path,
+  [[nodiscard]] auto
-                                    struct timespec *bkuptime,
+  getxtimes_impl(std::string api_path, struct timespec *bkuptime,
-                                    struct timespec *crtime)
+                 struct timespec *crtime) -> api_error override;
-      -> api_error override;
+#endif // __APPLE__
-#endif // defined(__APPLE__)
 
 #if FUSE_USE_VERSION >= 30
-  auto init_impl(struct fuse_conn_info *conn, struct fuse_config *cfg)
+  auto init_impl(struct fuse_conn_info *conn,
-      -> void * override;
+                 struct fuse_config *cfg) -> void * override;
-#else  // FUSE_USE_VERSION < 30
+#else
   auto init_impl(struct fuse_conn_info *conn) -> void * override;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
-  [[nodiscard]] auto mkdir_impl(std::string api_path, mode_t mode)
+  [[nodiscard]] auto mkdir_impl(std::string api_path,
-      -> api_error override;
+                                mode_t mode) -> api_error override;
 
   void notify_fuse_main_exit(int &ret) override;
 
-  [[nodiscard]] auto open_impl(std::string api_path,
+  [[nodiscard]] auto
-                               struct fuse_file_info *file_info)
+  open_impl(std::string api_path,
-      -> api_error override;
+            struct fuse_file_info *file_info) -> api_error override;
 
-  [[nodiscard]] auto opendir_impl(std::string api_path,
+  [[nodiscard]] auto
-                                  struct fuse_file_info *file_info)
+  opendir_impl(std::string api_path,
-      -> api_error override;
+               struct fuse_file_info *file_info) -> api_error override;
 
   [[nodiscard]] auto read_impl(std::string api_path, char *buffer,
                                size_t read_size, off_t read_offset,
@@ -169,124 +166,121 @@ protected:
                                std::size_t &bytes_read) -> api_error override;
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] auto readdir_impl(std::string api_path, void *buf,
+  [[nodiscard]] auto
-                                  fuse_fill_dir_t fuse_fill_dir, off_t offset,
+  readdir_impl(std::string api_path, void *buf, fuse_fill_dir_t fuse_fill_dir,
-                                  struct fuse_file_info *file_info,
+               off_t offset, struct fuse_file_info *file_info,
-                                  fuse_readdir_flags flags)
+               fuse_readdir_flags flags) -> api_error override;
-      -> api_error override;
+#else
-#else  // FUSE_USE_VERSION < 30
+  [[nodiscard]] auto
-  [[nodiscard]] auto readdir_impl(std::string api_path, void *buf,
+  readdir_impl(std::string api_path, void *buf, fuse_fill_dir_t fuse_fill_dir,
-                                  fuse_fill_dir_t fuse_fill_dir, off_t offset,
+               off_t offset,
-                                  struct fuse_file_info *file_info)
+               struct fuse_file_info *file_info) -> api_error override;
-      -> api_error override;
+#endif
-#endif // FUSE_USE_VERSION >= 30
 
-  [[nodiscard]] auto release_impl(std::string api_path,
+  [[nodiscard]] auto
-                                  struct fuse_file_info *file_info)
+  release_impl(std::string api_path,
-      -> api_error override;
+               struct fuse_file_info *file_info) -> api_error override;
 
-  [[nodiscard]] auto releasedir_impl(std::string api_path,
+  [[nodiscard]] auto
-                                     struct fuse_file_info *file_info)
+  releasedir_impl(std::string api_path,
-      -> api_error override;
+                  struct fuse_file_info *file_info) -> api_error override;
 
 #if FUSE_USE_VERSION >= 30
   [[nodiscard]] auto rename_impl(std::string from_api_path,
-                                 std::string to_api_path, unsigned int flags)
+                                 std::string to_api_path,
-      -> api_error override;
+                                 unsigned int flags) -> api_error override;
-#else  // FUSE_USE_VERSION < 30
+#else
   [[nodiscard]] auto rename_impl(std::string from_api_path,
                                  std::string to_api_path) -> api_error override;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
   [[nodiscard]] auto rmdir_impl(std::string api_path) -> api_error override;
 
 #if defined(HAS_SETXATTR)
   [[nodiscard]] auto getxattr_common(std::string api_path, const char *name,
                                      char *value, size_t size,
-                                     int &attribute_size, uint32_t *position)
+                                     int &attribute_size,
-      -> api_error;
+                                     uint32_t *position) -> api_error;
 
 #if defined(__APPLE__)
   [[nodiscard]] auto getxattr_impl(std::string api_path, const char *name,
                                    char *value, size_t size, uint32_t position,
                                    int &attribute_size) -> api_error override;
-#else  // !defined(__APPLE__)
+#else  // __APPLE__
   [[nodiscard]] auto getxattr_impl(std::string api_path, const char *name,
                                    char *value, size_t size,
                                    int &attribute_size) -> api_error override;
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
   [[nodiscard]] auto listxattr_impl(std::string api_path, char *buffer,
                                     size_t size, int &required_size,
                                     bool &return_size) -> api_error override;
 
-  [[nodiscard]] auto removexattr_impl(std::string api_path, const char *name)
+  [[nodiscard]] auto removexattr_impl(std::string api_path,
-      -> api_error override;
+                                      const char *name) -> api_error override;
 
 #if defined(__APPLE__)
   [[nodiscard]] auto setxattr_impl(std::string api_path, const char *name,
                                    const char *value, size_t size, int flags,
                                    uint32_t position) -> api_error override;
-#else  // !defined(__APPLE__)
+#else  // __APPLE__
   [[nodiscard]] auto setxattr_impl(std::string api_path, const char *name,
-                                   const char *value, size_t size, int flags)
+                                   const char *value, size_t size,
-      -> api_error override;
+                                   int flags) -> api_error override;
-#endif // defined(__APPLE__)
+#endif // __APPLE__
-#endif // defined(HAS_SETXATTR{}
+#endif // HAS_SETXATTR
 
 #if defined(__APPLE__)
-  [[nodiscard]] auto setattr_x_impl(std::string api_path,
+  [[nodiscard]] auto
-                                    struct setattr_x *attr)
+  setattr_x_impl(std::string api_path,
-      -> api_error override;
+                 struct setattr_x *attr) -> api_error override;
 
-  [[nodiscard]] auto setbkuptime_impl(std::string api_path,
+  [[nodiscard]] auto
-                                      const struct timespec *bkuptime)
+  setbkuptime_impl(std::string api_path,
-      -> api_error override;
+                   const struct timespec *bkuptime) -> api_error override;
 
-  [[nodiscard]] auto setchgtime_impl(std::string api_path,
+  [[nodiscard]] auto
-                                     const struct timespec *chgtime)
+  setchgtime_impl(std::string api_path,
-      -> api_error override;
+                  const struct timespec *chgtime) -> api_error override;
 
-  [[nodiscard]] auto setcrtime_impl(std::string api_path,
+  [[nodiscard]] auto
-                                    const struct timespec *crtime)
+  setcrtime_impl(std::string api_path,
-      -> api_error override;
+                 const struct timespec *crtime) -> api_error override;
 
   [[nodiscard]] auto setvolname_impl(const char *volname) -> api_error override;
 
-  [[nodiscard]] auto statfs_x_impl(std::string api_path, struct statfs *stbuf)
+  [[nodiscard]] auto statfs_x_impl(std::string api_path,
-      -> api_error override;
+                                   struct statfs *stbuf) -> api_error override;
-#else  // !defined(__APPLE__)
+#else  // __APPLE__
-  [[nodiscard]] auto statfs_impl(std::string api_path, struct statvfs *stbuf)
+  [[nodiscard]] auto statfs_impl(std::string api_path,
-      -> api_error override;
+                                 struct statvfs *stbuf) -> api_error override;
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] auto truncate_impl(std::string api_path, off_t size,
+  [[nodiscard]] auto
-                                   struct fuse_file_info *file_info)
+  truncate_impl(std::string api_path, off_t size,
-      -> api_error override;
+                struct fuse_file_info *file_info) -> api_error override;
-#else  // FUSE_USE_VERSION < 30
+#else
-  [[nodiscard]] auto truncate_impl(std::string api_path, off_t size)
+  [[nodiscard]] auto truncate_impl(std::string api_path,
-      -> api_error override;
+                                   off_t size) -> api_error override;
-#endif // FUSE_USE_VERSION >= 30
+#endif
 
   [[nodiscard]] auto unlink_impl(std::string api_path) -> api_error override;
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] auto utimens_impl(std::string api_path,
+  [[nodiscard]] auto
-                                  const struct timespec tv[2],
+  utimens_impl(std::string api_path, const struct timespec tv[2],
-                                  struct fuse_file_info *file_info)
+               struct fuse_file_info *file_info) -> api_error override;
-      -> api_error override;
+#else
-#else  // FUSE_USE_VERSION < 30
+  [[nodiscard]] auto
-  [[nodiscard]] auto utimens_impl(std::string api_path,
+  utimens_impl(std::string api_path,
-                                  const struct timespec tv[2])
+               const struct timespec tv[2]) -> api_error override;
-      -> api_error override;
+#endif
-#endif // FUSE_USE_VERSION >= 30
 
-  [[nodiscard]] auto write_impl(std::string api_path, const char *buffer,
+  [[nodiscard]] auto
-                                size_t write_size, off_t write_offset,
+  write_impl(std::string api_path, const char *buffer, size_t write_size,
-                                struct fuse_file_info *file_info,
+             off_t write_offset, struct fuse_file_info *file_info,
-                                std::size_t &bytes_written)
+             std::size_t &bytes_written) -> api_error override;
-      -> api_error override;
 
 public:
   [[nodiscard]] auto get_directory_item_count(const std::string &api_path) const
@@ -295,17 +289,16 @@ public:
   [[nodiscard]] auto get_directory_items(const std::string &api_path) const
       -> directory_item_list override;
 
-  [[nodiscard]] auto get_file_size(const std::string &api_path) const
+  [[nodiscard]] auto
-      -> std::uint64_t override;
+  get_file_size(const std::string &api_path) const -> std::uint64_t override;
 
-  [[nodiscard]] auto get_item_meta(const std::string &api_path,
+  [[nodiscard]] auto
-                                   api_meta_map &meta) const
+  get_item_meta(const std::string &api_path,
-      -> api_error override;
+                api_meta_map &meta) const -> api_error override;
 
-  [[nodiscard]] auto get_item_meta(const std::string &api_path,
+  [[nodiscard]] auto
-                                   const std::string &name,
+  get_item_meta(const std::string &api_path, const std::string &name,
-                                   std::string &value) const
+                std::string &value) const -> api_error override;
-      -> api_error override;
 
   [[nodiscard]] auto get_total_drive_space() const -> std::uint64_t override;
 
@@ -316,24 +309,21 @@ public:
   void get_volume_info(UINT64 &total_size, UINT64 &free_size,
                        std::string &volume_label) const override;
 
-  [[nodiscard]] auto is_processing(const std::string &api_path) const
+  [[nodiscard]] auto
-      -> bool override;
+  is_processing(const std::string &api_path) const -> bool override;
 
-  [[nodiscard]] auto rename_directory(const std::string &from_api_path,
+  [[nodiscard]] auto
-                                      const std::string &to_api_path)
+  rename_directory(const std::string &from_api_path,
-      -> int override;
+                   const std::string &to_api_path) -> int override;
 
   [[nodiscard]] auto rename_file(const std::string &from_api_path,
-                                 const std::string &to_api_path, bool overwrite)
+                                 const std::string &to_api_path,
-      -> int override;
+                                 bool overwrite) -> int override;
 
   void set_item_meta(const std::string &api_path, const std::string &key,
                      const std::string &value) override;
-
-  void set_item_meta(const std::string &api_path,
-                     const api_meta_map &meta) override;
 };
 } // namespace repertory
 
-#endif // !defined(_WIN32)
+#endif // _WIN32
 #endif // REPERTORY_INCLUDE_DRIVES_FUSE_FUSE_DRIVE_HPP_

repertory/librepertory/include/drives/fuse/fuse_drive_base.hpp

@@ -43,17 +43,16 @@ public:
   auto operator=(fuse_drive_base &&) -> fuse_drive_base & = delete;
 
 protected:
-  [[nodiscard]] auto access_impl(std::string api_path, int mask)
+  [[nodiscard]] auto access_impl(std::string api_path,
-      -> api_error override;
+                                 int mask) -> api_error override;
 
 protected:
-  [[nodiscard]] auto check_access(const std::string &api_path, int mask) const
+  [[nodiscard]] auto check_access(const std::string &api_path,
-      -> api_error;
+                                  int mask) const -> api_error;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto check_and_perform(
-  check_and_perform(const std::string &api_path, int parent_mask,
+      const std::string &api_path, int parent_mask,
-                    const std::function<api_error(api_meta_map &meta)> &action)
+      const std::function<api_error(api_meta_map &meta)> &action) -> api_error;
-      -> api_error;
 
   [[nodiscard]] auto get_current_gid() const -> gid_t;
 
@@ -63,63 +62,58 @@ protected:
 
   [[nodiscard]] auto get_effective_uid() const -> uid_t;
 
-  [[nodiscard]] static auto check_open_flags(int flags, int mask,
+  [[nodiscard]] static auto
-                                             const api_error &fail_error)
+  check_open_flags(int flags, int mask,
-      -> api_error;
+                   const api_error &fail_error) -> api_error;
 
   [[nodiscard]] auto check_owner(const api_meta_map &meta) const -> api_error;
 
-  [[nodiscard]] static auto check_readable(int flags,
+  [[nodiscard]] static auto
-                                           const api_error &fail_error)
+  check_readable(int flags, const api_error &fail_error) -> api_error;
-      -> api_error;
 
-  [[nodiscard]] static auto check_writeable(int flags,
+  [[nodiscard]] static auto
-                                            const api_error &fail_error)
+  check_writeable(int flags, const api_error &fail_error) -> api_error;
-      -> api_error;
 
 #if defined(__APPLE__)
-  [[nodiscard]] static auto get_flags_from_meta(const api_meta_map &meta)
+  [[nodiscard]] static auto
-      -> __uint32_t;
+  get_flags_from_meta(const api_meta_map &meta) -> __uint32_t;
-#endif // defined(__APPLE__)
+#endif // __APPLE__
 
-  [[nodiscard]] static auto get_gid_from_meta(const api_meta_map &meta)
+  [[nodiscard]] static auto
-      -> gid_t;
+  get_gid_from_meta(const api_meta_map &meta) -> gid_t;
 
-  [[nodiscard]] static auto get_mode_from_meta(const api_meta_map &meta)
+  [[nodiscard]] static auto
-      -> mode_t;
+  get_mode_from_meta(const api_meta_map &meta) -> mode_t;
 
   static void get_timespec_from_meta(const api_meta_map &meta,
                                      const std::string &name,
                                      struct timespec &ts);
 
-  [[nodiscard]] static auto get_uid_from_meta(const api_meta_map &meta)
+  [[nodiscard]] static auto
-      -> uid_t;
+  get_uid_from_meta(const api_meta_map &meta) -> uid_t;
 
 #if defined(__APPLE__)
-  [[nodiscard]] auto parse_xattr_parameters(const char *name,
+  [[nodiscard]] auto
-                                            const uint32_t &position,
+  parse_xattr_parameters(const char *name, const uint32_t &position,
-                                            std::string &attribute_name,
+                         std::string &attribute_name,
-                                            const std::string &api_path)
+                         const std::string &api_path) -> api_error;
-      -> api_error;
+#else
-#else  // !defined(__APPLE__)
+  [[nodiscard]] auto
-  [[nodiscard]] auto parse_xattr_parameters(const char *name,
+  parse_xattr_parameters(const char *name, std::string &attribute_name,
-                                            std::string &attribute_name,
+                         const std::string &api_path) -> api_error;
-                                            const std::string &api_path)
+#endif
-      -> api_error;
-#endif // defined(__APPLE__)
 
 #if defined(__APPLE__)
   [[nodiscard]] auto
   parse_xattr_parameters(const char *name, const char *value, size_t size,
                          const uint32_t &position, std::string &attribute_name,
                          const std::string &api_path) -> api_error;
-#else  // !defined(__APPLE__)
+#else
-  [[nodiscard]] auto parse_xattr_parameters(const char *name, const char *value,
+  [[nodiscard]] auto
-                                            size_t size,
+  parse_xattr_parameters(const char *name, const char *value, size_t size,
-                                            std::string &attribute_name,
+                         std::string &attribute_name,
-                                            const std::string &api_path)
+                         const std::string &api_path) -> api_error;
-      -> api_error;
+#endif
-#endif // defined(__APPLE__)
 
   static void populate_stat(const std::string &api_path,
                             std::uint64_t size_or_count,
@@ -131,13 +125,13 @@ protected:
                                      struct timespec &ts);
 
 public:
-  [[nodiscard]] auto check_owner(const std::string &api_path) const
+  [[nodiscard]] auto
-      -> api_error override;
+  check_owner(const std::string &api_path) const -> api_error override;
 
   [[nodiscard]] auto check_parent_access(const std::string &api_path,
                                          int mask) const -> api_error override;
 };
 } // namespace repertory
 
-#endif // !defined(_WIN32)
+#endif // _WIN32
 #endif // REPERTORY_INCLUDE_DRIVES_FUSE_FUSE_DRIVE_BASE_HPP_

repertory/librepertory/include/drives/fuse/i_fuse_drive.hpp

@@ -30,32 +30,29 @@ class i_fuse_drive {
   INTERFACE_SETUP(i_fuse_drive);
 
 public:
-  [[nodiscard]] virtual auto check_owner(const std::string &api_path) const
+  [[nodiscard]] virtual auto
-      -> api_error = 0;
+  check_owner(const std::string &api_path) const -> api_error = 0;
-
-  [[nodiscard]] virtual auto check_parent_access(const std::string &api_path,
-                                                 int mask) const
-      -> api_error = 0;
 
   [[nodiscard]] virtual auto
-  get_directory_item_count(const std::string &api_path) const
+  check_parent_access(const std::string &api_path,
-      -> std::uint64_t = 0;
+                      int mask) const -> api_error = 0;
+
+  [[nodiscard]] virtual auto get_directory_item_count(
+      const std::string &api_path) const -> std::uint64_t = 0;
+
+  [[nodiscard]] virtual auto get_directory_items(
+      const std::string &api_path) const -> directory_item_list = 0;
 
   [[nodiscard]] virtual auto
-  get_directory_items(const std::string &api_path) const
+  get_file_size(const std::string &api_path) const -> std::uint64_t = 0;
-      -> directory_item_list = 0;
 
-  [[nodiscard]] virtual auto get_file_size(const std::string &api_path) const
+  [[nodiscard]] virtual auto
-      -> std::uint64_t = 0;
+  get_item_meta(const std::string &api_path,
+                api_meta_map &meta) const -> api_error = 0;
 
-  [[nodiscard]] virtual auto get_item_meta(const std::string &api_path,
+  [[nodiscard]] virtual auto
-                                           api_meta_map &meta) const
+  get_item_meta(const std::string &api_path, const std::string &name,
-      -> api_error = 0;
+                std::string &value) const -> api_error = 0;
-
-  [[nodiscard]] virtual auto get_item_meta(const std::string &api_path,
-                                           const std::string &name,
-                                           std::string &value) const
-      -> api_error = 0;
 
   [[nodiscard]] virtual auto get_total_drive_space() const -> std::uint64_t = 0;
 
@@ -66,12 +63,12 @@ public:
   virtual void get_volume_info(UINT64 &total_size, UINT64 &free_size,
                                std::string &volume_label) const = 0;
 
-  [[nodiscard]] virtual auto is_processing(const std::string &api_path) const
+  [[nodiscard]] virtual auto
-      -> bool = 0;
+  is_processing(const std::string &api_path) const -> bool = 0;
 
-  [[nodiscard]] virtual auto rename_directory(const std::string &from_api_path,
+  [[nodiscard]] virtual auto
-                                              const std::string &to_api_path)
+  rename_directory(const std::string &from_api_path,
-      -> int = 0;
+                   const std::string &to_api_path) -> int = 0;
 
   [[nodiscard]] virtual auto rename_file(const std::string &from_api_path,
                                          const std::string &to_api_path,
@@ -80,11 +77,8 @@ public:
   virtual void set_item_meta(const std::string &api_path,
                              const std::string &key,
                              const std::string &value) = 0;
-
-  virtual void set_item_meta(const std::string &api_path,
-                             const api_meta_map &meta) = 0;
 };
 } // namespace repertory
 
-#endif // !defined(_WIN32)
+#endif
 #endif // REPERTORY_INCLUDE_DRIVES_FUSE_I_FUSE_DRIVE_HPP_

repertory/librepertory/include/drives/fuse/remotefuse/remote_client.hpp

@@ -38,12 +38,10 @@ public:
 private:
   const app_config &config_;
   packet_client packet_client_;
-  remote::user_id uid_{0};
+  remote::user_id uid_ = 0;
-  remote::group_id gid_{0};
+  remote::group_id gid_ = 0;
 
 public:
-  [[nodiscard]] auto check() -> packet::error_type;
-
   [[nodiscard]] auto fuse_access(const char *path, const std::int32_t &mask)
       -> packet::error_type override;
 
@@ -53,9 +51,9 @@ public:
   [[nodiscard]] auto fuse_chmod(const char *path, const remote::file_mode &mode)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_chown(const char *path, const remote::user_id &uid,
+  [[nodiscard]] auto
-                                const remote::group_id &gid)
+  fuse_chown(const char *path, const remote::user_id &uid,
-      -> packet::error_type override;
+             const remote::group_id &gid) -> packet::error_type override;
 
   [[nodiscard]] auto fuse_destroy() -> packet::error_type override;
 
@@ -69,23 +67,21 @@ public:
                 const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_fsetattr_x(const char *path,
+  [[nodiscard]] auto fuse_fsetattr_x(
-                                     const remote::setattr_x &attr,
+      const char *path, const remote::setattr_x &attr,
-                                     const remote::file_handle &handle)
+      const remote::file_handle &handle) -> packet::error_type override;
-      -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_fsync(const char *path, const std::int32_t &datasync,
+  [[nodiscard]] auto
-                                const remote::file_handle &handle)
+  fuse_fsync(const char *path, const std::int32_t &datasync,
-      -> packet::error_type override;
+             const remote::file_handle &handle) -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_ftruncate(const char *path,
+  [[nodiscard]] auto fuse_ftruncate(
-                                    const remote::file_offset &size,
+      const char *path, const remote::file_offset &size,
-                                    const remote::file_handle &handle)
+      const remote::file_handle &handle) -> packet::error_type override;
-      -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_getattr(const char *path, remote::stat &st,
+  [[nodiscard]] auto
-                                  bool &directory)
+  fuse_getattr(const char *path, remote::stat &st,
-      -> packet::error_type override;
+               bool &directory) -> packet::error_type override;
 
   /*[[nodiscard]] packet::error_type fuse_getxattr(const char *path, const char
   *name, char *value, const remote::file_size &size) override ;
@@ -94,10 +90,9 @@ public:
   *name, char *value, const remote::file_size &size, std::uint32_t position)
   override ;*/
 
-  [[nodiscard]] auto fuse_getxtimes(const char *path,
+  [[nodiscard]] auto
-                                    remote::file_time &bkuptime,
+  fuse_getxtimes(const char *path, remote::file_time &bkuptime,
-                                    remote::file_time &crtime)
+                 remote::file_time &crtime) -> packet::error_type override;
-      -> packet::error_type override;
 
   [[nodiscard]] auto fuse_init() -> packet::error_type override;
 
@@ -112,27 +107,25 @@ public:
 
   [[nodiscard]] auto
   fuse_create(const char *path, const remote::file_mode &mode,
-              const remote::open_flags &flags, remote::file_handle &handle)
+              const remote::open_flags &flags,
-      -> packet::error_type override;
+              remote::file_handle &handle) -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_open(const char *path,
+  [[nodiscard]] auto
-                               const remote::open_flags &flags,
+  fuse_open(const char *path, const remote::open_flags &flags,
-                               remote::file_handle &handle)
+            remote::file_handle &handle) -> packet::error_type override;
-      -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_read(const char *path, char *buffer,
+  [[nodiscard]] auto
-                               const remote::file_size &read_size,
+  fuse_read(const char *path, char *buffer, const remote::file_size &read_size,
-                               const remote::file_offset &read_offset,
+            const remote::file_offset &read_offset,
-                               const remote::file_handle &handle)
+            const remote::file_handle &handle) -> packet::error_type override;
-      -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_rename(const char *from, const char *to)
+  [[nodiscard]] auto fuse_rename(const char *from,
-      -> packet::error_type override;
+                                 const char *to) -> packet::error_type override;
 
   [[nodiscard]] auto
   fuse_readdir(const char *path, const remote::file_offset &offset,
-               const remote::file_handle &handle, std::string &item_path)
+               const remote::file_handle &handle,
-      -> packet::error_type override;
+               std::string &item_path) -> packet::error_type override;
 
   [[nodiscard]] auto fuse_release(const char *path,
                                   const remote::file_handle &handle)
@@ -146,8 +139,8 @@ public:
    * char *name) override
    * ;*/
 
-  [[nodiscard]] auto fuse_rmdir(const char *path)
+  [[nodiscard]] auto
-      -> packet::error_type override;
+  fuse_rmdir(const char *path) -> packet::error_type override;
 
   [[nodiscard]] auto fuse_setattr_x(const char *path, remote::setattr_x &attr)
       -> packet::error_type override;
@@ -164,8 +157,8 @@ public:
                                     const remote::file_time &crtime)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_setvolname(const char *volname)
+  [[nodiscard]] auto
-      -> packet::error_type override;
+  fuse_setvolname(const char *volname) -> packet::error_type override;
 
   [[nodiscard]] /*packet::error_type fuse_setxattr(const char *path, const char
   *name, const char *value, const remote::file_size &size, const std::int32_t
@@ -176,48 +169,45 @@ public:
   std::int32_t &flags, std::uint32_t position) override ;*/
 
   [[nodiscard]] auto
-  fuse_statfs(const char *path, std::uint64_t frsize, remote::statfs &st)
+  fuse_statfs(const char *path, std::uint64_t frsize,
-      -> packet::error_type override;
+              remote::statfs &st) -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_statfs_x(const char *path, std::uint64_t bsize,
+  [[nodiscard]] auto
-                                   remote::statfs_x &st)
+  fuse_statfs_x(const char *path, std::uint64_t bsize,
-      -> packet::error_type override;
+                remote::statfs_x &st) -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_truncate(const char *path,
+  [[nodiscard]] auto
-                                   const remote::file_offset &size)
+  fuse_truncate(const char *path,
-      -> packet::error_type override;
+                const remote::file_offset &size) -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_unlink(const char *path)
+  [[nodiscard]] auto
-      -> packet::error_type override;
+  fuse_unlink(const char *path) -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_utimens(const char *path, const remote::file_time *tv,
+  [[nodiscard]] auto
-                                  std::uint64_t op0, std::uint64_t op1)
+  fuse_utimens(const char *path, const remote::file_time *tv, std::uint64_t op0,
-      -> packet::error_type override;
+               std::uint64_t op1) -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_write(const char *path, const char *buffer,
+  [[nodiscard]] auto
-                                const remote::file_size &write_size,
+  fuse_write(const char *path, const char *buffer,
-                                const remote::file_offset &write_offset,
+             const remote::file_size &write_size,
-                                const remote::file_handle &handle)
+             const remote::file_offset &write_offset,
-      -> packet::error_type override;
+             const remote::file_handle &handle) -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_write_base64(const char *path, const char *buffer,
+  [[nodiscard]] auto fuse_write_base64(
-                                       const remote::file_size &write_size,
+      const char *path, const char *buffer, const remote::file_size &write_size,
-                                       const remote::file_offset &write_offset,
+      const remote::file_offset &write_offset,
-                                       const remote::file_handle &handle)
+      const remote::file_handle &handle) -> packet::error_type override;
-      -> packet::error_type override;
 
-  [[nodiscard]] auto json_create_directory_snapshot(const std::string &path,
+  [[nodiscard]] auto json_create_directory_snapshot(
-                                                    json &json_data)
+      const std::string &path, json &json_data) -> packet::error_type override;
-      -> packet::error_type override;
 
   [[nodiscard]] auto json_read_directory_snapshot(
       const std::string &path, const remote::file_handle &handle,
       std::uint32_t page, json &json_data) -> packet::error_type override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto json_release_directory_snapshot(
-  json_release_directory_snapshot(const std::string &path,
+      const std::string &path,
-                                  const remote::file_handle &handle)
+      const remote::file_handle &handle) -> packet::error_type override;
-      -> packet::error_type override;
 
   void set_fuse_uid_gid(const remote::user_id &uid,
                         const remote::group_id &gid) override;

repertory/librepertory/include/drives/fuse/remotefuse/remote_server.hpp

@@ -59,8 +59,7 @@ private:
 
   static void populate_stat(const struct stat64 &unix_st, remote::stat &r_stat);
 
-  [[nodiscard]] auto update_to_windows_format(const std::string &root_api_path,
+  [[nodiscard]] auto update_to_windows_format(json &item) -> json &;
-                                              json &item) -> json &;
 
 public:
   // FUSE Layer

repertory/librepertory/include/drives/winfsp/remotewinfsp/i_remote_instance.hpp

@@ -29,92 +29,87 @@ class i_remote_instance : public virtual i_remote_json {
   INTERFACE_SETUP(i_remote_instance);
 
 public:
-  [[nodiscard]] virtual auto winfsp_can_delete(PVOID file_desc, PWSTR file_name)
+  virtual auto winfsp_can_delete(PVOID file_desc, PWSTR file_name)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto winfsp_cleanup(PVOID file_desc, PWSTR file_name,
+  virtual auto winfsp_cleanup(PVOID file_desc, PWSTR file_name, UINT32 flags,
-                                            UINT32 flags, BOOLEAN &was_deleted)
+                              BOOLEAN &was_deleted) -> packet::error_type = 0;
+
+  virtual auto winfsp_close(PVOID file_desc) -> packet::error_type = 0;
+
+  virtual auto winfsp_create(PWSTR file_name, UINT32 create_options,
+                             UINT32 granted_access, UINT32 file_attributes,
+                             UINT64 allocation_size, PVOID *file_desc,
+                             remote::file_info *file_info,
+                             std::string &normalized_name, BOOLEAN &exists)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto winfsp_close(PVOID file_desc)
+  virtual auto winfsp_flush(PVOID file_desc, remote::file_info *file_info)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto
+  virtual auto winfsp_get_dir_buffer(PVOID file_desc, PVOID *&ptr)
-  winfsp_create(PWSTR file_name, UINT32 create_options, UINT32 granted_access,
-                UINT32 file_attributes, UINT64 allocation_size,
-                PVOID *file_desc, remote::file_info *file_info,
-                std::string &normalized_name, BOOLEAN &exists)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto winfsp_flush(PVOID file_desc,
+  virtual auto winfsp_get_file_info(PVOID file_desc,
-                                          remote::file_info *file_info)
+                                    remote::file_info *file_info)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto winfsp_get_dir_buffer(PVOID file_desc, PVOID *&ptr)
+  virtual auto
-      -> packet::error_type = 0;
-
-  [[nodiscard]] virtual auto winfsp_get_file_info(PVOID file_desc,
-                                                  remote::file_info *file_info)
-      -> packet::error_type = 0;
-
-  [[nodiscard]] virtual auto
   winfsp_get_security_by_name(PWSTR file_name, PUINT32 file_attributes,
                               std::uint64_t *security_descriptor_size,
                               std::wstring &str_descriptor)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto winfsp_get_volume_info(UINT64 &total_size,
+  virtual auto winfsp_get_volume_info(UINT64 &total_size, UINT64 &free_size,
-                                                    UINT64 &free_size,
+                                      std::string &volume_label)
-                                                    std::string &volume_label)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto winfsp_mounted(const std::wstring &location)
+  virtual auto winfsp_mounted(const std::wstring &location)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto
+  virtual auto winfsp_open(PWSTR file_name, UINT32 create_options,
-  winfsp_open(PWSTR file_name, UINT32 create_options, UINT32 granted_access,
+                           UINT32 granted_access, PVOID *file_desc,
-              PVOID *file_desc, remote::file_info *file_info,
+                           remote::file_info *file_info,
-              std::string &normalized_name) -> packet::error_type = 0;
+                           std::string &normalized_name)
-
-  [[nodiscard]] virtual auto
-  winfsp_overwrite(PVOID file_desc, UINT32 file_attributes,
-                   BOOLEAN replace_file_attributes, UINT64 allocation_size,
-                   remote::file_info *file_info) -> packet::error_type = 0;
-
-  [[nodiscard]] virtual auto winfsp_read(PVOID file_desc, PVOID buffer,
-                                         UINT64 offset, UINT32 length,
-                                         PUINT32 bytes_transferred)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto winfsp_read_directory(PVOID file_desc,
+  virtual auto winfsp_overwrite(PVOID file_desc, UINT32 file_attributes,
-                                                   PWSTR pattern, PWSTR marker,
+                                BOOLEAN replace_file_attributes,
-                                                   json &itemList)
+                                UINT64 allocation_size,
+                                remote::file_info *file_info)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto winfsp_rename(PVOID file_desc, PWSTR file_name,
+  virtual auto winfsp_read(PVOID file_desc, PVOID buffer, UINT64 offset,
-                                           PWSTR new_file_name,
+                           UINT32 length, PUINT32 bytes_transferred)
-                                           BOOLEAN replace_if_exists)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto
+  virtual auto winfsp_read_directory(PVOID file_desc, PWSTR pattern,
-  winfsp_set_basic_info(PVOID file_desc, UINT32 file_attributes,
+                                     PWSTR marker, json &itemList)
-                        UINT64 creation_time, UINT64 last_access_time,
-                        UINT64 last_write_time, UINT64 change_time,
-                        remote::file_info *file_info) -> packet::error_type = 0;
-
-  [[nodiscard]] virtual auto winfsp_set_file_size(PVOID file_desc,
-                                                  UINT64 new_size,
-                                                  BOOLEAN set_allocation_size,
-                                                  remote::file_info *file_info)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto winfsp_unmounted(const std::wstring &location)
+  virtual auto winfsp_rename(PVOID file_desc, PWSTR file_name,
+                             PWSTR new_file_name, BOOLEAN replace_if_exists)
       -> packet::error_type = 0;
 
-  [[nodiscard]] virtual auto
+  virtual auto winfsp_set_basic_info(PVOID file_desc, UINT32 file_attributes,
-  winfsp_write(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
+                                     UINT64 creation_time,
-               BOOLEAN write_to_end, BOOLEAN constrained_io,
+                                     UINT64 last_access_time,
-               PUINT32 bytes_transferred, remote::file_info *file_info)
+                                     UINT64 last_write_time, UINT64 change_time,
+                                     remote::file_info *file_info)
+      -> packet::error_type = 0;
+
+  virtual auto winfsp_set_file_size(PVOID file_desc, UINT64 new_size,
+                                    BOOLEAN set_allocation_size,
+                                    remote::file_info *file_info)
+      -> packet::error_type = 0;
+
+  virtual auto winfsp_unmounted(const std::wstring &location)
+      -> packet::error_type = 0;
+
+  virtual auto winfsp_write(PVOID file_desc, PVOID buffer, UINT64 offset,
+                            UINT32 length, BOOLEAN write_to_end,
+                            BOOLEAN constrained_io, PUINT32 bytes_transferred,
+                            remote::file_info *file_info)
       -> packet::error_type = 0;
 };
 

repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_client.hpp

@@ -44,105 +44,93 @@ private:
 #if defined(_WIN32)
 #define to_handle(x) (x)
 #else  // !defined(_WIN32)
-  [[nodiscard]] static auto to_handle(PVOID file_desc) -> native_handle;
+  static auto to_handle(PVOID file_desc) -> native_handle;
 #endif // defined(_WIN32)
 
 public:
-  [[nodiscard]] auto check() -> packet::error_type;
+  auto json_create_directory_snapshot(const std::string &path, json &json_data)
-
-  [[nodiscard]] auto json_create_directory_snapshot(const std::string &path,
-                                                    json &json_data)
       -> packet::error_type override;
 
-  [[nodiscard]] auto json_read_directory_snapshot(
+  auto json_read_directory_snapshot(const std::string &path,
-      const std::string &path, const remote::file_handle &handle,
+                                    const remote::file_handle &handle,
-      std::uint32_t page, json &json_data) -> packet::error_type override;
+                                    std::uint32_t page, json &json_data)
-
-  [[nodiscard]] auto
-  json_release_directory_snapshot(const std::string &path,
-                                  const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_can_delete(PVOID file_desc, PWSTR file_name)
+  auto json_release_directory_snapshot(const std::string &path,
+                                       const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_cleanup(PVOID file_desc, PWSTR file_name,
+  auto winfsp_can_delete(PVOID file_desc, PWSTR file_name)
-                                    UINT32 flags, BOOLEAN &was_deleted)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_close(PVOID file_desc)
+  auto winfsp_cleanup(PVOID file_desc, PWSTR file_name, UINT32 flags,
+                      BOOLEAN &was_deleted) -> packet::error_type override;
+
+  auto winfsp_close(PVOID file_desc) -> packet::error_type override;
+
+  auto winfsp_create(PWSTR file_name, UINT32 create_options,
+                     UINT32 granted_access, UINT32 attributes,
+                     UINT64 allocation_size, PVOID *file_desc,
+                     remote::file_info *file_info, std::string &normalized_name,
+                     BOOLEAN &exists) -> packet::error_type override;
+
+  auto winfsp_flush(PVOID file_desc, remote::file_info *file_info)
       -> packet::error_type override;
 
-  [[nodiscard]] auto
+  auto winfsp_get_dir_buffer(PVOID file_desc, PVOID *&ptr)
-  winfsp_create(PWSTR file_name, UINT32 create_options, UINT32 granted_access,
-                UINT32 attributes, UINT64 allocation_size, PVOID *file_desc,
-                remote::file_info *file_info, std::string &normalized_name,
-                BOOLEAN &exists) -> packet::error_type override;
-
-  [[nodiscard]] auto winfsp_flush(PVOID file_desc, remote::file_info *file_info)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_get_dir_buffer(PVOID file_desc, PVOID *&ptr)
+  auto winfsp_get_file_info(PVOID file_desc, remote::file_info *file_info)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_get_file_info(PVOID file_desc,
+  auto winfsp_get_security_by_name(PWSTR file_name, PUINT32 attributes,
-                                          remote::file_info *file_info)
+                                   std::uint64_t *descriptor_size,
+                                   std::wstring &string_descriptor)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_get_security_by_name(
+  auto winfsp_get_volume_info(UINT64 &total_size, UINT64 &free_size,
-      PWSTR file_name, PUINT32 attributes, std::uint64_t *descriptor_size,
+                              std::string &volume_label)
-      std::wstring &string_descriptor) -> packet::error_type override;
-
-  [[nodiscard]] auto winfsp_get_volume_info(UINT64 &total_size,
-                                            UINT64 &free_size,
-                                            std::string &volume_label)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_mounted(const std::wstring &location)
+  auto winfsp_mounted(const std::wstring &location)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_open(PWSTR file_name, UINT32 create_options,
+  auto winfsp_open(PWSTR file_name, UINT32 create_options,
-                                 UINT32 granted_access, PVOID *file_desc,
+                   UINT32 granted_access, PVOID *file_desc,
-                                 remote::file_info *file_info,
+                   remote::file_info *file_info, std::string &normalized_name)
-                                 std::string &normalized_name)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_overwrite(PVOID file_desc, UINT32 attributes,
+  auto winfsp_overwrite(PVOID file_desc, UINT32 attributes,
-                                      BOOLEAN replace_attributes,
+                        BOOLEAN replace_attributes, UINT64 allocation_size,
-                                      UINT64 allocation_size,
+                        remote::file_info *file_info)
-                                      remote::file_info *file_info)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_read(PVOID file_desc, PVOID buffer, UINT64 offset,
+  auto winfsp_read(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
-                                 UINT32 length, PUINT32 bytes_transferred)
+                   PUINT32 bytes_transferred) -> packet::error_type override;
+
+  auto winfsp_read_directory(PVOID file_desc, PWSTR pattern, PWSTR marker,
+                             json &itemList) -> packet::error_type override;
+
+  auto winfsp_rename(PVOID file_desc, PWSTR file_name, PWSTR new_file_name,
+                     BOOLEAN replace_if_exists) -> packet::error_type override;
+
+  auto winfsp_set_basic_info(PVOID file_desc, UINT32 attributes,
+                             UINT64 creation_time, UINT64 last_access_time,
+                             UINT64 last_write_time, UINT64 change_time,
+                             remote::file_info *file_info)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_read_directory(PVOID file_desc, PWSTR pattern,
+  auto winfsp_set_file_size(PVOID file_desc, UINT64 new_size,
-                                           PWSTR marker, json &itemList)
+                            BOOLEAN set_allocation_size,
+                            remote::file_info *file_info)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_rename(PVOID file_desc, PWSTR file_name,
+  auto winfsp_unmounted(const std::wstring &location)
-                                   PWSTR new_file_name,
-                                   BOOLEAN replace_if_exists)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_set_basic_info(
+  auto winfsp_write(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
-      PVOID file_desc, UINT32 attributes, UINT64 creation_time,
+                    BOOLEAN write_to_end, BOOLEAN constrained_io,
-      UINT64 last_access_time, UINT64 last_write_time, UINT64 change_time,
+                    PUINT32 bytes_transferred, remote::file_info *file_info)
-      remote::file_info *file_info) -> packet::error_type override;
-
-  [[nodiscard]] auto winfsp_set_file_size(PVOID file_desc, UINT64 new_size,
-                                          BOOLEAN set_allocation_size,
-                                          remote::file_info *file_info)
-      -> packet::error_type override;
-
-  [[nodiscard]] auto winfsp_unmounted(const std::wstring &location)
-      -> packet::error_type override;
-
-  [[nodiscard]] auto
-  winfsp_write(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
-               BOOLEAN write_to_end, BOOLEAN constrained_io,
-               PUINT32 bytes_transferred, remote::file_info *file_info)
       -> packet::error_type override;
 };
 } // namespace remote_winfsp

repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_server.hpp

@@ -58,46 +58,41 @@ private:
 
 public:
   // FUSE Layer
-  [[nodiscard]] auto fuse_access(const char *path, const std::int32_t &mask)
+  auto fuse_access(const char *path, const std::int32_t &mask)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_chflags(const char *path, std::uint32_t flags)
+  auto fuse_chflags(const char *path, std::uint32_t flags)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_chmod(const char *path, const remote::file_mode &mode)
+  auto fuse_chmod(const char *path, const remote::file_mode &mode)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_chown(const char *path, const remote::user_id &uid,
+  auto fuse_chown(const char *path, const remote::user_id &uid,
-                                const remote::group_id &gid)
+                  const remote::group_id &gid) -> packet::error_type override;
-      -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_destroy() -> packet::error_type override;
+  auto fuse_destroy() -> packet::error_type override;
 
   /*packet::error_type fuse_fallocate(const char *path, const std::int32_t
      &mode, const remote::file_offset &offset, const remote::file_offset
      &length, const remote::file_handle &handle) override ;*/
 
-  [[nodiscard]] auto fuse_fgetattr(const char *path, remote::stat &r_stat,
+  auto fuse_fgetattr(const char *path, remote::stat &r_stat, bool &directory,
-                                   bool &directory,
+                     const remote::file_handle &handle)
-                                   const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_fsetattr_x(const char *path,
+  auto fuse_fsetattr_x(const char *path, const remote::setattr_x &attr,
-                                     const remote::setattr_x &attr,
+                       const remote::file_handle &handle)
-                                     const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_fsync(const char *path, const std::int32_t &datasync,
+  auto fuse_fsync(const char *path, const std::int32_t &datasync,
-                                const remote::file_handle &handle)
+                  const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_ftruncate(const char *path,
+  auto fuse_ftruncate(const char *path, const remote::file_offset &size,
-                                    const remote::file_offset &size,
+                      const remote::file_handle &handle)
-                                    const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_getattr(const char *path, remote::stat &r_stat,
+  auto fuse_getattr(const char *path, remote::stat &r_stat, bool &directory)
-                                  bool &directory)
       -> packet::error_type override;
 
   /*packet::error_type fuse_getxattr(const char *path, const char *name, char
@@ -106,90 +101,77 @@ public:
   packet::error_type fuse_getxattrOSX(const char *path, const char *name, char
   *value, const remote::file_size &size, std::uint32_t position) override ;*/
 
-  [[nodiscard]] auto fuse_getxtimes(const char *path,
+  auto fuse_getxtimes(const char *path, remote::file_time &bkuptime,
-                                    remote::file_time &bkuptime,
+                      remote::file_time &crtime) -> packet::error_type override;
-                                    remote::file_time &crtime)
-      -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_init() -> packet::error_type override;
+  auto fuse_init() -> packet::error_type override;
 
   /*packet::error_type fuse_listxattr(const char *path, char *buffer,
                                          const remote::file_size &size) override
      ;*/
 
-  [[nodiscard]] auto fuse_mkdir(const char *path, const remote::file_mode &mode)
+  auto fuse_mkdir(const char *path, const remote::file_mode &mode)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_opendir(const char *path, remote::file_handle &handle)
+  auto fuse_opendir(const char *path, remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto
+  auto fuse_create(const char *path, const remote::file_mode &mode,
-  fuse_create(const char *path, const remote::file_mode &mode,
+                   const remote::open_flags &flags, remote::file_handle &handle)
-              const remote::open_flags &flags, remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_open(const char *path,
+  auto fuse_open(const char *path, const remote::open_flags &flags,
-                               const remote::open_flags &flags,
+                 remote::file_handle &handle) -> packet::error_type override;
-                               remote::file_handle &handle)
+
+  auto fuse_read(const char *path, char *buffer,
+                 const remote::file_size &read_size,
+                 const remote::file_offset &read_offset,
+                 const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_read(const char *path, char *buffer,
+  auto fuse_rename(const char *from, const char *to)
-                               const remote::file_size &read_size,
-                               const remote::file_offset &read_offset,
-                               const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_rename(const char *from, const char *to)
+  auto fuse_write(const char *path, const char *buffer,
+                  const remote::file_size &write_size,
+                  const remote::file_offset &write_offset,
+                  const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_write(const char *path, const char *buffer,
+  auto fuse_write_base64(const char *path, const char *buffer,
-                                const remote::file_size &write_size,
+                         const remote::file_size &write_size,
-                                const remote::file_offset &write_offset,
+                         const remote::file_offset &write_offset,
-                                const remote::file_handle &handle)
+                         const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_write_base64(const char *path, const char *buffer,
+  auto fuse_readdir(const char *path, const remote::file_offset &offset,
-                                       const remote::file_size &write_size,
+                    const remote::file_handle &handle, std::string &item_path)
-                                       const remote::file_offset &write_offset,
-                                       const remote::file_handle &handle)
       -> packet::error_type override;
 
-  [[nodiscard]] auto
+  auto fuse_release(const char *path, const remote::file_handle &handle)
-  fuse_readdir(const char *path, const remote::file_offset &offset,
-               const remote::file_handle &handle, std::string &item_path)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_release(const char *path,
+  auto fuse_releasedir(const char *path, const remote::file_handle &handle)
-                                  const remote::file_handle &handle)
-      -> packet::error_type override;
-
-  [[nodiscard]] auto fuse_releasedir(const char *path,
-                                     const remote::file_handle &handle)
       -> packet::error_type override;
 
   /*packet::error_type fuse_removexattr(const char *path, const char *name)
    * override ;*/
 
-  [[nodiscard]] auto fuse_rmdir(const char *path)
+  auto fuse_rmdir(const char *path) -> packet::error_type override;
+
+  auto fuse_setattr_x(const char *path, remote::setattr_x &attr)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_setattr_x(const char *path, remote::setattr_x &attr)
+  auto fuse_setbkuptime(const char *path, const remote::file_time &bkuptime)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_setbkuptime(const char *path,
+  auto fuse_setchgtime(const char *path, const remote::file_time &chgtime)
-                                      const remote::file_time &bkuptime)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_setchgtime(const char *path,
+  auto fuse_setcrtime(const char *path, const remote::file_time &crtime)
-                                     const remote::file_time &chgtime)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_setcrtime(const char *path,
+  auto fuse_setvolname(const char *volname) -> packet::error_type override;
-                                    const remote::file_time &crtime)
-      -> packet::error_type override;
-
-  [[nodiscard]] auto fuse_setvolname(const char *volname)
-      -> packet::error_type override;
 
   /*packet::error_type fuse_setxattr(const char *path, const char *name, const
   char *value, const remote::file_size &size, const std::int32_t &flags)
@@ -199,123 +181,109 @@ public:
   char *value, const remote::file_size &size, const std::int32_t &flags,
                                            std::uint32_t position) override ;*/
 
-  [[nodiscard]] auto fuse_statfs(const char *path, std::uint64_t frsize,
+  auto fuse_statfs(const char *path, std::uint64_t frsize,
-                                 remote::statfs &r_stat)
+                   remote::statfs &r_stat) -> packet::error_type override;
+
+  auto fuse_statfs_x(const char *path, std::uint64_t bsize,
+                     remote::statfs_x &r_stat) -> packet::error_type override;
+
+  auto fuse_truncate(const char *path, const remote::file_offset &size)
       -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_statfs_x(const char *path, std::uint64_t bsize,
+  auto fuse_unlink(const char *path) -> packet::error_type override;
-                                   remote::statfs_x &r_stat)
-      -> packet::error_type override;
 
-  [[nodiscard]] auto fuse_truncate(const char *path,
+  auto fuse_utimens(const char *path, const remote::file_time *tv,
-                                   const remote::file_offset &size)
+                    std::uint64_t op0, std::uint64_t op1)
-      -> packet::error_type override;
-
-  [[nodiscard]] auto fuse_unlink(const char *path)
-      -> packet::error_type override;
-
-  [[nodiscard]] auto fuse_utimens(const char *path, const remote::file_time *tv,
-                                  std::uint64_t op0, std::uint64_t op1)
       -> packet::error_type override;
 
   void set_fuse_uid_gid(const remote::user_id & /* uid */,
                         const remote::group_id & /* gid */) override {}
 
   // JSON Layer
-  [[nodiscard]] auto json_create_directory_snapshot(const std::string &path,
+  auto json_create_directory_snapshot(const std::string &path, json &json_data)
-                                                    json &json_data)
       -> packet::error_type override;
 
-  [[nodiscard]] auto json_read_directory_snapshot(
+  auto json_read_directory_snapshot(const std::string &path,
-      const std::string &path, const remote::file_handle &handle,
+                                    const remote::file_handle &handle,
-      std::uint32_t page, json &json_data) -> packet::error_type override;
+                                    std::uint32_t page, json &json_data)
+      -> packet::error_type override;
 
-  [[nodiscard]] auto
+  auto json_release_directory_snapshot(const std::string &path,
-  json_release_directory_snapshot(const std::string &path,
+                                       const remote::file_handle &handle)
-                                  const remote::file_handle &handle)
       -> packet::error_type override;
 
   // WinFSP Layer
-  [[nodiscard]] auto winfsp_can_delete(PVOID file_desc, PWSTR file_name)
+  auto winfsp_can_delete(PVOID file_desc, PWSTR file_name)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_cleanup(PVOID file_desc, PWSTR file_name,
+  auto winfsp_cleanup(PVOID file_desc, PWSTR file_name, UINT32 flags,
-                                    UINT32 flags, BOOLEAN &was_deleted)
+                      BOOLEAN &was_deleted) -> packet::error_type override;
+
+  auto winfsp_close(PVOID file_desc) -> packet::error_type override;
+
+  auto winfsp_create(PWSTR file_name, UINT32 create_options,
+                     UINT32 granted_access, UINT32 attributes,
+                     UINT64 allocation_size, PVOID *file_desc,
+                     remote::file_info *file_info, std::string &normalized_name,
+                     BOOLEAN &exists) -> packet::error_type override;
+
+  auto winfsp_flush(PVOID file_desc, remote::file_info *file_info)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_close(PVOID file_desc)
+  auto winfsp_get_dir_buffer(PVOID file_desc, PVOID *&ptr)
       -> packet::error_type override;
 
-  [[nodiscard]] auto
+  auto winfsp_get_file_info(PVOID file_desc, remote::file_info *file_info)
-  winfsp_create(PWSTR file_name, UINT32 create_options, UINT32 granted_access,
-                UINT32 attributes, UINT64 allocation_size, PVOID *file_desc,
-                remote::file_info *file_info, std::string &normalized_name,
-                BOOLEAN &exists) -> packet::error_type override;
-
-  [[nodiscard]] auto winfsp_flush(PVOID file_desc, remote::file_info *file_info)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_get_dir_buffer(PVOID file_desc, PVOID *&ptr)
+  auto winfsp_get_security_by_name(PWSTR file_name, PUINT32 attributes,
+                                   std::uint64_t *descriptor_size,
+                                   std::wstring &string_descriptor)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_get_file_info(PVOID file_desc,
+  auto winfsp_get_volume_info(UINT64 &total_size, UINT64 &free_size,
-                                          remote::file_info *file_info)
+                              std::string &volume_label)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_get_security_by_name(
+  auto winfsp_mounted(const std::wstring &location)
-      PWSTR file_name, PUINT32 attributes, std::uint64_t *descriptor_size,
-      std::wstring &string_descriptor) -> packet::error_type override;
-
-  [[nodiscard]] auto winfsp_get_volume_info(UINT64 &total_size,
-                                            UINT64 &free_size,
-                                            std::string &volume_label)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_mounted(const std::wstring &location)
+  auto winfsp_open(PWSTR file_name, UINT32 create_options,
+                   UINT32 granted_access, PVOID *file_desc,
+                   remote::file_info *file_info, std::string &normalized_name)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_open(PWSTR file_name, UINT32 create_options,
+  auto winfsp_overwrite(PVOID file_desc, UINT32 attributes,
-                                 UINT32 granted_access, PVOID *file_desc,
+                        BOOLEAN replace_attributes, UINT64 allocation_size,
-                                 remote::file_info *file_info,
+                        remote::file_info *file_info)
-                                 std::string &normalized_name)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_overwrite(PVOID file_desc, UINT32 attributes,
+  auto winfsp_read(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
-                                      BOOLEAN replace_attributes,
+                   PUINT32 bytes_transferred) -> packet::error_type override;
-                                      UINT64 allocation_size,
+
-                                      remote::file_info *file_info)
+  auto winfsp_read_directory(PVOID file_desc, PWSTR pattern, PWSTR marker,
+                             json &item_list) -> packet::error_type override;
+
+  auto winfsp_rename(PVOID file_desc, PWSTR file_name, PWSTR new_file_name,
+                     BOOLEAN replace_if_exists) -> packet::error_type override;
+
+  auto winfsp_set_basic_info(PVOID file_desc, UINT32 attributes,
+                             UINT64 creation_time, UINT64 last_access_time,
+                             UINT64 last_write_time, UINT64 change_time,
+                             remote::file_info *file_info)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_read(PVOID file_desc, PVOID buffer, UINT64 offset,
+  auto winfsp_set_file_size(PVOID file_desc, UINT64 new_size,
-                                 UINT32 length, PUINT32 bytes_transferred)
+                            BOOLEAN set_allocation_size,
+                            remote::file_info *file_info)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_read_directory(PVOID file_desc, PWSTR pattern,
+  auto winfsp_unmounted(const std::wstring &location)
-                                           PWSTR marker, json &item_list)
       -> packet::error_type override;
 
-  [[nodiscard]] auto winfsp_rename(PVOID file_desc, PWSTR file_name,
+  auto winfsp_write(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
-                                   PWSTR new_file_name,
+                    BOOLEAN write_to_end, BOOLEAN constrained_io,
-                                   BOOLEAN replace_if_exists)
+                    PUINT32 bytes_transferred, remote::file_info *file_info)
-      -> packet::error_type override;
-
-  [[nodiscard]] auto winfsp_set_basic_info(
-      PVOID file_desc, UINT32 attributes, UINT64 creation_time,
-      UINT64 last_access_time, UINT64 last_write_time, UINT64 change_time,
-      remote::file_info *file_info) -> packet::error_type override;
-
-  [[nodiscard]] auto winfsp_set_file_size(PVOID file_desc, UINT64 new_size,
-                                          BOOLEAN set_allocation_size,
-                                          remote::file_info *file_info)
-      -> packet::error_type override;
-
-  [[nodiscard]] auto winfsp_unmounted(const std::wstring &location)
-      -> packet::error_type override;
-
-  [[nodiscard]] auto
-  winfsp_write(PVOID file_desc, PVOID buffer, UINT64 offset, UINT32 length,
-               BOOLEAN write_to_end, BOOLEAN constrained_io,
-               PUINT32 bytes_transferred, remote::file_info *file_info)
       -> packet::error_type override;
 };
 } // namespace remote_winfsp

repertory/librepertory/include/events/consumers/logging_consumer.hpp

@@ -35,8 +35,9 @@ public:
   ~logging_consumer();
 
 private:
-  static constexpr std::uint8_t MAX_LOG_FILES{5U};
+  static constexpr const std::uint8_t MAX_LOG_FILES{5U};
-  static constexpr std::uint64_t MAX_LOG_FILE_SIZE{1024ULL * 1024ULL * 5ULL};
+  static constexpr const std::uint64_t MAX_LOG_FILE_SIZE{1024ULL * 1024ULL *
+                                                         5ULL};
 
 private:
   static void process_event(const i_event &evt);

repertory/librepertory/include/events/event_system.hpp

@@ -27,7 +27,7 @@ class i_event;
 
 class event_system final {
 private:
-  static constexpr std::uint8_t max_queue_retry{
+  static constexpr const std::uint8_t max_queue_retry{
       30U,
   };
 
@@ -35,7 +35,7 @@ private:
       std::thread::hardware_concurrency() * 4U,
   };
 
-  static constexpr std::chrono::seconds queue_wait_secs{
+  static constexpr const std::chrono::seconds queue_wait_secs{
       5s,
   };
 

repertory/librepertory/include/events/types/curl_error.hpp

@@ -33,8 +33,8 @@ struct curl_error final : public i_event {
         function_name(std::string{function_name_}),
         url(std::move(url_)) {}
 
-  static constexpr event_level level{event_level::error};
+  static constexpr const event_level level{event_level::error};
-  static constexpr std::string_view name{"curl_error"};
+  static constexpr const std::string_view name{"curl_error"};
 
   CURLcode code{};
   std::string function_name;

repertory/librepertory/include/events/types/debug_log.hpp

@@ -31,8 +31,8 @@ struct debug_log final : public i_event {
   debug_log(std::string_view function_name_, std::string msg_)
       : function_name(std::string(function_name_)), msg(std::move(msg_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"debug_log"};
+  static constexpr const std::string_view name{"debug_log"};
 
   std::string function_name;
   std::string msg;

repertory/librepertory/include/events/types/directory_remove_failed.hpp

@@ -34,8 +34,8 @@ struct directory_remove_failed final : public i_event {
         error(error_),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::error};
+  static constexpr const event_level level{event_level::error};
-  static constexpr std::string_view name{"directory_remove_failed"};
+  static constexpr const std::string_view name{"directory_remove_failed"};
 
   std::string api_path;
   api_error error{};

repertory/librepertory/include/events/types/directory_removed.hpp

@@ -32,8 +32,8 @@ struct directory_removed final : public i_event {
       : api_path(std::move(api_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"directory_removed"};
+  static constexpr const std::string_view name{"directory_removed"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/directory_removed_externally.hpp

@@ -35,8 +35,8 @@ struct directory_removed_externally final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"directory_removed_externally"};
+  static constexpr const std::string_view name{"directory_removed_externally"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/download_begin.hpp

@@ -34,8 +34,8 @@ struct download_begin final : public i_event {
         dest_path(std::move(dest_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"download_begin"};
+  static constexpr const std::string_view name{"download_begin"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_end.hpp

@@ -35,8 +35,8 @@ struct download_end final : public i_event {
         error(error_),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"download_end"};
+  static constexpr const std::string_view name{"download_end"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_progress.hpp

@@ -35,8 +35,8 @@ struct download_progress final : public i_event {
         function_name(std::string(function_name_)),
         progress(progress_) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"download_progress"};
+  static constexpr const std::string_view name{"download_progress"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_restore_failed.hpp

@@ -35,8 +35,8 @@ struct download_restore_failed final : public i_event {
         error(std::move(error_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::error};
+  static constexpr const event_level level{event_level::error};
-  static constexpr std::string_view name{"download_restore_failed"};
+  static constexpr const std::string_view name{"download_restore_failed"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_restored.hpp

@@ -34,8 +34,8 @@ struct download_restored final : public i_event {
         dest_path(std::move(dest_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"download_restored"};
+  static constexpr const std::string_view name{"download_restored"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_resume_add_failed.hpp

@@ -36,8 +36,8 @@ struct download_resume_add_failed final : public i_event {
         error(std::move(error_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::error};
+  static constexpr const event_level level{event_level::error};
-  static constexpr std::string_view name{"download_resume_add_failed"};
+  static constexpr const std::string_view name{"download_resume_add_failed"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_resume_added.hpp

@@ -34,8 +34,8 @@ struct download_resume_added final : public i_event {
         dest_path(std::move(dest_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"download_resume_added"};
+  static constexpr const std::string_view name{"download_resume_added"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_resume_removed.hpp

@@ -34,8 +34,8 @@ struct download_resume_removed final : public i_event {
         dest_path(std::move(dest_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"download_resume_removed"};
+  static constexpr const std::string_view name{"download_resume_removed"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/download_type_selected.hpp

@@ -35,8 +35,8 @@ struct download_type_selected final : public i_event {
         function_name(std::string(function_name_)),
         type(type_) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"download_type_selected"};
+  static constexpr const std::string_view name{"download_type_selected"};
 
   std::string api_path;
   std::string dest_path;

repertory/librepertory/include/events/types/drive_mount_failed.hpp

@@ -35,8 +35,8 @@ struct drive_mount_failed final : public i_event {
         function_name(std::string(function_name_)),
         mount_location(std::move(mount_location_)) {}
 
-  static constexpr event_level level{event_level::error};
+  static constexpr const event_level level{event_level::error};
-  static constexpr std::string_view name{"drive_mount_failed"};
+  static constexpr const std::string_view name{"drive_mount_failed"};
 
   NTSTATUS error{};
   std::string function_name;

repertory/librepertory/include/events/types/drive_mount_result.hpp

@@ -34,8 +34,8 @@ struct drive_mount_result final : public i_event {
         mount_location(std::move(mount_location_)),
         result(std::move(result_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"drive_mount_result"};
+  static constexpr const std::string_view name{"drive_mount_result"};
 
   std::string function_name;
   std::string mount_location;

repertory/librepertory/include/events/types/drive_mounted.hpp

@@ -32,8 +32,8 @@ struct drive_mounted final : public i_event {
       : function_name(std::string(function_name_)),
         mount_location(std::move(mount_location_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"drive_mounted"};
+  static constexpr const std::string_view name{"drive_mounted"};
 
   std::string function_name;
   std::string mount_location;

repertory/librepertory/include/events/types/drive_stop_timed_out.hpp

@@ -31,8 +31,8 @@ struct drive_stop_timed_out final : public i_event {
   drive_stop_timed_out(std::string_view function_name_)
       : function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"drive_stop_timed_out"};
+  static constexpr const std::string_view name{"drive_stop_timed_out"};
 
   std::string function_name;
 

repertory/librepertory/include/events/types/drive_unmount_pending.hpp

@@ -33,8 +33,8 @@ struct drive_unmount_pending final : public i_event {
       : function_name(std::string(function_name_)),
         mount_location(std::move(mount_location_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"drive_unmount_pending"};
+  static constexpr const std::string_view name{"drive_unmount_pending"};
 
   std::string function_name;
   std::string mount_location;

repertory/librepertory/include/events/types/drive_unmounted.hpp

@@ -32,8 +32,8 @@ struct drive_unmounted final : public i_event {
       : function_name(std::string(function_name_)),
         mount_location(std::move(mount_location_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"drive_unmounted"};
+  static constexpr const std::string_view name{"drive_unmounted"};
 
   std::string function_name;
   std::string mount_location;

repertory/librepertory/include/events/types/event_level_changed.hpp

@@ -31,8 +31,8 @@ struct event_level_changed final : public i_event {
   event_level_changed(std::string_view function_name_, event_level new_level_)
       : function_name(std::string(function_name_)), new_level(new_level_) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"event_level_changed"};
+  static constexpr const std::string_view name{"event_level_changed"};
 
   std::string function_name;
   event_level new_level{};

repertory/librepertory/include/events/types/file_pinned.hpp

@@ -32,8 +32,8 @@ struct file_pinned final : public i_event {
       : api_path(std::move(api_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"file_pinned"};
+  static constexpr const std::string_view name{"file_pinned"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_remove_failed.hpp

@@ -34,8 +34,8 @@ struct file_remove_failed final : public i_event {
         error(error_),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::error};
+  static constexpr const event_level level{event_level::error};
-  static constexpr std::string_view name{"file_remove_failed"};
+  static constexpr const std::string_view name{"file_remove_failed"};
 
   std::string api_path;
   api_error error{};

repertory/librepertory/include/events/types/file_removed.hpp

@@ -32,8 +32,8 @@ struct file_removed final : public i_event {
       : api_path(std::move(api_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"file_removed"};
+  static constexpr const std::string_view name{"file_removed"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_removed_externally.hpp

@@ -35,8 +35,8 @@ struct file_removed_externally final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"file_removed_externally"};
+  static constexpr const std::string_view name{"file_removed_externally"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_unpinned.hpp

@@ -32,8 +32,8 @@ struct file_unpinned final : public i_event {
       : api_path(std::move(api_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"file_unpinned"};
+  static constexpr const std::string_view name{"file_unpinned"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_upload_completed.hpp

@@ -37,8 +37,8 @@ struct file_upload_completed final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"file_upload_completed"};
+  static constexpr const std::string_view name{"file_upload_completed"};
 
   std::string api_path;
   bool cancelled{};

repertory/librepertory/include/events/types/file_upload_failed.hpp

@@ -35,8 +35,8 @@ struct file_upload_failed final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"file_upload_failed"};
+  static constexpr const std::string_view name{"file_upload_failed"};
 
   std::string api_path;
   std::string error;

repertory/librepertory/include/events/types/file_upload_not_found.hpp

@@ -34,8 +34,8 @@ struct file_upload_not_found final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"file_upload_not_found"};
+  static constexpr const std::string_view name{"file_upload_not_found"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_upload_queued.hpp

@@ -34,8 +34,8 @@ struct file_upload_queued final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"file_upload_queued"};
+  static constexpr const std::string_view name{"file_upload_queued"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_upload_removed.hpp

@@ -32,8 +32,8 @@ struct file_upload_removed final : public i_event {
       : api_path(std::move(api_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"file_upload_removed"};
+  static constexpr const std::string_view name{"file_upload_removed"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/file_upload_retry.hpp

@@ -35,8 +35,8 @@ struct file_upload_retry final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"file_upload_retry"};
+  static constexpr const std::string_view name{"file_upload_retry"};
 
   std::string api_path;
   api_error error{};

repertory/librepertory/include/events/types/filesystem_item_added.hpp

@@ -35,8 +35,8 @@ struct filesystem_item_added final : public i_event {
         directory(directory_),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"filesystem_item_added"};
+  static constexpr const std::string_view name{"filesystem_item_added"};
 
   std::string api_parent;
   std::string api_path;

repertory/librepertory/include/events/types/filesystem_item_closed.hpp

@@ -37,8 +37,8 @@ struct filesystem_item_closed final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::trace};
+  static constexpr const event_level level{event_level::trace};
-  static constexpr std::string_view name{"filesystem_item_closed"};
+  static constexpr const std::string_view name{"filesystem_item_closed"};
 
   std::string api_path;
   bool changed{};

repertory/librepertory/include/events/types/filesystem_item_evicted.hpp

@@ -35,8 +35,8 @@ struct filesystem_item_evicted final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"filesystem_item_evicted"};
+  static constexpr const std::string_view name{"filesystem_item_evicted"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/filesystem_item_handle_closed.hpp

@@ -39,8 +39,8 @@ struct filesystem_item_handle_closed final : public i_event {
         handle(handle_),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::trace};
+  static constexpr const event_level level{event_level::trace};
-  static constexpr std::string_view name{"filesystem_item_handle_closed"};
+  static constexpr const std::string_view name{"filesystem_item_handle_closed"};
 
   std::string api_path;
   bool changed{};

repertory/librepertory/include/events/types/filesystem_item_handle_opened.hpp

@@ -37,8 +37,8 @@ struct filesystem_item_handle_opened final : public i_event {
         handle(handle_),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::trace};
+  static constexpr const event_level level{event_level::trace};
-  static constexpr std::string_view name{"filesystem_item_handle_opened"};
+  static constexpr const std::string_view name{"filesystem_item_handle_opened"};
 
   std::string api_path;
   bool directory{};

repertory/librepertory/include/events/types/filesystem_item_opened.hpp

@@ -36,8 +36,8 @@ struct filesystem_item_opened final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::trace};
+  static constexpr const event_level level{event_level::trace};
-  static constexpr std::string_view name{"filesystem_item_opened"};
+  static constexpr const std::string_view name{"filesystem_item_opened"};
 
   std::string api_path;
   bool directory{};

repertory/librepertory/include/events/types/fuse_args_parsed.hpp

@@ -32,8 +32,8 @@ struct fuse_args_parsed final : public i_event {
   fuse_args_parsed(std::string_view args_, std::string_view function_name_)
       : args(std::move(args_)), function_name(std::string{function_name_}) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"fuse_args_parsed"};
+  static constexpr const std::string_view name{"fuse_args_parsed"};
 
   std::string args;
   std::string function_name;

repertory/librepertory/include/events/types/fuse_event.hpp

@@ -35,8 +35,8 @@ struct fuse_event final : public i_event {
         error(error_),
         function_name(std::string{function_name_}) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"fuse_event"};
+  static constexpr const std::string_view name{"fuse_event"};
 
   std::string api_path;
   std::int32_t error{};

repertory/librepertory/include/events/types/info_log.hpp

@@ -1,68 +0,0 @@
-/*
-  Copyright <2018-2025> <scott.e.graves@protonmail.com>
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-*/
-#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_INFO_LOG_HPP_
-#define REPERTORY_INCLUDE_EVENTS_TYPES_INFO_LOG_HPP_
-
-#include "events/i_event.hpp"
-#include "types/repertory.hpp"
-
-namespace repertory {
-struct info_log final : public i_event {
-  info_log() = default;
-  info_log(std::string_view function_name_, std::string msg_)
-      : function_name(std::string(function_name_)), msg(std::move(msg_)) {}
-
-  static constexpr event_level level{event_level::info};
-  static constexpr std::string_view name{"info_log"};
-
-  std::string function_name;
-  std::string msg;
-
-  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return level;
-  }
-
-  [[nodiscard]] auto get_name() const -> std::string_view override {
-    return name;
-  }
-
-  [[nodiscard]] auto get_single_line() const -> std::string override {
-    return fmt::format("{}|func|{}|msg|{}", name, function_name, msg);
-  }
-};
-} // namespace repertory
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-template <> struct adl_serializer<repertory::info_log> {
-  static void to_json(json &data, const repertory::info_log &value) {
-    data["function_name"] = value.function_name;
-    data["msg"] = value.msg;
-  }
-
-  static void from_json(const json &data, repertory::info_log &value) {
-    data.at("function_name").get_to<std::string>(value.function_name);
-    data.at("msg").get_to<std::string>(value.msg);
-  }
-};
-NLOHMANN_JSON_NAMESPACE_END
-
-#endif // REPERTORY_INCLUDE_EVENTS_TYPES_INFO_LOG_HPP_

repertory/librepertory/include/events/types/invalid_cache_size.hpp

@@ -34,8 +34,8 @@ struct invalid_cache_size final : public i_event {
         function_name(std::string{function_name_}),
         invalid_size(invalid_size_) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"invalid_cache_size"};
+  static constexpr const std::string_view name{"invalid_cache_size"};
 
   std::uint64_t cache_size{};
   std::string function_name;

repertory/librepertory/include/events/types/item_timeout.hpp

@@ -32,8 +32,8 @@ struct item_timeout final : public i_event {
       : api_path(std::move(api_path_)),
         function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::trace};
+  static constexpr const event_level level{event_level::trace};
-  static constexpr std::string_view name{"item_timeout"};
+  static constexpr const std::string_view name{"item_timeout"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/max_cache_size_reached.hpp

@@ -35,8 +35,8 @@ struct max_cache_size_reached final : public i_event {
         function_name(std::string{function_name_}),
         max_cache_size(max_cache_size_) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"max_cache_size_reached"};
+  static constexpr const std::string_view name{"max_cache_size_reached"};
 
   std::uint64_t cache_size{};
   std::string function_name;

repertory/librepertory/include/events/types/orphaned_file_detected.hpp

@@ -33,8 +33,8 @@ struct orphaned_file_detected final : public i_event {
       : function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"orphaned_file_detected"};
+  static constexpr const std::string_view name{"orphaned_file_detected"};
 
   std::string function_name;
   std::string source_path;

repertory/librepertory/include/events/types/orphaned_file_processing_failed.hpp

@@ -36,8 +36,8 @@ struct orphaned_file_processing_failed final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::error};
+  static constexpr const event_level level{event_level::error};
-  static constexpr std::string_view name{
+  static constexpr const std::string_view name{
       "orphaned_file_processing_failed",
   };
 

repertory/librepertory/include/events/types/orphaned_source_file_detected.hpp

@@ -33,8 +33,8 @@ struct orphaned_source_file_detected final : public i_event {
       : function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"orphaned_source_file_detected"};
+  static constexpr const std::string_view name{"orphaned_source_file_detected"};
 
   std::string function_name;
   std::string source_path;

repertory/librepertory/include/events/types/orphaned_source_file_removed.hpp

@@ -33,8 +33,8 @@ struct orphaned_source_file_removed final : public i_event {
       : function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"orphaned_source_file_removed"};
+  static constexpr const std::string_view name{"orphaned_source_file_removed"};
 
   std::string function_name;
   std::string source_path;

repertory/librepertory/include/events/types/packet_client_timeout.hpp

@@ -34,8 +34,8 @@ struct packet_client_timeout final : public i_event {
         function_name(std::string(function_name_)),
         msg(std::move(msg_)) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"packet_client_timeout"};
+  static constexpr const std::string_view name{"packet_client_timeout"};
 
   std::string event_name;
   std::string function_name;

repertory/librepertory/include/events/types/polling_item_begin.hpp

@@ -32,8 +32,8 @@ struct polling_item_begin final : public i_event {
       : function_name(std::string(function_name_)),
         item_name(std::move(item_name_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"polling_item_begin"};
+  static constexpr const std::string_view name{"polling_item_begin"};
 
   std::string function_name;
   std::string item_name;

repertory/librepertory/include/events/types/polling_item_end.hpp

@@ -32,8 +32,8 @@ struct polling_item_end final : public i_event {
       : function_name(std::string(function_name_)),
         item_name(std::move(item_name_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"polling_item_end"};
+  static constexpr const std::string_view name{"polling_item_end"};
 
   std::string function_name;
   std::string item_name;

repertory/librepertory/include/events/types/provider_invalid_version.hpp

@@ -35,8 +35,8 @@ struct provider_invalid_version final : public i_event {
         required_version(std::move(required_version_)),
         returned_version(std::move(returned_version_)) {}
 
-  static constexpr event_level level{event_level::error};
+  static constexpr const event_level level{event_level::error};
-  static constexpr std::string_view name{"provider_invalid_version"};
+  static constexpr const std::string_view name{"provider_invalid_version"};
 
   std::string function_name;
   std::string required_version;

repertory/librepertory/include/events/types/provider_offline.hpp

@@ -34,8 +34,8 @@ struct provider_offline final : public i_event {
         host_name_or_ip(std::move(host_name_or_ip_)),
         port(port_) {}
 
-  static constexpr event_level level{event_level::warn};
+  static constexpr const event_level level{event_level::warn};
-  static constexpr std::string_view name{"provider_offline"};
+  static constexpr const std::string_view name{"provider_offline"};
 
   std::string function_name;
   std::string host_name_or_ip;

repertory/librepertory/include/events/types/provider_upload_begin.hpp

@@ -34,8 +34,8 @@ struct provider_upload_begin final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"provider_upload_begin"};
+  static constexpr const std::string_view name{"provider_upload_begin"};
 
   std::string api_path;
   std::string function_name;

repertory/librepertory/include/events/types/provider_upload_end.hpp

@@ -35,8 +35,8 @@ struct provider_upload_end final : public i_event {
         function_name(std::string(function_name_)),
         source_path(std::move(source_path_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"provider_upload_end"};
+  static constexpr const std::string_view name{"provider_upload_end"};
 
   std::string api_path;
   api_error error{};

repertory/librepertory/include/events/types/remote_server_event.hpp

@@ -35,8 +35,8 @@ struct remote_server_event final : public i_event {
         error(error_),
         function_name(std::string{function_name_}) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"remote_server_event"};
+  static constexpr const std::string_view name{"remote_server_event"};
 
   std::string api_path;
   packet::error_type error{};

repertory/librepertory/include/events/types/repertory_exception.hpp

@@ -31,8 +31,8 @@ struct repertory_exception final : public i_event {
   repertory_exception(std::string_view function_name_, std::string msg_)
       : function_name(std::string(function_name_)), msg(std::move(msg_)) {}
 
-  static constexpr event_level level{event_level::error};
+  static constexpr const event_level level{event_level::error};
-  static constexpr std::string_view name{"repertory_exception"};
+  static constexpr const std::string_view name{"repertory_exception"};
 
   std::string function_name;
   std::string msg;

repertory/librepertory/include/events/types/service_start_begin.hpp

@@ -33,8 +33,8 @@ struct service_start_begin final : public i_event {
       : function_name(std::string(function_name_)),
         service_name(std::move(service_name_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"service_start_begin"};
+  static constexpr const std::string_view name{"service_start_begin"};
 
   std::string function_name;
   std::string service_name;

repertory/librepertory/include/events/types/service_start_end.hpp

@@ -32,8 +32,8 @@ struct service_start_end final : public i_event {
       : function_name(std::string(function_name_)),
         service_name(std::move(service_name_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"service_start_end"};
+  static constexpr const std::string_view name{"service_start_end"};
 
   std::string function_name;
   std::string service_name;

repertory/librepertory/include/events/types/service_stop_begin.hpp

@@ -32,8 +32,8 @@ struct service_stop_begin final : public i_event {
       : function_name(std::string(function_name_)),
         service_name(std::move(service_name_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"service_stop_begin"};
+  static constexpr const std::string_view name{"service_stop_begin"};
 
   std::string function_name;
   std::string service_name;

repertory/librepertory/include/events/types/service_stop_end.hpp

@@ -32,8 +32,8 @@ struct service_stop_end final : public i_event {
       : function_name(std::string(function_name_)),
         service_name(std::move(service_name_)) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"service_stop_end"};
+  static constexpr const std::string_view name{"service_stop_end"};
 
   std::string function_name;
   std::string service_name;

repertory/librepertory/include/events/types/trace_log.hpp

@@ -1,68 +0,0 @@
-/*
-  Copyright <2018-2025> <scott.e.graves@protonmail.com>
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-*/
-#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_TRACE_LOG_HPP_
-#define REPERTORY_INCLUDE_EVENTS_TYPES_TRACE_LOG_HPP_
-
-#include "events/i_event.hpp"
-#include "types/repertory.hpp"
-
-namespace repertory {
-struct trace_log final : public i_event {
-  trace_log() = default;
-  trace_log(std::string_view function_name_, std::string msg_)
-      : function_name(std::string(function_name_)), msg(std::move(msg_)) {}
-
-  static constexpr event_level level{event_level::trace};
-  static constexpr std::string_view name{"trace_log"};
-
-  std::string function_name;
-  std::string msg;
-
-  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return level;
-  }
-
-  [[nodiscard]] auto get_name() const -> std::string_view override {
-    return name;
-  }
-
-  [[nodiscard]] auto get_single_line() const -> std::string override {
-    return fmt::format("{}|func|{}|msg|{}", name, function_name, msg);
-  }
-};
-} // namespace repertory
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-template <> struct adl_serializer<repertory::trace_log> {
-  static void to_json(json &data, const repertory::trace_log &value) {
-    data["function_name"] = value.function_name;
-    data["msg"] = value.msg;
-  }
-
-  static void from_json(const json &data, repertory::trace_log &value) {
-    data.at("function_name").get_to<std::string>(value.function_name);
-    data.at("msg").get_to<std::string>(value.msg);
-  }
-};
-NLOHMANN_JSON_NAMESPACE_END
-
-#endif // REPERTORY_INCLUDE_EVENTS_TYPES_TRACE_LOG_HPP_

repertory/librepertory/include/events/types/unmount_requested.hpp

@@ -31,8 +31,8 @@ struct unmount_requested final : public i_event {
   unmount_requested(std::string_view function_name_)
       : function_name(std::string(function_name_)) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"unmount_requested"};
+  static constexpr const std::string_view name{"unmount_requested"};
 
   std::string function_name;
 

repertory/librepertory/include/events/types/unmount_result.hpp

@@ -35,8 +35,8 @@ struct unmount_result final : public i_event {
         mount_location(std::move(mount_location_)),
         result(result_) {}
 
-  static constexpr event_level level{event_level::info};
+  static constexpr const event_level level{event_level::info};
-  static constexpr std::string_view name{"unmount_result"};
+  static constexpr const std::string_view name{"unmount_result"};
 
   std::string function_name;
   std::string mount_location;

repertory/librepertory/include/events/types/warn_log.hpp

@@ -1,68 +0,0 @@
-/*
-  Copyright <2018-2025> <scott.e.graves@protonmail.com>
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-*/
-#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_WARN_LOG_HPP_
-#define REPERTORY_INCLUDE_EVENTS_TYPES_WARN_LOG_HPP_
-
-#include "events/i_event.hpp"
-#include "types/repertory.hpp"
-
-namespace repertory {
-struct warn_log final : public i_event {
-  warn_log() = default;
-  warn_log(std::string_view function_name_, std::string msg_)
-      : function_name(std::string(function_name_)), msg(std::move(msg_)) {}
-
-  static constexpr event_level level{event_level::warn};
-  static constexpr std::string_view name{"warn_log"};
-
-  std::string function_name;
-  std::string msg;
-
-  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return level;
-  }
-
-  [[nodiscard]] auto get_name() const -> std::string_view override {
-    return name;
-  }
-
-  [[nodiscard]] auto get_single_line() const -> std::string override {
-    return fmt::format("{}|func|{}|msg|{}", name, function_name, msg);
-  }
-};
-} // namespace repertory
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-template <> struct adl_serializer<repertory::warn_log> {
-  static void to_json(json &data, const repertory::warn_log &value) {
-    data["function_name"] = value.function_name;
-    data["msg"] = value.msg;
-  }
-
-  static void from_json(const json &data, repertory::warn_log &value) {
-    data.at("function_name").get_to<std::string>(value.function_name);
-    data.at("msg").get_to<std::string>(value.msg);
-  }
-};
-NLOHMANN_JSON_NAMESPACE_END
-
-#endif // REPERTORY_INCLUDE_EVENTS_TYPES_WARN_LOG_HPP_

repertory/librepertory/include/events/types/winfsp_event.hpp

@@ -35,8 +35,8 @@ struct winfsp_event final : public i_event {
         error(error_),
         function_name(std::string{function_name_}) {}
 
-  static constexpr event_level level{event_level::debug};
+  static constexpr const event_level level{event_level::debug};
-  static constexpr std::string_view name{"winfsp_event"};
+  static constexpr const std::string_view name{"winfsp_event"};
 
   std::string api_path;
   NTSTATUS error{};

repertory/librepertory/include/file_manager/cache_size_mgr.hpp

@@ -29,7 +29,7 @@ class app_config;
 
 class cache_size_mgr final {
 private:
-  static constexpr std::chrono::seconds cache_wait_secs{
+  static constexpr const std::chrono::seconds cache_wait_secs{
       5s,
   };
 

repertory/librepertory/include/file_manager/file_manager.hpp

@@ -40,7 +40,7 @@ class file_manager final : public i_file_manager, public i_upload_manager {
   E_CONSUMER();
 
 private:
-  static constexpr std::chrono::seconds queue_wait_secs{
+  static constexpr const std::chrono::seconds queue_wait_secs{
       5s,
   };
 

repertory/librepertory/include/file_manager/ring_buffer_base.hpp

@@ -48,7 +48,7 @@ public:
       -> ring_buffer_base & = delete;
 
 public:
-  static constexpr auto min_ring_size{5U};
+  static constexpr const auto min_ring_size{5U};
 
 private:
   boost::dynamic_bitset<> read_state_;

repertory/librepertory/include/platform/platform.hpp

@@ -22,13 +22,6 @@
 #ifndef REPERTORY_INCLUDE_PLATFORM_PLATFORM_HPP_
 #define REPERTORY_INCLUDE_PLATFORM_PLATFORM_HPP_
 
-#include "types/repertory.hpp"
-
-namespace repertory {
-[[nodiscard]] auto create_lock_id(provider_type prov,
-                                  std::string_view unique_id)->std::string;
-}
-
 #if defined(_WIN32)
 #include "platform/win32_platform.hpp"
 #include "utils/windows.hpp"

repertory/librepertory/include/platform/unix_platform.hpp

@@ -30,44 +30,40 @@ class i_provider;
 
 class lock_data final {
 public:
-  lock_data(provider_type prov, std::string_view unique_id);
+  explicit lock_data(const provider_type &pt, std::string unique_id /*= ""*/);
 
-  lock_data(const lock_data &) = delete;
+  lock_data();
-  lock_data(lock_data &&) = delete;
-
-  auto operator=(const lock_data &) -> lock_data & = delete;
-  auto operator=(lock_data &&) -> lock_data & = delete;
 
   ~lock_data();
 
 private:
-  std::string mutex_id_;
+  const provider_type pt_;
-
+  const std::string unique_id_;
-private:
+  const std::string mutex_id_;
-  int handle_{};
+  int lock_fd_;
   int lock_status_{EWOULDBLOCK};
 
 private:
   [[nodiscard]] static auto get_state_directory() -> std::string;
 
-  [[nodiscard]] auto get_lock_data_file() const -> std::string;
+  [[nodiscard]] static auto get_lock_data_file() -> std::string;
 
-  [[nodiscard]] auto get_lock_file() const -> std::string;
+  [[nodiscard]] auto get_lock_file() -> std::string;
 
 private:
-  [[nodiscard]] static auto wait_for_lock(int handle,
+  [[nodiscard]] static auto wait_for_lock(int fd,
-                                          std::uint8_t retry_count = 30U)
+                                          std::uint8_t retry_count = 30u)
       -> int;
 
 public:
   [[nodiscard]] auto get_mount_state(json &mount_state) -> bool;
 
-  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30U) -> lock_result;
+  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30u) -> lock_result;
 
   void release();
 
   [[nodiscard]] auto set_mount_state(bool active,
-                                     std::string_view mount_location, int pid)
+                                     const std::string &mount_location, int pid)
       -> bool;
 };
 
@@ -83,5 +79,5 @@ public:
                                          const api_file &file) -> api_error;
 } // namespace repertory
 
-#endif // !defined(_WIN32)
+#endif // _WIN32
 #endif // REPERTORY_INCLUDE_PLATFORM_UNIXPLATFORM_HPP_

repertory/librepertory/include/platform/win32_platform.hpp

@@ -23,6 +23,7 @@
 #define REPERTORY_INCLUDE_PLATFORM_WINPLATFORM_HPP_
 #if defined(_WIN32)
 
+#include "app_config.hpp"
 #include "types/repertory.hpp"
 
 namespace repertory {
@@ -30,32 +31,43 @@ class i_provider;
 
 class lock_data final {
 public:
-  explicit lock_data(provider_type prov, std::string unique_id);
+  explicit lock_data(const provider_type &pt, std::string unique_id /*= ""*/)
-  lock_data(const lock_data &) = delete;
+      : pt_(pt),
-  lock_data(lock_data &&) = delete;
+        unique_id_(std::move(unique_id)),
+        mutex_id_("repertory_" + app_config::get_provider_name(pt) + "_" +
+                  unique_id_),
+        mutex_handle_(::CreateMutex(nullptr, FALSE, &mutex_id_[0u])) {}
 
-  ~lock_data();
+  lock_data()
+      : pt_(provider_type::sia),
+        unique_id_(""),
+        mutex_id_(""),
+        mutex_handle_(INVALID_HANDLE_VALUE) {}
 
-  auto operator=(const lock_data &) -> lock_data & = delete;
+  ~lock_data() { release(); }
-  auto operator=(lock_data &&) -> lock_data & = delete;
 
 private:
-  std::string mutex_id_;
+  const provider_type pt_;
-  HANDLE mutex_handle_{INVALID_HANDLE_VALUE};
+  const std::string unique_id_;
-  DWORD mutex_state_{WAIT_FAILED};
+  const std::string mutex_id_;
-
+  HANDLE mutex_handle_;
-  [[nodiscard]] auto get_current_mount_state(json &mount_state) -> bool;
+  DWORD mutex_state_ = WAIT_FAILED;
 
 public:
+  [[nodiscard]] auto get_mount_state(const provider_type &pt,
+                                     json &mount_state) -> bool;
+
   [[nodiscard]] auto get_mount_state(json &mount_state) -> bool;
 
-  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30U) -> lock_result;
+  [[nodiscard]] auto get_unique_id() const -> std::string { return unique_id_; }
+
+  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30) -> lock_result;
 
   void release();
 
   [[nodiscard]] auto set_mount_state(bool active,
-                                     std::string_view mount_location,
+                                     const std::string &mount_location,
-                                     std::int64_t pid) -> bool;
+                                     const std::int64_t &pid) -> bool;
 };
 
 [[nodiscard]] auto create_meta_attributes(

repertory/librepertory/include/providers/encrypt/encrypt_provider.hpp

@@ -84,8 +84,6 @@ private:
 
   void remove_deleted_files(stop_type &stop_requested);
 
-  void remove_expired_files();
-
 public:
   [[nodiscard]] auto check_version(std::string &required_version,
                                    std::string &returned_version) const

repertory/librepertory/include/providers/sia/sia_provider.hpp

@@ -49,28 +49,16 @@ private:
   sia_config sia_config_;
 
 private:
-  [[nodiscard]] auto create_directory_key(const std::string &api_path) const
-      -> repertory::api_error;
-
-  [[nodiscard]] auto ensure_directory_exists(const std::string &api_path) const
-      -> api_error;
-
   [[nodiscard]] auto get_object_info(const std::string &api_path,
                                      json &object_info) const -> api_error;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto get_object_list(const std::string &api_path,
-  get_object_list(const std::string &api_path, nlohmann::json &object_list,
+                                     nlohmann::json &object_list) const -> bool;
-                  std::optional<std::string> marker = std::nullopt) const
-      -> bool;
 
   [[nodiscard]] auto get_sia_config() const -> const auto & {
     return sia_config_;
   }
 
-  void iterate_objects(
-      const std::string &api_path, const json &object_list,
-      std::function<void(const std::string &, bool, json)> handle_entry) const;
-
 protected:
   [[nodiscard]] auto create_directory_impl(const std::string &api_path,
                                            api_meta_map &meta)

repertory/librepertory/include/rpc/server/server.hpp

@@ -30,13 +30,8 @@ class app_config;
 class server {
 public:
   explicit server(app_config &config);
-  server(const server &) = delete;
-  server(server &&) = delete;
 
-  auto operator=(const server &) -> server & = delete;
+  virtual ~server() { stop(); }
-  auto operator=(server &&) -> server & = delete;
-
-  virtual ~server();
 
 private:
   app_config &config_;

repertory/librepertory/include/types/remote.hpp

@@ -24,20 +24,19 @@
 
 #include "types/repertory.hpp"
 
-inline constexpr auto PACKET_SERVICE_FUSE{1U};
+inline constexpr const auto PACKET_SERVICE_FUSE{1U};
-inline constexpr auto PACKET_SERVICE_WINFSP{2U};
+inline constexpr const auto PACKET_SERVICE_WINFSP{2U};
 
 #if defined(_WIN32)
-inline constexpr auto PACKET_SERVICE_FLAGS{PACKET_SERVICE_WINFSP};
+inline constexpr const auto PACKET_SERVICE_FLAGS{PACKET_SERVICE_WINFSP};
 #else  // !defined(_WIN32)
-inline constexpr auto PACKET_SERVICE_FLAGS{PACKET_SERVICE_FUSE};
+inline constexpr const auto PACKET_SERVICE_FLAGS{PACKET_SERVICE_FUSE};
 #endif // defined(_WIN32)
 
-inline constexpr auto default_remote_directory_page_size{std::size_t(100U)};
+constexpr const auto default_remote_client_pool_size{20U};
-inline constexpr auto default_remote_client_pool_size{20U};
+constexpr const auto default_remote_max_connections{20U};
-inline constexpr auto default_remote_max_connections{20U};
+constexpr const auto default_remote_receive_timeout_ms{120U * 1000U};
-inline constexpr auto default_remote_receive_timeout_ms{120U * 1000U};
+constexpr const auto default_remote_send_timeout_ms{30U * 1000U};
-inline constexpr auto default_remote_send_timeout_ms{30U * 1000U};
 
 namespace repertory::remote {
 struct remote_config final {
@@ -218,8 +217,8 @@ struct statfs_x final : public statfs {
 #if !defined(_WIN32)
 [[nodiscard]] auto create_open_flags(std::uint32_t flags) -> open_flags;
 
-[[nodiscard]] auto create_os_open_flags(const open_flags &flags)
+[[nodiscard]] auto
-    -> std::uint32_t;
+create_os_open_flags(const open_flags &flags) -> std::uint32_t;
 #endif // !defined(_WIN32)
 } // namespace repertory::remote