updated CHANGELOG.md

[bug] S3 error responses are not being logged #29

.cspell/words.txt

@@ -26,6 +26,7 @@ cppvsdbg
 create_notraverse
 crypto_aead_xchacha20poly1305_ietf_npubbytes
 cstdint
+curlopt_aws_sigv4
 cxxflags
 cxxstd
 d_largefile64_source
@@ -154,6 +155,7 @@ nlohmann_json
 nmakeprg
 nominmax
 ntstatus
+nullptr
 nuspell_version
 oleaut32
 openal_version

CHANGELOG.md

@@ -1,14 +1,39 @@
 # Changelog
 
+## v2.0.3-rc
+
+### Issues
+
+* ~~\#12 \[Unit Test\] Complete all providers unit tests~~
+* ~~\#20 Add support to evict open files~~
+* ~~\#21 \[Unit Test \] Complete WinFSP unit tests~~
+* ~~\#22 \[Unit Test\] Complete FUSE unit tests~~
+* \#28 \[bug\] Address slow directory responses in S3 mounts for deeply nested directories
+* \#29 \[bug\] S3 error responses are not being logged
+* \#30 \[bug\] Sia provider error responses are not logged
+* \#31 \[bug\] S3 provider should limit max key size to 1024
+
+### Changes from v2.0.2-rc
+
+* Always use direct for read-only providers
+* Fixed http headers not being added for requests
+* Fixed incorrect `stat` values for remote mounts
+* Fixed invalid directory nullptr error on remote mounts
+* Fixed memory leak in event system
+* Refactored application shutdown
+* Updated build system to Alpine 3.21.0
+* Updated build system to MinGW-w64 12.0.0
+* Updated copyright to 2018-2025
+
 ## v2.0.2-rc
 
 ### BREAKING CHANGES
 
 * Refactored `config.json` - will need to verify configuration settings prior to mounting
 
+<!-- markdownlint-disable-next-line -->
 ### Issues
 
-* \#12 \[Unit Test\] Complete all providers unit tests
 * \#14 \[Unit Test\] SQLite mini-ORM unit tests and cleanup
 * \#16 Add support for bucket name in Sia provider
 * \#17 Update to common c++ build system

LICENSE.md

@@ -1,5 +1,5 @@
 # Repertory MIT License
-### Copyright <2018-2024> <scott.e.graves@protonmail.com>
+### 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:
 

cmake/hashes.cmake

@@ -1,15 +1,15 @@
-set(BINUTILS_HASH ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450)
-set(BOOST_HASH f55c340aa49763b1925ccf02b2e83f35fdcf634c9d5164a2acb87540173c741d)
+set(BINUTILS_HASH b53606f443ac8f01d1d5fc9c39497f2af322d99e14cea5c0b4b124d630379365)
 set(BOOST2_HASH 7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca)
+set(BOOST_HASH f55c340aa49763b1925ccf02b2e83f35fdcf634c9d5164a2acb87540173c741d)
 set(CPP_HTTPLIB_HASH 405abd8170f2a446fc8612ac635d0db5947c0d2e156e32603403a4496255ff00)
 set(CURL_HASH 5a231145114589491fc52da118f9c7ef8abee885d1cb1ced99c7290e9a352f07)
 set(EXPAT_HASH 372b18f6527d162fa9658f1c74d22a37429b82d822f5a1e1fc7e00f6045a06a2)
 set(GCC_HASH 7d376d445f93126dc545e2c0086d0f647c3094aae081cdb78f42ce2bc25e7293)
 set(GTEST_HASH 7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926)
-set(ICU_HASH 925e6b4b8cf8856e0ac214f6f34e30dee63b7bb7a50460ab4603950eff48f89e)
+set(ICU_HASH a2c443404f00098e9e90acf29dc318e049d2dc78d9ae5f46efb261934a730ce2)
 set(JSON_HASH 0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406)
 set(LIBSODIUM_HASH 8e5aeca07a723a27bbecc3beef14b0068d37e7fc0e97f51b3f1c82d2a58005c1)
-set(MINGW_HASH 3f66bce069ee8bed7439a1a13da7cb91a5e67ea6170f21317ac7f5794625ee10)
+set(MINGW_HASH 30e5aad2c48dd318150f79cff47661232c4175876d6b4d6b270961cf2b49a48b)
 set(OPENSSL_HASH e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf)
 set(PKG_CONFIG_HASH 6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591)
 set(PUGIXML_HASH 2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015)

cmake/libraries/curl.cmake

@@ -20,11 +20,13 @@ if(PROJECT_ENABLE_CURL)
       LIST_SEPARATOR |
       CMAKE_ARGS 
         ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
         -DBUILD_CURL_EXE=OFF
+        -DBUILD_LIBCURL_DOCS=OFF
+        -DBUILD_MISC_DOCS=OFF
+        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
         -DBUILD_STATIC_CURL=ON
         -DBUILD_STATIC_LIBS=ON
+        -DBUILD_STATIC_LIBS=ON
         -DBUILD_TESTING=OFF
         -DCURL_CA_BUNDLE=./cacert.pem
         -DCURL_CA_FALLBACK=ON
@@ -33,6 +35,7 @@ if(PROJECT_ENABLE_CURL)
         -DCURL_USE_LIBSSH2=OFF
         -DCURL_USE_OPENSSL=${PROJECT_ENABLE_OPENSSL}
         -DCURL_ZLIB=ON
+        -DENABLE_CURL_MANUAL=OFF
         -DENABLE_THREADED_RESOLVER=ON
         -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
         -DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS}

cmake/versions.cmake

@@ -1,28 +1,28 @@
-set(BINUTILS_VERSION 2.41)
-set(BOOST2_MAJOR_VERSION 1)
-set(BOOST2_MINOR_VERSION 76)
-set(BOOST2_PATCH_VERSION 0)
+set(BINUTILS_VERSION 2.43)
 set(BOOST_MAJOR_VERSION 1)
 set(BOOST_MINOR_VERSION 87)
 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.18.1)
-set(CURL2_VERSION 8_11_0)
 set(CURL_VERSION 8.11.0)
-set(EXPAT2_VERSION 2_6_4)
+set(CURL2_VERSION 8_11_0)
 set(EXPAT_VERSION 2.6.4)
+set(EXPAT2_VERSION 2_6_4)
 set(GCC_VERSION 14.2.0)
 set(GTEST_VERSION 1.15.2)
-set(ICU_VERSION 75-1)
+set(ICU_VERSION 76-1)
 set(JSON_VERSION 3.11.3)
 set(LIBSODIUM_VERSION 1.0.20)
 set(MESA_VERSION 23.3.3)
-set(MINGW_VERSION 11.0.1)
+set(MINGW_VERSION 12.0.0)
 set(OPENSSL_VERSION 3.4.0)
 set(PKG_CONFIG_VERSION 0.29.2)
 set(PUGIXML_VERSION 1.14)
 set(ROCKSDB_VERSION 9.7.4)
 set(SPDLOG_VERSION 1.15.0)
-set(SQLITE2_VERSION 3.46.1)
 set(SQLITE_VERSION 3460100)
+set(SQLITE2_VERSION 3.46.1)
 set(STDUUID_VERSION 1.2.3)
 set(ZLIB_VERSION 1.3.1)

config.sh

@@ -5,12 +5,12 @@ PROJECT_NAME="repertory"
 PROJECT_COMPANY_NAME="https://git.fifthgrid.com/blockstorage"
 PROJECT_URL="${PROJECT_COMPANY_NAME}/repertory"
 
-PROJECT_COPYRIGHT="Copyright <2018-2024> <MIT License> <${PROJECT_URL}>"
+PROJECT_COPYRIGHT="Copyright <2018-2025> <MIT License> <${PROJECT_URL}>"
 PROJECT_DESC="Mount utility for Sia and S3"
 
 PROJECT_MAJOR_VERSION=2
 PROJECT_MINOR_VERSION=0
-PROJECT_REVISION_VERSION=2
+PROJECT_REVISION_VERSION=3
 PROJECT_RELEASE_NUM=0
 PROJECT_RELEASE_ITER=rc
 

docker/aarch64/alpine

@@ -1,4 +1,4 @@
-FROM         arm64v8/alpine:3.20.3
+FROM         arm64v8/alpine:3.21.0
 MAINTAINER   Scott E. Graves <scott.e.graves@protonmail.com>
 CMD          bash
 
@@ -30,7 +30,6 @@ RUN apk add \
   gflags \
   gflags-dev \
   git \
-  gtkmm3-dev \
   icu-dev \
   icu-libs \
   icu-static \
@@ -69,7 +68,6 @@ RUN apk add \
   tcl \
   tcl-dev \
   texinfo \
-  vlc-dev \
   wget \
   xz \
   xz-dev \
@@ -82,3 +80,6 @@ RUN apk add \
   zstd-libs \
   zstd-static \
   xz-static
+
+RUN ln -sf /usr/bin/aclocal-1.17 /usr/bin/aclocal-1.16
+RUN ln -sf /usr/bin/automake-1.17 /usr/bin/automake-1.16

docker/x86_64/alpine

@@ -1,4 +1,4 @@
-FROM         alpine:3.20.3
+FROM         alpine:3.21.0
 MAINTAINER   Scott E. Graves <scott.e.graves@protonmail.com>
 CMD          bash
 
@@ -80,3 +80,6 @@ RUN apk add \
   zstd-libs \
   zstd-static \
   xz-static
+
+RUN ln -sf /usr/bin/aclocal-1.17 /usr/bin/aclocal-1.16
+RUN ln -sf /usr/bin/automake-1.17 /usr/bin/automake-1.16

docker/x86_64/mingw64

@@ -1,5 +1,5 @@
 #comment
-FROM alpine:3.20.3
+FROM alpine:3.21.0
 
 RUN apk update
 RUN apk upgrade
@@ -671,6 +671,8 @@ RUN if [ -f "/3rd_party/curl-${MY_CURL_VERSION}.tar.gz" ]; then \
       && cd build \
       && cmake .. \
         -DBUILD_CURL_EXE=ON \
+        -DBUILD_LIBCURL_DOCS=OFF \
+        -DBUILD_MISC_DOCS=OFF \
         -DBUILD_SHARED_LIBS=OFF \
         -DBUILD_STATIC_LIBS=ON \
         -DBUILD_TESTING=OFF \
@@ -684,6 +686,7 @@ RUN if [ -f "/3rd_party/curl-${MY_CURL_VERSION}.tar.gz" ]; then \
         -DCURL_USE_LIBSSH2=OFF \
         -DCURL_USE_OPENSSL=ON \
         -DCURL_ZLIB=ON \
+        -DENABLE_CURL_MANUAL=OFF \
         -DENABLE_THREADED_RESOLVER=ON \
         -DOPENSSL_USE_STATIC_LIBS=ON \
         -DUSE_LIBIDN2=OFF \

repertory/librepertory/include/app_config.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -28,27 +28,35 @@
 
 namespace repertory {
 class app_config final {
+private:
+  static stop_type stop_requested;
+
 public:
-  [[nodiscard]] static auto
-  default_agent_name(const provider_type &prov) -> std::string;
+  [[nodiscard]] static auto default_agent_name(const provider_type &prov)
+      -> std::string;
 
-  [[nodiscard]] static auto
-  default_api_port(const provider_type &prov) -> std::uint16_t;
+  [[nodiscard]] static auto default_api_port(const provider_type &prov)
+      -> std::uint16_t;
 
-  [[nodiscard]] static auto
-  default_data_directory(const provider_type &prov) -> std::string;
+  [[nodiscard]] static auto default_data_directory(const provider_type &prov)
+      -> std::string;
 
-  [[nodiscard]] static auto
-  default_remote_api_port(const provider_type &prov) -> std::uint16_t;
+  [[nodiscard]] static auto default_remote_api_port(const provider_type &prov)
+      -> std::uint16_t;
 
-  [[nodiscard]] static auto
-  default_rpc_port(const provider_type &prov) -> std::uint16_t;
+  [[nodiscard]] static auto default_rpc_port(const provider_type &prov)
+      -> std::uint16_t;
 
-  [[nodiscard]] static auto
-  get_provider_display_name(const provider_type &prov) -> std::string;
+  [[nodiscard]] static auto get_provider_display_name(const provider_type &prov)
+      -> std::string;
 
-  [[nodiscard]] static auto
-  get_provider_name(const provider_type &prov) -> std::string;
+  [[nodiscard]] static auto get_provider_name(const provider_type &prov)
+      -> std::string;
+
+public:
+  [[nodiscard]] static auto get_stop_requested() -> bool;
+
+  static void set_stop_requested();
 
 public:
   app_config(const provider_type &prov, std::string_view data_directory = "");
@@ -185,8 +193,8 @@ public:
 
   [[nodiscard]] auto get_task_wait_ms() const -> std::uint16_t;
 
-  [[nodiscard]] auto
-  get_value_by_name(const std::string &name) const -> std::string;
+  [[nodiscard]] auto get_value_by_name(const std::string &name) const
+      -> std::string;
 
   [[nodiscard]] auto get_version() const -> std::uint64_t;
 

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -22,6 +22,7 @@
 #ifndef REPERTORY_INCLUDE_COMM_CURL_CURL_COMM_HPP_
 #define REPERTORY_INCLUDE_COMM_CURL_CURL_COMM_HPP_
 
+#include "app_config.hpp"
 #include "comm/curl/multi_request.hpp"
 #include "comm/i_http_comm.hpp"
 #include "events/event_system.hpp"
@@ -42,7 +43,7 @@ private:
 
   struct read_write_info final {
     data_buffer data{};
-    stop_type &stop_requested;
+    stop_type_callback stop_requested_cb;
   };
 
   static const write_callback write_data;
@@ -61,13 +62,14 @@ public:
   [[nodiscard]] static auto reset_curl(CURL *curl_handle) -> CURL *;
 
 public:
-  [[nodiscard]] static auto
-  construct_url(CURL *curl, const std::string &relative_path,
-                const host_config &cfg) -> std::string;
+  [[nodiscard]] static auto construct_url(CURL *curl,
+                                          const std::string &relative_path,
+                                          const host_config &cfg)
+      -> std::string;
 
-  [[nodiscard]] static auto
-  create_host_config(const s3_config &cfg,
-                     bool use_s3_path_style) -> host_config;
+  [[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,
                                        bool allow_slash) -> std::string;
@@ -75,8 +77,8 @@ public:
   template <typename request_type>
   [[nodiscard]] static auto
   make_encrypted_request(const host_config &cfg, const request_type &request,
-                         long &response_code,
-                         stop_type &stop_requested) -> bool {
+                         long &response_code, stop_type &stop_requested)
+      -> bool {
     response_code = 0;
 
     if (not request.decryption_token.has_value() ||
@@ -114,7 +116,7 @@ public:
                 return false;
               }
 
-              if (response_code != 200) {
+              if (response_code != http_error_codes::ok) {
                 return false;
               }
 
@@ -169,7 +171,12 @@ public:
       curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, write_headers);
     }
 
-    read_write_info write_info{{}, stop_requested};
+    read_write_info write_info{
+        {},
+        [&stop_requested]() -> bool {
+          return stop_requested || app_config::get_stop_requested();
+        },
+    };
     if (request.response_handler.has_value()) {
       curl_easy_setopt(curl, CURLOPT_WRITEDATA, &write_info);
       curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
@@ -193,6 +200,16 @@ public:
                        request.aws_service.value().c_str());
     }
 
+    curl_slist *header_list{nullptr};
+    if (not request.headers.empty()) {
+      for (const auto &header : request.headers) {
+        header_list = curl_slist_append(
+            header_list,
+            fmt::format("{}: {}", header.first, header.second).c_str());
+      }
+      curl_easy_setopt(curl, CURLOPT_HTTPHEADER, header_list);
+    }
+
     auto url = construct_url(curl, request.get_path(), cfg) + parameters;
     curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
 
@@ -200,6 +217,11 @@ public:
 
     CURLcode curl_code{};
     curl_request.get_result(curl_code, response_code);
+
+    if (header_list != nullptr) {
+      curl_slist_free_all(header_list);
+    }
+
     if (curl_code != CURLE_OK) {
       event_system::instance().raise<curl_error>(url, curl_code);
       return false;
@@ -215,26 +237,30 @@ 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 -> bool override;
+  [[nodiscard]] auto make_request(const curl::requests::http_delete &del,
+                                  long &response_code,
+                                  stop_type &stop_requested) const
+      -> bool override;
 
-  [[nodiscard]] auto
-  make_request(const curl::requests::http_get &get, long &response_code,
-               stop_type &stop_requested) const -> bool override;
+  [[nodiscard]] auto make_request(const curl::requests::http_get &get,
+                                  long &response_code,
+                                  stop_type &stop_requested) const
+      -> bool override;
 
-  [[nodiscard]] auto
-  make_request(const curl::requests::http_head &head, long &response_code,
-               stop_type &stop_requested) const -> bool override;
+  [[nodiscard]] auto make_request(const curl::requests::http_head &head,
+                                  long &response_code,
+                                  stop_type &stop_requested) const
+      -> bool override;
 
-  [[nodiscard]] auto
-  make_request(const curl::requests::http_post &post_file, long &response_code,
-               stop_type &stop_requested) const -> bool override;
+  [[nodiscard]] auto make_request(const curl::requests::http_post &post_file,
+                                  long &response_code,
+                                  stop_type &stop_requested) const
+      -> bool override;
 
-  [[nodiscard]] auto
-  make_request(const curl::requests::http_put_file &put_file,
-               long &response_code,
-               stop_type &stop_requested) const -> bool override;
+  [[nodiscard]] auto make_request(const curl::requests::http_put_file &put_file,
+                                  long &response_code,
+                                  stop_type &stop_requested) const
+      -> bool override;
 };
 } // namespace repertory
 

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -36,6 +36,9 @@ private:
   stop_type &stop_requested_;
   CURLM *multi_handle_;
 
+private:
+  [[nodiscard]] auto get_stop_requested() const -> bool;
+
 public:
   void get_result(CURLcode &curl_code, long &http_code);
 };

repertory/librepertory/include/comm/curl/requests/http_delete.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/comm/curl/requests/http_get.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/comm/curl/requests/http_head.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/comm/curl/requests/http_post.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -32,15 +32,15 @@ struct http_post final : http_request_base {
   auto operator=(const http_post &) -> http_post & = default;
   auto operator=(http_post &&) -> http_post & = default;
 
-  ~http_post() override;
+  ~http_post() override = default;
 
   std::optional<nlohmann::json> json;
 
-  [[nodiscard]] auto
-  set_method(CURL *curl, stop_type & /*stop_requested*/) const -> bool override;
+  [[nodiscard]] auto set_method(CURL *curl,
+                                stop_type & /*stop_requested*/) const
+      -> bool override;
 
 private:
-  mutable curl_slist *headers{nullptr};
   mutable std::optional<std::string> json_str;
 };
 } // namespace repertory::curl::requests

repertory/librepertory/include/comm/curl/requests/http_put_file.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/comm/curl/requests/http_request_base.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -51,7 +51,7 @@ struct http_request_base {
   bool allow_timeout{};
   std::optional<std::string> aws_service;
   std::optional<std::string> decryption_token{};
-  http_headers headers{};
+  mutable http_headers headers{};
   std::string path{};
   http_query_parameters query{};
   std::optional<http_range> range{};

repertory/librepertory/include/comm/i_http_comm.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -69,21 +69,21 @@ private:
 
   void put_client(std::shared_ptr<client> &cli);
 
-  [[nodiscard]] auto read_packet(client &cli, packet &response)
-      -> packet::error_type;
+  [[nodiscard]] auto read_packet(client &cli,
+                                 packet &response) const -> packet::error_type;
 
   void resolve();
 
 public:
-  [[nodiscard]] auto send(std::string_view method, std::uint32_t &service_flags)
-      -> packet::error_type;
+  [[nodiscard]] auto send(std::string_view method,
+                          std::uint32_t &service_flags) -> packet::error_type;
 
   [[nodiscard]] auto send(std::string_view method, packet &request,
                           std::uint32_t &service_flags) -> packet::error_type;
 
   [[nodiscard]] auto send(std::string_view method, packet &request,
-                          packet &response, std::uint32_t &service_flags)
-      -> packet::error_type;
+                          packet &response,
+                          std::uint32_t &service_flags) -> packet::error_type;
 };
 } // namespace repertory
 

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/common.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -221,25 +221,44 @@ 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_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}
-#define STATUS_INTERNAL_ERROR std::uint32_t{0xC00000E5L}
-#define STATUS_INVALID_ADDRESS std::uint32_t{0xC0000141L}
-#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_NO_MEMORY std::uint32_t{0xC0000017L}
-#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_UNEXPECTED_IO_ERROR std::uint32_t{0xC00000E9L}
+#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_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 }
+#define STATUS_INTERNAL_ERROR                                                  \
+  std::uint32_t { 0xC00000E5L }
+#define STATUS_INVALID_ADDRESS                                                 \
+  std::uint32_t { 0xC0000141L }
+#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_NO_MEMORY                                                       \
+  std::uint32_t { 0xC0000017L }
+#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_UNEXPECTED_IO_ERROR                                             \
+  std::uint32_t { 0xC00000E9L }
 
 #define CONVERT_STATUS_NOT_IMPLEMENTED(e)                                      \
   ((std::uint32_t(e) == STATUS_NOT_IMPLEMENTED) ? -ENOTSUP : e)

repertory/librepertory/include/db/file_db.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/db/file_mgr_db.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/db/i_file_db.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -31,7 +31,7 @@ class i_file_db {
 public:
   struct file_info final {
     std::string api_path;
-    bool directory;
+    bool directory{};
     std::string source_path;
   };
 
@@ -56,6 +56,10 @@ public:
 
   [[nodiscard]] virtual auto count() const -> std::uint64_t = 0;
 
+  virtual void enumerate_item_list(
+      std::function<void(const std::vector<i_file_db::file_info> &)> callback,
+      stop_type_callback stop_requested_cb) const = 0;
+
   [[nodiscard]] virtual auto get_api_path(const std::string &source_path,
                                           std::string &api_path) const
       -> api_error = 0;
@@ -80,7 +84,8 @@ public:
   get_file_source_path(const std::string &api_path,
                        std::string &source_path) const -> api_error = 0;
 
-  [[nodiscard]] virtual auto get_item_list() const
+  [[nodiscard]] virtual auto
+  get_item_list(stop_type_callback stop_requested_cb) const
       -> std::vector<file_info> = 0;
 
   [[nodiscard]] virtual auto get_source_path(const std::string &api_path,

repertory/librepertory/include/db/i_file_mgr_db.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -41,10 +41,7 @@ public:
     std::string source_path;
   };
 
-  struct upload_entry final {
-    std::string api_path;
-    std::string source_path;
-  };
+  using upload_entry = upload_active_entry;
 
 public:
   [[nodiscard]] virtual auto add_resume(const resume_entry &entry) -> bool = 0;

repertory/librepertory/include/db/i_meta_db.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -31,6 +31,10 @@ class i_meta_db {
 public:
   virtual void clear() = 0;
 
+  virtual void enumerate_api_path_list(
+      std::function<void(const std::vector<std::string> &)> callback,
+      stop_type_callback stop_requested_cb) const = 0;
+
   [[nodiscard]] virtual auto get_api_path(const std::string &source_path,
                                           std::string &api_path) const
       -> api_error = 0;

repertory/librepertory/include/db/impl/rdb_file_db.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -67,50 +67,54 @@ private:
                                  rocksdb::Transaction *txn) -> rocksdb::Status;
 
 public:
-  [[nodiscard]] auto
-  add_directory(const std::string &api_path,
-                const std::string &source_path) -> api_error override;
+  [[nodiscard]] auto add_directory(const std::string &api_path,
+                                   const std::string &source_path)
+      -> api_error override;
 
-  [[nodiscard]] auto
-  add_or_update_file(const i_file_db::file_data &data) -> api_error override;
+  [[nodiscard]] auto add_or_update_file(const i_file_db::file_data &data)
+      -> api_error override;
 
   void clear() override;
 
   [[nodiscard]] auto count() const -> std::uint64_t override;
 
-  [[nodiscard]] auto
-  get_api_path(const std::string &source_path,
-               std::string &api_path) const -> api_error override;
+  void enumerate_item_list(
+      std::function<void(const std::vector<i_file_db::file_info> &)> callback,
+      stop_type_callback stop_requested_cb) const override;
 
-  [[nodiscard]] auto
-  get_directory_api_path(const std::string &source_path,
-                         std::string &api_path) const -> api_error override;
+  [[nodiscard]] auto get_api_path(const std::string &source_path,
+                                  std::string &api_path) const
+      -> api_error override;
+
+  [[nodiscard]] auto get_directory_api_path(const std::string &source_path,
+                                            std::string &api_path) const
+      -> api_error override;
 
   [[nodiscard]] auto get_directory_source_path(const std::string &api_path,
                                                std::string &source_path) const
       -> api_error override;
 
-  [[nodiscard]] auto
-  get_file_api_path(const std::string &source_path,
-                    std::string &api_path) const -> api_error override;
+  [[nodiscard]] auto get_file_api_path(const std::string &source_path,
+                                       std::string &api_path) const
+      -> api_error override;
 
-  [[nodiscard]] auto
-  get_file_data(const std::string &api_path,
-                i_file_db::file_data &data) const -> api_error override;
+  [[nodiscard]] auto get_file_data(const std::string &api_path,
+                                   i_file_db::file_data &data) const
+      -> api_error override;
 
-  [[nodiscard]] auto
-  get_file_source_path(const std::string &api_path,
-                       std::string &source_path) const -> api_error override;
+  [[nodiscard]] auto get_file_source_path(const std::string &api_path,
+                                          std::string &source_path) const
+      -> api_error override;
 
-  [[nodiscard]] auto
-  get_item_list() const -> std::vector<i_file_db::file_info> override;
+  [[nodiscard]] auto get_item_list(stop_type_callback stop_requested_cb) const
+      -> std::vector<i_file_db::file_info> override;
 
-  [[nodiscard]] auto
-  get_source_path(const std::string &api_path,
-                  std::string &source_path) const -> api_error override;
+  [[nodiscard]] auto get_source_path(const std::string &api_path,
+                                     std::string &source_path) const
+      -> api_error override;
 
-  [[nodiscard]] auto
-  remove_item(const std::string &api_path) -> api_error override;
+  [[nodiscard]] auto remove_item(const std::string &api_path)
+      -> api_error override;
 };
 } // namespace repertory
 

repertory/librepertory/include/db/impl/rdb_file_mgr_db.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/db/impl/rdb_meta_db.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -80,6 +80,10 @@ private:
 public:
   void clear() override;
 
+  void enumerate_api_path_list(
+      std::function<void(const std::vector<std::string> &)> callback,
+      stop_type_callback stop_requested_cb) const override;
+
   [[nodiscard]] auto get_api_path(const std::string &source_path,
                                   std::string &api_path) const
       -> api_error override;

repertory/librepertory/include/db/impl/sqlite_file_db.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -53,6 +53,10 @@ public:
 
   [[nodiscard]] auto count() const -> std::uint64_t override;
 
+  void enumerate_item_list(
+      std::function<void(const std::vector<i_file_db::file_info> &)> callback,
+      stop_type_callback stop_requested_cb) const override;
+
   [[nodiscard]] auto get_api_path(const std::string &source_path,
                                   std::string &api_path) const
       -> api_error override;
@@ -77,7 +81,7 @@ public:
                                           std::string &source_path) const
       -> api_error override;
 
-  [[nodiscard]] auto get_item_list() const
+  [[nodiscard]] auto get_item_list(stop_type_callback stop_requested_cb) const
       -> std::vector<i_file_db::file_info> override;
 
   [[nodiscard]] auto get_source_path(const std::string &api_path,

repertory/librepertory/include/db/impl/sqlite_file_mgr_db.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/db/impl/sqlite_meta_db.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -50,6 +50,10 @@ private:
 public:
   void clear() override;
 
+  void enumerate_api_path_list(
+      std::function<void(const std::vector<std::string> &)> callback,
+      stop_type_callback stop_requested_cb) const override;
+
   [[nodiscard]] auto get_api_path(const std::string &source_path,
                                   std::string &api_path) const
       -> api_error override;

repertory/librepertory/include/db/meta_db.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/drives/directory_cache.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -22,12 +22,10 @@
 #ifndef REPERTORY_INCLUDE_DRIVES_DIRECTORY_CACHE_HPP_
 #define REPERTORY_INCLUDE_DRIVES_DIRECTORY_CACHE_HPP_
 
-#include "utils/single_thread_service_base.hpp"
-
 namespace repertory {
 class directory_iterator;
 
-class directory_cache final : public single_thread_service_base {
+class directory_cache final {
 public:
   using execute_callback = std::function<void(directory_iterator &)>;
 
@@ -35,13 +33,11 @@ private:
   struct open_directory final {
     std::shared_ptr<directory_iterator> iterator;
     std::vector<std::uint64_t> handles;
-    std::chrono::system_clock::time_point last_update{
-        std::chrono::system_clock::now()};
   };
 
 public:
-  directory_cache() : single_thread_service_base("directory_cache") {}
-  ~directory_cache() override = default;
+  directory_cache() = default;
+  ~directory_cache() = default;
 
   directory_cache(const directory_cache &) = delete;
   directory_cache(directory_cache &&) = delete;
@@ -51,10 +47,6 @@ public:
 private:
   std::unordered_map<std::string, open_directory> directory_lookup_;
   std::recursive_mutex directory_mutex_;
-  std::unique_ptr<std::thread> refresh_thread_;
-
-protected:
-  void service_function() override;
 
 public:
   void execute_action(const std::string &api_path,
@@ -63,7 +55,7 @@ public:
   [[nodiscard]] auto get_directory(std::uint64_t handle)
       -> std::shared_ptr<directory_iterator>;
 
-  [[nodiscard]] auto remove_directory(const std::string &api_path)
+  auto remove_directory(const std::string &api_path)
       -> std::shared_ptr<directory_iterator>;
 
   void remove_directory(std::uint64_t handle);

repertory/librepertory/include/drives/directory_iterator.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/drives/eviction.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -26,13 +26,13 @@
 
 namespace repertory {
 // clang-format off
-E_SIMPLE3(fuse_event, debug, true,
+E_SIMPLE3(fuse_event, debug,
   std::string, function, func, E_FROM_STRING,
   std::string, api_path, ap, E_FROM_STRING,
   int, result, res, E_FROM_INT32
 );
 
-E_SIMPLE1(fuse_args_parsed, info, true,
+E_SIMPLE1(fuse_args_parsed, info,
   std::string, arguments, args, E_FROM_STRING
 );
 // clang-format on

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -63,99 +63,103 @@ private:
   std::shared_ptr<logging_consumer> logging_consumer_;
   std::shared_ptr<remote_fuse::remote_server> remote_server_;
   std::shared_ptr<full_server> server_;
-  bool was_mounted_ = false;
+  std::mutex stop_all_mtx_;
+  bool was_mounted_{false};
 
 private:
   void update_accessed_time(const std::string &api_path);
 
 protected:
 #if defined(__APPLE__)
-  [[nodiscard]] auto chflags_impl(std::string api_path,
-                                  uint32_t flags) -> api_error override;
+  [[nodiscard]] auto chflags_impl(std::string api_path, uint32_t flags)
+      -> api_error override;
 #endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] auto
-  chmod_impl(std::string api_path, mode_t mode,
-             struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto chmod_impl(std::string api_path, mode_t mode,
+                                struct fuse_file_info *file_info)
+      -> api_error override;
 #else
-  [[nodiscard]] auto chmod_impl(std::string api_path,
-                                mode_t mode) -> api_error override;
+  [[nodiscard]] auto chmod_impl(std::string api_path, mode_t mode)
+      -> api_error override;
 #endif
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] auto
-  chown_impl(std::string api_path, uid_t uid, gid_t gid,
-             struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto chown_impl(std::string api_path, uid_t uid, gid_t gid,
+                                struct fuse_file_info *file_info)
+      -> api_error override;
 #else
-  [[nodiscard]] auto chown_impl(std::string api_path, uid_t uid,
-                                gid_t gid) -> api_error override;
+  [[nodiscard]] auto chown_impl(std::string api_path, uid_t uid, gid_t gid)
+      -> api_error override;
 #endif
 
-  [[nodiscard]] auto
-  create_impl(std::string api_path, mode_t mode,
-              struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto create_impl(std::string api_path, mode_t mode,
+                                 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, off_t offset, off_t length,
-                 struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto fallocate_impl(std::string api_path, int mode,
+                                    off_t offset, off_t length,
+                                    struct fuse_file_info *file_info)
+      -> api_error override;
 
-  [[nodiscard]] auto
-  fgetattr_impl(std::string api_path, struct stat *unix_st,
-                struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto fgetattr_impl(std::string api_path, struct stat *unix_st,
+                                   struct fuse_file_info *file_info)
+      -> api_error override;
 
 #if defined(__APPLE__)
-  [[nodiscard]] auto
-  fsetattr_x_impl(std::string api_path, struct setattr_x *attr,
-                  struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto fsetattr_x_impl(std::string api_path,
+                                     struct setattr_x *attr,
+                                     struct fuse_file_info *file_info)
+      -> api_error override;
 #endif // __APPLE__
 
-  [[nodiscard]] auto
-  fsync_impl(std::string api_path, int datasync,
-             struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto fsync_impl(std::string api_path, int datasync,
+                                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,
-                 struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto ftruncate_impl(std::string api_path, off_t size,
+                                    struct fuse_file_info *file_info)
+      -> api_error override;
 #endif
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] auto
-  getattr_impl(std::string api_path, struct stat *unix_st,
-               struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto getattr_impl(std::string api_path, struct stat *unix_st,
+                                  struct fuse_file_info *file_info)
+      -> api_error override;
 #else
-  [[nodiscard]] auto getattr_impl(std::string api_path,
-                                  struct stat *unix_st) -> api_error override;
+  [[nodiscard]] auto getattr_impl(std::string api_path, struct stat *unix_st)
+      -> api_error override;
 #endif
 
 #if defined(__APPLE__)
-  [[nodiscard]] auto
-  getxtimes_impl(std::string api_path, struct timespec *bkuptime,
-                 struct timespec *crtime) -> api_error override;
+  [[nodiscard]] auto getxtimes_impl(std::string api_path,
+                                    struct timespec *bkuptime,
+                                    struct timespec *crtime)
+      -> api_error override;
 #endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
-  auto init_impl(struct fuse_conn_info *conn,
-                 struct fuse_config *cfg) -> void * override;
+  auto init_impl(struct fuse_conn_info *conn, struct fuse_config *cfg)
+      -> void * override;
 #else
   auto init_impl(struct fuse_conn_info *conn) -> void * override;
 #endif
 
-  [[nodiscard]] auto mkdir_impl(std::string api_path,
-                                mode_t mode) -> api_error override;
+  [[nodiscard]] auto mkdir_impl(std::string api_path, mode_t mode)
+      -> api_error override;
 
   void notify_fuse_main_exit(int &ret) override;
 
-  [[nodiscard]] auto
-  open_impl(std::string api_path,
-            struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto open_impl(std::string api_path,
+                               struct fuse_file_info *file_info)
+      -> api_error override;
 
-  [[nodiscard]] auto
-  opendir_impl(std::string api_path,
-               struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto opendir_impl(std::string api_path,
+                                  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,
@@ -163,29 +167,30 @@ protected:
                                std::size_t &bytes_read) -> api_error override;
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] auto
-  readdir_impl(std::string api_path, void *buf, fuse_fill_dir_t fuse_fill_dir,
-               off_t offset, struct fuse_file_info *file_info,
-               fuse_readdir_flags flags) -> api_error override;
+  [[nodiscard]] auto readdir_impl(std::string api_path, void *buf,
+                                  fuse_fill_dir_t fuse_fill_dir, off_t offset,
+                                  struct fuse_file_info *file_info,
+                                  fuse_readdir_flags flags)
+      -> api_error override;
 #else
-  [[nodiscard]] auto
-  readdir_impl(std::string api_path, void *buf, fuse_fill_dir_t fuse_fill_dir,
-               off_t offset,
-               struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto readdir_impl(std::string api_path, void *buf,
+                                  fuse_fill_dir_t fuse_fill_dir, off_t offset,
+                                  struct fuse_file_info *file_info)
+      -> api_error override;
 #endif
 
-  [[nodiscard]] auto
-  release_impl(std::string api_path,
-               struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto release_impl(std::string api_path,
+                                  struct fuse_file_info *file_info)
+      -> api_error override;
 
-  [[nodiscard]] auto
-  releasedir_impl(std::string api_path,
-                  struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto releasedir_impl(std::string api_path,
+                                     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) -> api_error override;
+                                 std::string to_api_path, unsigned int flags)
+      -> api_error override;
 #else
   [[nodiscard]] auto rename_impl(std::string from_api_path,
                                  std::string to_api_path) -> api_error override;
@@ -196,8 +201,8 @@ protected:
 #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) -> api_error;
+                                     int &attribute_size, uint32_t *position)
+      -> api_error;
 
 #if defined(__APPLE__)
   [[nodiscard]] auto getxattr_impl(std::string api_path, const char *name,
@@ -213,8 +218,8 @@ protected:
                                     size_t size, int &required_size,
                                     bool &return_size) -> api_error override;
 
-  [[nodiscard]] auto removexattr_impl(std::string api_path,
-                                      const char *name) -> api_error override;
+  [[nodiscard]] auto removexattr_impl(std::string api_path, const char *name)
+      -> api_error override;
 
 #if defined(__APPLE__)
   [[nodiscard]] auto setxattr_impl(std::string api_path, const char *name,
@@ -222,62 +227,64 @@ protected:
                                    uint32_t position) -> api_error override;
 #else  // __APPLE__
   [[nodiscard]] auto setxattr_impl(std::string api_path, const char *name,
-                                   const char *value, size_t size,
-                                   int flags) -> api_error override;
+                                   const char *value, size_t size, int flags)
+      -> api_error override;
 #endif // __APPLE__
 #endif // HAS_SETXATTR
 
 #if defined(__APPLE__)
-  [[nodiscard]] auto
-  setattr_x_impl(std::string api_path,
-                 struct setattr_x *attr) -> api_error override;
+  [[nodiscard]] auto setattr_x_impl(std::string api_path,
+                                    struct setattr_x *attr)
+      -> api_error override;
 
-  [[nodiscard]] auto
-  setbkuptime_impl(std::string api_path,
-                   const struct timespec *bkuptime) -> api_error override;
+  [[nodiscard]] auto setbkuptime_impl(std::string api_path,
+                                      const struct timespec *bkuptime)
+      -> api_error override;
 
-  [[nodiscard]] auto
-  setchgtime_impl(std::string api_path,
-                  const struct timespec *chgtime) -> api_error override;
+  [[nodiscard]] auto setchgtime_impl(std::string api_path,
+                                     const struct timespec *chgtime)
+      -> api_error override;
 
-  [[nodiscard]] auto
-  setcrtime_impl(std::string api_path,
-                 const struct timespec *crtime) -> api_error override;
+  [[nodiscard]] auto setcrtime_impl(std::string api_path,
+                                    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) -> api_error override;
+  [[nodiscard]] auto statfs_x_impl(std::string api_path, struct statfs *stbuf)
+      -> api_error override;
 #else  // __APPLE__
-  [[nodiscard]] auto statfs_impl(std::string api_path,
-                                 struct statvfs *stbuf) -> api_error override;
+  [[nodiscard]] auto statfs_impl(std::string api_path, struct statvfs *stbuf)
+      -> api_error override;
 #endif // __APPLE__
 
 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] auto
-  truncate_impl(std::string api_path, off_t size,
-                struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto truncate_impl(std::string api_path, off_t size,
+                                   struct fuse_file_info *file_info)
+      -> api_error override;
 #else
-  [[nodiscard]] auto truncate_impl(std::string api_path,
-                                   off_t size) -> api_error override;
+  [[nodiscard]] auto truncate_impl(std::string api_path, off_t size)
+      -> api_error override;
 #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, const struct timespec tv[2],
-               struct fuse_file_info *file_info) -> api_error override;
+  [[nodiscard]] auto utimens_impl(std::string api_path,
+                                  const struct timespec tv[2],
+                                  struct fuse_file_info *file_info)
+      -> api_error override;
 #else
-  [[nodiscard]] auto
-  utimens_impl(std::string api_path,
-               const struct timespec tv[2]) -> api_error override;
+  [[nodiscard]] auto utimens_impl(std::string api_path,
+                                  const struct timespec tv[2])
+      -> api_error override;
 #endif
 
-  [[nodiscard]] auto
-  write_impl(std::string api_path, const char *buffer, size_t write_size,
-             off_t write_offset, struct fuse_file_info *file_info,
-             std::size_t &bytes_written) -> api_error override;
+  [[nodiscard]] auto write_impl(std::string api_path, const char *buffer,
+                                size_t write_size, off_t write_offset,
+                                struct fuse_file_info *file_info,
+                                std::size_t &bytes_written)
+      -> api_error override;
 
 public:
   [[nodiscard]] auto get_directory_item_count(const std::string &api_path) const
@@ -286,16 +293,17 @@ 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 -> std::uint64_t override;
+  [[nodiscard]] auto get_file_size(const std::string &api_path) const
+      -> std::uint64_t override;
 
-  [[nodiscard]] auto
-  get_item_meta(const std::string &api_path,
-                api_meta_map &meta) const -> api_error override;
+  [[nodiscard]] auto get_item_meta(const std::string &api_path,
+                                   api_meta_map &meta) const
+      -> api_error override;
 
-  [[nodiscard]] auto
-  get_item_meta(const std::string &api_path, const std::string &name,
-                std::string &value) const -> api_error override;
+  [[nodiscard]] auto get_item_meta(const std::string &api_path,
+                                   const std::string &name,
+                                   std::string &value) const
+      -> api_error override;
 
   [[nodiscard]] auto get_total_drive_space() const -> std::uint64_t override;
 
@@ -306,16 +314,16 @@ 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 -> bool override;
+  [[nodiscard]] auto is_processing(const std::string &api_path) const
+      -> bool override;
 
-  [[nodiscard]] auto
-  rename_directory(const std::string &from_api_path,
-                   const std::string &to_api_path) -> int override;
+  [[nodiscard]] auto rename_directory(const std::string &from_api_path,
+                                      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) -> int override;
+                                 const std::string &to_api_path, bool overwrite)
+      -> int override;
 
   void set_item_meta(const std::string &api_path, const std::string &key,
                      const std::string &value) override;

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -53,8 +53,8 @@ private:
   bool was_mounted_ = false;
 
 private:
-  void populate_stat(const remote::stat &r_stat, bool directory,
-                     struct stat &unix_st);
+  static void populate_stat(const remote::stat &r_stat, bool directory,
+                            struct stat &unix_st);
 
 protected:
   [[nodiscard]] auto access_impl(std::string api_path,

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/drives/remote/i_remote_json.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/drives/remote/remote_open_file_table.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/drives/remote/remote_server_base.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/drives/winfsp/i_winfsp_drive.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/drives/winfsp/winfsp_drive.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -73,6 +73,7 @@ private:
   std::unique_ptr<file_manager> fm_;
   std::unique_ptr<eviction> eviction_;
   std::unique_ptr<remote_winfsp::remote_server> remote_server_;
+  std::mutex stop_all_mtx_;
 
 private:
   [[nodiscard]] auto handle_error(std::string_view function_name,
@@ -94,6 +95,8 @@ private:
   static void set_file_info(remote::file_info &dest,
                             const FSP_FSCTL_FILE_INFO &src);
 
+  void stop_all();
+
 public:
   auto CanDelete(PVOID file_node, PVOID file_desc, PWSTR file_name)
       -> NTSTATUS override;

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/events/event.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -22,29 +22,15 @@
 #ifndef REPERTORY_INCLUDE_EVENTS_EVENT_HPP_
 #define REPERTORY_INCLUDE_EVENTS_EVENT_HPP_
 
+#include "types/repertory.hpp"
+
 namespace repertory {
-enum class event_level {
-  critical,
-  error,
-  warn,
-  info,
-  debug,
-  trace,
-};
-
-[[nodiscard]] auto
-event_level_from_string(std::string level,
-                        event_level default_level = event_level::info)
-    -> event_level;
-
-[[nodiscard]] auto event_level_to_string(event_level level) -> std::string;
-
 class event {
 protected:
-  explicit event(bool allow_async) : allow_async_(allow_async) {}
+  event() = default;
 
-  event(const std::stringstream &ss, json j, bool allow_async)
-      : allow_async_(allow_async), ss_(ss.str()), j_(std::move(j)) {}
+  event(const std::stringstream &ss, json j)
+      : ss_(ss.str()), j_(std::move(j)) {}
 
 public:
   event(const event &) = delete;
@@ -53,18 +39,13 @@ public:
   auto operator=(event &&) -> event & = delete;
   virtual ~event() = default;
 
-private:
-  bool allow_async_;
-
 protected:
   std::stringstream ss_;
-  json j_;
+  json j_{};
 
 public:
   [[nodiscard]] virtual auto clone() const -> std::shared_ptr<event> = 0;
 
-  [[nodiscard]] auto get_allow_async() const -> bool { return allow_async_; }
-
   [[nodiscard]] virtual auto get_event_level() const -> event_level = 0;
 
   [[nodiscard]] auto get_json() const -> json { return j_; }
@@ -75,18 +56,4 @@ public:
 };
 } // namespace repertory
 
-NLOHMANN_JSON_NAMESPACE_BEGIN
-template <> struct adl_serializer<std::atomic<repertory::event_level>> {
-  static void to_json(json &data,
-                      const std::atomic<repertory::event_level> &value) {
-    data = repertory::event_level_to_string(value.load());
-  }
-
-  static void from_json(const json &data,
-                        std::atomic<repertory::event_level> &value) {
-    value.store(repertory::event_level_from_string(data.get<std::string>()));
-  }
-};
-NLOHMANN_JSON_NAMESPACE_END
-
 #endif // REPERTORY_INCLUDE_EVENTS_EVENT_HPP_

repertory/librepertory/include/events/event_system.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -24,6 +24,7 @@
 
 #include "events/event.hpp"
 #include "events/t_event_system.hpp"
+#include "types/repertory.hpp"
 
 namespace repertory {
 using event_system = t_event_system<event>;
@@ -60,8 +61,7 @@ public:                                                                        \
 #define E_BEGIN(name, el)                                                      \
   class name final : public virtual event {                                    \
   private:                                                                     \
-    name(const std::stringstream &ss, const json &j, bool allow_async)         \
-        : event(ss, j, allow_async) {}                                         \
+    name(const std::stringstream &ss, const json &j) : event(ss, j) {}         \
                                                                                \
   public:                                                                      \
     ~name() override = default;                                                \
@@ -84,28 +84,26 @@ public:                                                                        \
     }                                                                          \
                                                                                \
     [[nodiscard]] auto clone() const -> std::shared_ptr<event> override {      \
-      return std::shared_ptr<name>(new name(ss_, j_, get_allow_async()));      \
+      return std::shared_ptr<name>(new name(ss_, j_));                         \
     }
 #define E_END() }
 
-#define E_SIMPLE(event_name, el, allow_async)                                  \
+#define E_SIMPLE(event_name, el)                                               \
   E_BEGIN(event_name, el)                                                      \
 public:                                                                        \
-  event_name() : event(allow_async) {}                                         \
+  event_name() {}                                                              \
   E_END()
 
-#define E_SIMPLE1(event_name, el, allow_async, type, name, short_name, tc)     \
+#define E_SIMPLE1(event_name, el, type, name, short_name, tc)                  \
   E_BEGIN(event_name, el)                                                      \
-  explicit event_name(const type &tv) : event(allow_async) {                   \
-    init_##short_name(tv);                                                     \
-  }                                                                            \
+  explicit event_name(const type &tv) { init_##short_name(tv); }               \
   E_PROP(type, name, short_name, tc)                                           \
   E_END()
 
-#define E_SIMPLE2(event_name, el, allow_async, type, name, short_name, tc,     \
-                  type2, name2, short_name2, tc2)                              \
+#define E_SIMPLE2(event_name, el, type, name, short_name, tc, type2, name2,    \
+                  short_name2, tc2)                                            \
   E_BEGIN(event_name, el)                                                      \
-  explicit event_name(const type &tv, const type2 &tv2) : event(allow_async) { \
+  explicit event_name(const type &tv, const type2 &tv2) {                      \
     init_##short_name(tv);                                                     \
     init_##short_name2(tv2);                                                   \
   }                                                                            \
@@ -113,12 +111,10 @@ public:                                                                        \
   E_PROP(type2, name2, short_name2, tc2)                                       \
   E_END()
 
-#define E_SIMPLE3(event_name, el, allow_async, type, name, short_name, tc,     \
-                  type2, name2, short_name2, tc2, type3, name3, short_name3,   \
-                  tc3)                                                         \
+#define E_SIMPLE3(event_name, el, type, name, short_name, tc, type2, name2,    \
+                  short_name2, tc2, type3, name3, short_name3, tc3)            \
   E_BEGIN(event_name, el)                                                      \
-  explicit event_name(const type &tv, const type2 &tv2, const type3 &tv3)      \
-      : event(allow_async) {                                                   \
+  explicit event_name(const type &tv, const type2 &tv2, const type3 &tv3) {    \
     init_##short_name(tv);                                                     \
     init_##short_name2(tv2);                                                   \
     init_##short_name3(tv3);                                                   \
@@ -128,13 +124,12 @@ public:                                                                        \
   E_PROP(type3, name3, short_name3, tc3)                                       \
   E_END()
 
-#define E_SIMPLE4(event_name, el, allow_async, type, name, short_name, tc,     \
-                  type2, name2, short_name2, tc2, type3, name3, short_name3,   \
-                  tc3, type4, name4, short_name4, tc4)                         \
+#define E_SIMPLE4(event_name, el, type, name, short_name, tc, type2, name2,    \
+                  short_name2, tc2, type3, name3, short_name3, tc3, type4,     \
+                  name4, short_name4, tc4)                                     \
   E_BEGIN(event_name, el)                                                      \
   explicit event_name(const type &tv, const type2 &tv2, const type3 &tv3,      \
-                      const type4 &tv4)                                        \
-      : event(allow_async) {                                                   \
+                      const type4 &tv4) {                                      \
     init_##short_name(tv);                                                     \
     init_##short_name2(tv2);                                                   \
     init_##short_name3(tv3);                                                   \
@@ -146,14 +141,12 @@ public:                                                                        \
   E_PROP(type4, name4, short_name4, tc4)                                       \
   E_END()
 
-#define E_SIMPLE5(event_name, el, allow_async, type, name, short_name, tc,     \
-                  type2, name2, short_name2, tc2, type3, name3, short_name3,   \
-                  tc3, type4, name4, short_name4, tc4, type5, name5,           \
-                  short_name5, tc5)                                            \
+#define E_SIMPLE5(event_name, el, type, name, short_name, tc, type2, name2,    \
+                  short_name2, tc2, type3, name3, short_name3, tc3, type4,     \
+                  name4, short_name4, tc4, type5, name5, short_name5, tc5)     \
   E_BEGIN(event_name, el)                                                      \
   explicit event_name(const type &tv, const type2 &tv2, const type3 &tv3,      \
-                      const type4 &tv4, const type5 &tv5)                      \
-      : event(allow_async) {                                                   \
+                      const type4 &tv4, const type5 &tv5) {                    \
     init_##short_name(tv);                                                     \
     init_##short_name2(tv2);                                                   \
     init_##short_name3(tv3);                                                   \
@@ -167,14 +160,13 @@ public:                                                                        \
   E_PROP(type5, name5, short_name5, tc5)                                       \
   E_END()
 
-#define E_SIMPLE6(event_name, el, allow_async, type, name, short_name, tc,     \
-                  type2, name2, short_name2, tc2, type3, name3, short_name3,   \
-                  tc3, type4, name4, short_name4, tc4, type5, name5,           \
-                  short_name5, tc5, type6, name6, short_name6, tc6)            \
+#define E_SIMPLE6(event_name, el, type, name, short_name, tc, type2, name2,    \
+                  short_name2, tc2, type3, name3, short_name3, tc3, type4,     \
+                  name4, short_name4, tc4, type5, name5, short_name5, tc5,     \
+                  type6, name6, short_name6, tc6)                              \
   E_BEGIN(event_name, el)                                                      \
   explicit event_name(const type &tv, const type2 &tv2, const type3 &tv3,      \
-                      const type4 &tv4, const type5 &tv5, const type6 &tv6)    \
-      : event(allow_async) {                                                   \
+                      const type4 &tv4, const type5 &tv5, const type6 &tv6) {  \
     init_##short_name(tv);                                                     \
     init_##short_name2(tv2);                                                   \
     init_##short_name3(tv3);                                                   \
@@ -190,16 +182,15 @@ public:                                                                        \
   E_PROP(type6, name6, short_name6, tc6)                                       \
   E_END()
 
-#define E_SIMPLE7(event_name, el, allow_async, type, name, short_name, tc,     \
-                  type2, name2, short_name2, tc2, type3, name3, short_name3,   \
-                  tc3, type4, name4, short_name4, tc4, type5, name5,           \
-                  short_name5, tc5, type6, name6, short_name6, tc6, type7,     \
-                  name7, short_name7, tc7)                                     \
+#define E_SIMPLE7(event_name, el, type, name, short_name, tc, type2, name2,    \
+                  short_name2, tc2, type3, name3, short_name3, tc3, type4,     \
+                  name4, short_name4, tc4, type5, name5, short_name5, tc5,     \
+                  type6, name6, short_name6, tc6, type7, name7, short_name7,   \
+                  tc7)                                                         \
   E_BEGIN(event_name, el)                                                      \
   explicit event_name(const type &tv, const type2 &tv2, const type3 &tv3,      \
                       const type4 &tv4, const type5 &tv5, const type6 &tv6,    \
-                      const type7 &tv7)                                        \
-      : event(allow_async) {                                                   \
+                      const type7 &tv7) {                                      \
     init_##short_name(tv);                                                     \
     init_##short_name2(tv2);                                                   \
     init_##short_name3(tv3);                                                   \

repertory/librepertory/include/events/events.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -28,126 +28,126 @@
 
 namespace repertory {
 // clang-format off
-E_SIMPLE2(curl_error, error, true,
+E_SIMPLE2(curl_error, error,
   std::string, url, url, E_FROM_STRING,
   CURLcode, res, res, E_FROM_CURL_CODE 
 );
 
-E_SIMPLE3(debug_log, debug, true,
+E_SIMPLE3(debug_log, debug,
   std::string, function, func, E_FROM_STRING,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, data, data, E_FROM_STRING
 );
 
-E_SIMPLE1(directory_removed, info, true,
+E_SIMPLE1(directory_removed, debug,
   std::string, api_path, ap, E_FROM_STRING
 );
 
-E_SIMPLE2(directory_removed_externally, warn, true,
+E_SIMPLE2(directory_removed_externally, warn,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING
 );
 
-E_SIMPLE2(directory_remove_failed, error, true,
+E_SIMPLE2(directory_remove_failed, error,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, error, err, E_FROM_STRING
 );
 
-E_SIMPLE2(drive_mount_failed, error, true,
+E_SIMPLE2(drive_mount_failed, error,
   std::string, location, loc, E_FROM_STRING,
   std::string, result, res, E_FROM_STRING
 );
 
-E_SIMPLE1(drive_mounted, info, true,
+E_SIMPLE1(drive_mounted, info,
   std::string, location, loc, E_FROM_STRING
 );
 
-E_SIMPLE1(drive_mount_result, info, true,
+E_SIMPLE1(drive_mount_result, info,
   std::string, result, res, E_FROM_STRING
 );
 
-E_SIMPLE1(drive_unmount_pending, info, true,
+E_SIMPLE1(drive_unmount_pending, info,
   std::string, location, loc, E_FROM_STRING
 );
 
-E_SIMPLE1(drive_unmounted, info, true,
+E_SIMPLE1(drive_unmounted, info,
   std::string, location, loc, E_FROM_STRING
 );
 
-E_SIMPLE1(event_level_changed, info, true,
+E_SIMPLE1(event_level_changed, info,
   std::string, new_event_level, level, E_FROM_STRING
 );
 
-E_SIMPLE1(failed_upload_queued, error, true,
+E_SIMPLE1(failed_upload_queued, error,
   std::string, api_path, ap, E_FROM_STRING
 );
 
-E_SIMPLE1(failed_upload_removed, warn, true,
+E_SIMPLE1(failed_upload_removed, warn,
   std::string, api_path, ap, E_FROM_STRING
 );
 
-E_SIMPLE1(failed_upload_retry, info, true,
+E_SIMPLE1(failed_upload_retry, info,
   std::string, api_path, ap, E_FROM_STRING
 );
 
-E_SIMPLE2(file_get_failed, error, true,
+E_SIMPLE2(file_get_failed, error,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, error, err, E_FROM_STRING
 );
 
-E_SIMPLE1(file_get_api_list_failed, error, true,
+E_SIMPLE1(file_get_api_list_failed, error,
   std::string, error, err, E_FROM_STRING
 );
 
-E_SIMPLE1(file_pinned, info, true,
+E_SIMPLE1(file_pinned, info,
   std::string, api_path, ap, E_FROM_STRING
 );
 
-E_SIMPLE3(file_read_bytes_failed, error, true,
+E_SIMPLE3(file_read_bytes_failed, error,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, error, err, E_FROM_STRING,
   std::size_t, retry, retry, E_FROM_SIZE_T
 );
 
-E_SIMPLE1(file_removed, debug, true,
+E_SIMPLE1(file_removed, debug,
   std::string, api_path, ap, E_FROM_STRING
 );
 
-E_SIMPLE2(file_removed_externally, warn, true,
+E_SIMPLE2(file_removed_externally, warn,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING
 );
 
-E_SIMPLE2(file_remove_failed, error, true,
+E_SIMPLE2(file_remove_failed, error,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, error, err, E_FROM_STRING
 );
 
-E_SIMPLE3(file_rename_failed, error, true,
+E_SIMPLE3(file_rename_failed, error,
   std::string, from_api_path, FROM, E_FROM_STRING,
   std::string, to_api_path, TO, E_FROM_STRING,
   std::string, error, err, E_FROM_STRING
 );
 
-E_SIMPLE2(file_get_size_failed, error, true,
+E_SIMPLE2(file_get_size_failed, error,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, error, err, E_FROM_STRING
 );
 
-E_SIMPLE3(filesystem_item_added, debug, true,
+E_SIMPLE3(filesystem_item_added, debug,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, parent, parent, E_FROM_STRING,
   bool, directory, dir, E_FROM_BOOL
 );
 
-E_SIMPLE4(filesystem_item_closed, trace, true,
+E_SIMPLE4(filesystem_item_closed, trace,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING,
   bool, directory, dir, E_FROM_BOOL,
   bool, changed, changed, E_FROM_BOOL
 );
 
-E_SIMPLE5(filesystem_item_handle_closed, trace, true,
+E_SIMPLE5(filesystem_item_handle_closed, trace,
   std::string, api_path, ap, E_FROM_STRING,
   std::uint64_t, handle, handle, E_FROM_UINT64,
   std::string, source, src, E_FROM_STRING,
@@ -155,136 +155,136 @@ E_SIMPLE5(filesystem_item_handle_closed, trace, true,
   bool, changed, changed, E_FROM_BOOL
 );
 
-E_SIMPLE4(filesystem_item_handle_opened, trace, true,
+E_SIMPLE4(filesystem_item_handle_opened, trace,
   std::string, api_path, ap, E_FROM_STRING,
   std::uint64_t, handle, handle, E_FROM_UINT64,
   std::string, source, src, E_FROM_STRING,
   bool, directory, dir, E_FROM_BOOL
 );
 
-E_SIMPLE2(filesystem_item_evicted, info, true,
+E_SIMPLE2(filesystem_item_evicted, info,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING
 );
 
-E_SIMPLE3(filesystem_item_opened, trace, true,
+E_SIMPLE3(filesystem_item_opened, trace,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING,
   bool, directory, dir, E_FROM_BOOL
 );
 
-E_SIMPLE1(file_unpinned, info, true,
+E_SIMPLE1(file_unpinned, info,
   std::string, api_path, ap, E_FROM_STRING
 );
 
-E_SIMPLE4(file_upload_completed, info, true,
+E_SIMPLE4(file_upload_completed, info,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING,
   api_error, result, res, E_FROM_API_FILE_ERROR,
   bool, cancelled, cancel, E_FROM_BOOL
 );
 
-E_SIMPLE3(file_upload_failed, error, true,
+E_SIMPLE3(file_upload_failed, error,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING,
   std::string, error, err, E_FROM_STRING
 );
 
-E_SIMPLE2(file_upload_not_found, warn, true,
+E_SIMPLE2(file_upload_not_found, warn,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING
 );
 
-E_SIMPLE2(file_upload_queued, info, true,
+E_SIMPLE2(file_upload_queued, info,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING
 );
 
-E_SIMPLE1(file_upload_removed, debug, true,
+E_SIMPLE1(file_upload_removed, debug,
   std::string, api_path, ap, E_FROM_STRING
 );
 
-E_SIMPLE3(file_upload_retry, info, true,
+E_SIMPLE3(file_upload_retry, info,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING,
   api_error, result, res, E_FROM_API_FILE_ERROR
 );
 
-E_SIMPLE2(file_upload_started, info, true,
+E_SIMPLE2(file_upload_started, info,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING
 );
 
-E_SIMPLE1(orphaned_file_deleted, warn, true,
+E_SIMPLE1(orphaned_file_deleted, warn,
   std::string, source, src, E_FROM_STRING
 );
 
-E_SIMPLE1(orphaned_file_detected, warn, true,
+E_SIMPLE1(orphaned_file_detected, warn,
   std::string, source, src, E_FROM_STRING
 );
 
-E_SIMPLE3(orphaned_file_processing_failed, error, true,
+E_SIMPLE3(orphaned_file_processing_failed, error,
   std::string, source, src, E_FROM_STRING,
   std::string, dest, dest, E_FROM_STRING,
   std::string, result, res, E_FROM_STRING
 );
 
-E_SIMPLE1(orphaned_source_file_detected, info, true,
+E_SIMPLE1(orphaned_source_file_detected, info,
   std::string, source, src, E_FROM_STRING
 );
 
-E_SIMPLE1(orphaned_source_file_removed, info, true,
+E_SIMPLE1(orphaned_source_file_removed, info,
   std::string, source, src, E_FROM_STRING
 );
 
-E_SIMPLE1(polling_item_begin, debug, true,
+E_SIMPLE1(polling_item_begin, debug,
   std::string, item_name, item, E_FROM_STRING
 );
 
-E_SIMPLE1(polling_item_end, debug, true,
+E_SIMPLE1(polling_item_end, debug,
   std::string, item_name, item, E_FROM_STRING
 );
 
-E_SIMPLE2(provider_offline, error, true,
+E_SIMPLE2(provider_offline, error,
   std::string, host_name_or_ip, host, E_FROM_STRING,
   std::uint16_t, port, port, E_FROM_UINT16
 );
 
-E_SIMPLE2(provider_upload_begin, info, true,
+E_SIMPLE2(provider_upload_begin, info,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING
 );
 
-E_SIMPLE3(provider_upload_end, info, true,
+E_SIMPLE3(provider_upload_end, info,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING,
   api_error, result, res, E_FROM_API_FILE_ERROR
 );
 
-E_SIMPLE2(repertory_exception, error, true,
+E_SIMPLE2(repertory_exception, error,
   std::string, function, func, E_FROM_STRING,
   std::string, message, msg, E_FROM_STRING
 );
 
-E_SIMPLE1(rpc_server_exception, error, true,
+E_SIMPLE1(rpc_server_exception, error,
   std::string, exception, exception, E_FROM_STRING
 );
 
-E_SIMPLE1(service_shutdown_begin, debug, true,
+E_SIMPLE1(service_shutdown_begin, debug,
   std::string, service, svc, E_FROM_STRING
 );
 
-E_SIMPLE1(service_shutdown_end, debug, true,
+E_SIMPLE1(service_shutdown_end, debug,
   std::string, service, svc, E_FROM_STRING
 );
 
-E_SIMPLE1(service_started, debug, true,
+E_SIMPLE1(service_started, debug,
   std::string, service, svc, E_FROM_STRING
 );
 
-E_SIMPLE(unmount_requested, info, true);
+E_SIMPLE(unmount_requested, info);
 #if !defined(_WIN32)
-E_SIMPLE2(unmount_result, info, true,
+E_SIMPLE2(unmount_result, info,
   std::string, location, loc, E_FROM_STRING,
   std::string, result, res, E_FROM_STRING
 );

repertory/librepertory/include/events/t_event_system.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -22,12 +22,26 @@
 #ifndef REPERTORY_INCLUDE_EVENTS_T_EVENT_SYSTEM_HPP_
 #define REPERTORY_INCLUDE_EVENTS_T_EVENT_SYSTEM_HPP_
 
+#include "app_config.hpp"
 #include "events/event.hpp"
 #include "utils/collection.hpp"
 #include "utils/utils.hpp"
 
 namespace repertory {
 template <typename event_type> class t_event_system final {
+private:
+  static constexpr const std::uint8_t max_queue_retry{
+      30U,
+  };
+
+  const std::uint32_t max_queue_size{
+      std::thread::hardware_concurrency() * 4UL,
+  };
+
+  static constexpr const std::chrono::seconds queue_wait_secs{
+      5s,
+  };
+
 public:
   t_event_system(const t_event_system &) = delete;
   t_event_system(t_event_system &&) = delete;
@@ -83,38 +97,48 @@ private:
   std::mutex event_mutex_;
   std::unique_ptr<std::thread> event_thread_;
   std::mutex run_mutex_;
-  stop_type stop_requested_ = false;
+  stop_type stop_requested_{false};
 
 private:
+  [[nodiscard]] auto get_stop_requested() const -> bool {
+    return stop_requested_ || app_config::get_stop_requested();
+  }
+
   void process_events() {
     std::vector<std::shared_ptr<event_type>> events;
-    {
-      unique_mutex_lock lock(event_mutex_);
-      if (not stop_requested_ && event_list_.empty()) {
-        event_notify_.wait_for(lock, 1s);
-      }
 
-      if (not event_list_.empty()) {
-        events.insert(events.end(), event_list_.begin(), event_list_.end());
-        event_list_.clear();
-      }
+    unique_mutex_lock lock(event_mutex_);
+    const auto lock_and_notify = [this, &lock]() {
+      lock.lock();
+      event_notify_.notify_all();
+      lock.unlock();
+    };
+
+    if (not get_stop_requested() && event_list_.empty()) {
+      event_notify_.wait_for(lock, queue_wait_secs);
+    }
+
+    if (not event_list_.empty()) {
+      events.insert(events.end(), event_list_.begin(), event_list_.end());
+      event_list_.clear();
+    }
+
+    lock.unlock();
+
+    if (events.empty()) {
+      lock_and_notify();
+      return;
     }
 
     const auto notify_events = [this](const std::string &name,
                                       const event_type &event) {
       std::deque<std::future<void>> futures;
-      recur_mutex_lock lock(consumer_mutex_);
-      if (event_consumers_.find(name) != event_consumers_.end()) {
-        for (auto *consumer : event_consumers_[name]) {
-          if (event.get_allow_async()) {
-            futures.emplace_back(
-                std::async(std::launch::async, [consumer, &event]() {
-                  consumer->notify_event(event);
-                }));
-          } else {
-            consumer->notify_event(event);
-          }
-        }
+      recur_mutex_lock consumer_lock(consumer_mutex_);
+      for (auto *consumer : event_consumers_[name]) {
+        futures.emplace_back(
+            std::async(std::launch::async, [consumer, &event]() {
+              consumer->notify_event(event);
+            }));
       }
 
       while (not futures.empty()) {
@@ -127,12 +151,31 @@ private:
       notify_events("", *evt.get());
       notify_events(evt->get_name(), *evt.get());
     }
+
+    lock_and_notify();
   }
 
   void queue_event(std::shared_ptr<event_type> evt) {
-    mutex_lock lock(event_mutex_);
+    unique_mutex_lock lock(event_mutex_);
     event_list_.push_back(std::move(evt));
+    auto size = event_list_.size();
     event_notify_.notify_all();
+    lock.unlock();
+
+    for (std::uint8_t retry{0U};
+         size > max_queue_size && retry < max_queue_retry &&
+         not get_stop_requested();
+         ++retry) {
+      lock.lock();
+      size = event_list_.size();
+      if (size > max_queue_size) {
+        event_notify_.wait_for(lock, queue_wait_secs);
+        size = event_list_.size();
+      }
+
+      event_notify_.notify_all();
+      lock.unlock();
+    }
   }
 
 public:
@@ -165,27 +208,40 @@ public:
 
   void start() {
     mutex_lock lock(run_mutex_);
-    if (not event_thread_) {
-      stop_requested_ = false;
-      event_thread_ = std::make_unique<std::thread>([this]() {
-        while (not stop_requested_) {
-          process_events();
-        }
-      });
+    if (event_thread_) {
+      event_notify_.notify_all();
+      return;
     }
+
+    stop_requested_ = false;
+
+    event_thread_ = std::make_unique<std::thread>([this]() {
+      while (not get_stop_requested()) {
+        process_events();
+      }
+    });
+    event_notify_.notify_all();
   }
 
   void stop() {
-    mutex_lock lock(run_mutex_);
-    if (event_thread_) {
-      stop_requested_ = true;
+    unique_mutex_lock lock(run_mutex_);
+    if (not event_thread_) {
       event_notify_.notify_all();
-
-      event_thread_->join();
-      event_thread_.reset();
-
-      process_events();
+      return;
     }
+
+    stop_requested_ = true;
+
+    std::unique_ptr<std::thread> thread{nullptr};
+    std::swap(thread, event_thread_);
+
+    event_notify_.notify_all();
+    lock.unlock();
+
+    thread->join();
+    thread.reset();
+
+    process_events();
   }
 };
 } // namespace repertory

repertory/librepertory/include/file_manager/cache_size_mgr.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -28,6 +28,11 @@ namespace repertory {
 class app_config;
 
 class cache_size_mgr final {
+private:
+  static constexpr const std::chrono::seconds cache_wait_secs{
+      5s,
+  };
+
 public:
   cache_size_mgr(const cache_size_mgr &) = delete;
   cache_size_mgr(cache_size_mgr &&) = delete;
@@ -49,6 +54,9 @@ private:
   std::condition_variable notify_;
   stop_type stop_requested_{false};
 
+private:
+  [[nodiscard]] auto get_stop_requested() const -> bool;
+
 public:
   [[nodiscard]] auto expand(std::uint64_t size) -> api_error;
 

repertory/librepertory/include/file_manager/direct_open_file.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -42,8 +42,8 @@ public:
   direct_open_file(const direct_open_file &) noexcept = delete;
   direct_open_file(direct_open_file &&) noexcept = delete;
   auto operator=(direct_open_file &&) noexcept -> direct_open_file & = delete;
-  auto
-  operator=(const direct_open_file &) noexcept -> direct_open_file & = delete;
+  auto operator=(const direct_open_file &) noexcept
+      -> direct_open_file & = delete;
 
 private:
   std::array<data_buffer, min_ring_size> ring_data_;
@@ -51,22 +51,26 @@ private:
 protected:
   [[nodiscard]] auto on_check_start() -> bool override;
 
-  [[nodiscard]] auto
-  on_chunk_downloaded(std::size_t /* chunk */,
-                      const data_buffer & /* buffer */) -> api_error override {
+  [[nodiscard]] auto on_chunk_downloaded(std::size_t /* chunk */,
+                                         const data_buffer & /* buffer */)
+      -> api_error override {
     return api_error::success;
   }
 
-  [[nodiscard]] auto
-  on_read_chunk(std::size_t chunk, std::size_t read_size,
-                std::uint64_t read_offset, data_buffer &data,
-                std::size_t &bytes_read) -> api_error override;
+  [[nodiscard]] auto on_read_chunk(std::size_t chunk, std::size_t read_size,
+                                   std::uint64_t read_offset, data_buffer &data,
+                                   std::size_t &bytes_read)
+      -> api_error override;
 
   [[nodiscard]] auto use_buffer(std::size_t chunk,
                                 std::function<api_error(data_buffer &)> func)
       -> api_error override;
 
 public:
+  [[nodiscard]] auto get_source_path() const -> std::string override {
+    return "direct";
+  }
+
   [[nodiscard]] auto native_operation(native_operation_callback /* callback */)
       -> api_error override {
     return api_error::not_supported;

repertory/librepertory/include/file_manager/events.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -27,55 +27,55 @@
 
 namespace repertory {
 // clang-format off
-E_SIMPLE2(download_begin, info, true,
+E_SIMPLE2(download_begin, info,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, dest_path, dest, E_FROM_STRING
 );
 
-E_SIMPLE3(download_end, info, true,
+E_SIMPLE3(download_end, info,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, dest_path, dest, E_FROM_STRING,
   api_error, result, result, E_FROM_API_FILE_ERROR
 );
 
-E_SIMPLE3(download_progress, info, true,
+E_SIMPLE3(download_progress, info,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, dest_path, dest, E_FROM_STRING,
   double, progress, prog, E_FROM_DOUBLE_PRECISE
 );
 
-E_SIMPLE2(download_restored, info, true,
+E_SIMPLE2(download_restored, info,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, dest_path, dest, E_FROM_STRING
 );
 
-E_SIMPLE3(download_restore_failed, error, true,
+E_SIMPLE3(download_restore_failed, error,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, dest_path, dest, E_FROM_STRING,
   std::string, error, err, E_FROM_STRING
 );
 
-E_SIMPLE3(download_resume_add_failed, error, true,
+E_SIMPLE3(download_resume_add_failed, error,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, dest_path, dest, E_FROM_STRING,
   std::string, error, err, E_FROM_STRING
 );
 
-E_SIMPLE2(download_resume_added, debug, true,
+E_SIMPLE2(download_resume_added, debug,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, dest_path, dest, E_FROM_STRING
 );
 
-E_SIMPLE2(download_resume_removed, debug, true,
+E_SIMPLE2(download_resume_removed, debug,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, dest_path, dest, E_FROM_STRING
 );
 
-E_SIMPLE1(item_timeout, trace, true,
+E_SIMPLE1(item_timeout, trace,
   std::string, api_path, ap, E_FROM_STRING
 );
 
-E_SIMPLE3(download_type_selected, debug, true,
+E_SIMPLE3(download_type_selected, debug,
   std::string, api_path, ap, E_FROM_STRING,
   std::string, source, src, E_FROM_STRING,
   download_type, download_type, type, E_FROM_DOWNLOAD_TYPE

repertory/librepertory/include/file_manager/file_manager.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -39,6 +39,11 @@ class i_provider;
 class file_manager final : public i_file_manager, public i_upload_manager {
   E_CONSUMER();
 
+private:
+  static constexpr const std::chrono::seconds queue_wait_secs{
+      5s,
+  };
+
 public:
   file_manager(app_config &config, i_provider &provider);
 
@@ -72,15 +77,19 @@ private:
 
   void close_timed_out_files();
 
-  auto get_open_file_by_handle(std::uint64_t handle) const
+  [[nodiscard]] auto get_open_file_by_handle(std::uint64_t handle) const
       -> std::shared_ptr<i_closeable_open_file>;
 
-  auto get_open_file_count(const std::string &api_path) const -> std::size_t;
+  [[nodiscard]] auto get_open_file_count(const std::string &api_path) const
+      -> std::size_t;
 
-  auto open(const std::string &api_path, bool directory,
-            const open_file_data &ofd, std::uint64_t &handle,
-            std::shared_ptr<i_open_file> &file,
-            std::shared_ptr<i_closeable_open_file> closeable_file) -> api_error;
+  [[nodiscard]] auto get_stop_requested() const -> bool;
+
+  [[nodiscard]] auto open(const std::string &api_path, bool directory,
+                          const open_file_data &ofd, std::uint64_t &handle,
+                          std::shared_ptr<i_open_file> &file,
+                          std::shared_ptr<i_closeable_open_file> closeable_file)
+      -> api_error;
 
   void queue_upload(const std::string &api_path, const std::string &source_path,
                     bool no_lock);

repertory/librepertory/include/file_manager/i_file_manager.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/file_manager/i_open_file.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/file_manager/i_upload_manager.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/file_manager/open_file.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -78,8 +78,8 @@ private:
   stop_type stop_requested_{false};
 
 private:
-  [[nodiscard]] auto adjust_cache_size(std::uint64_t file_size,
-                                       bool shrink) -> api_error;
+  [[nodiscard]] auto adjust_cache_size(std::uint64_t file_size, bool shrink)
+      -> api_error;
 
   [[nodiscard]] auto check_start() -> api_error;
 
@@ -88,6 +88,8 @@ private:
   void download_range(std::size_t begin_chunk, std::size_t end_chunk,
                       bool should_reset);
 
+  [[nodiscard]] auto get_stop_requested() const -> bool;
+
   void set_modified();
 
   void set_read_state(std::size_t chunk);
@@ -111,12 +113,12 @@ public:
     return true;
   }
 
-  [[nodiscard]] auto
-  native_operation(native_operation_callback callback) -> api_error override;
+  [[nodiscard]] auto native_operation(native_operation_callback callback)
+      -> api_error override;
 
-  [[nodiscard]] auto
-  native_operation(std::uint64_t new_file_size,
-                   native_operation_callback callback) -> api_error override;
+  [[nodiscard]] auto native_operation(std::uint64_t new_file_size,
+                                      native_operation_callback callback)
+      -> api_error override;
 
   void remove(std::uint64_t handle) override;
 

repertory/librepertory/include/file_manager/open_file_base.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -161,7 +161,7 @@ protected:
 
   void set_source_path(std::string source_path);
 
-  void wait_for_io(stop_type &stop_requested);
+  void wait_for_io(stop_type_callback stop_requested_cb);
 
 public:
   void add(std::uint64_t handle, open_file_data ofd) override;
@@ -186,17 +186,17 @@ public:
 
   [[nodiscard]] auto get_handles() const -> std::vector<std::uint64_t> override;
 
-  [[nodiscard]] auto
-  get_open_data() -> std::map<std::uint64_t, open_file_data> & override;
+  [[nodiscard]] auto get_open_data()
+      -> std::map<std::uint64_t, open_file_data> & override;
 
   [[nodiscard]] auto get_open_data() const
       -> const std::map<std::uint64_t, open_file_data> & override;
 
-  [[nodiscard]] auto
-  get_open_data(std::uint64_t handle) -> open_file_data & override;
+  [[nodiscard]] auto get_open_data(std::uint64_t handle)
+      -> open_file_data & override;
 
-  [[nodiscard]] auto
-  get_open_data(std::uint64_t handle) const -> const open_file_data & override;
+  [[nodiscard]] auto get_open_data(std::uint64_t handle) const
+      -> const open_file_data & override;
 
   [[nodiscard]] auto get_open_file_count() const -> std::size_t override;
 

repertory/librepertory/include/file_manager/ring_buffer_base.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -44,8 +44,8 @@ public:
   ring_buffer_base(const ring_buffer_base &) noexcept = delete;
   ring_buffer_base(ring_buffer_base &&) noexcept = delete;
   auto operator=(ring_buffer_base &&) noexcept -> ring_buffer_base & = delete;
-  auto
-  operator=(const ring_buffer_base &) noexcept -> ring_buffer_base & = delete;
+  auto operator=(const ring_buffer_base &) noexcept
+      -> ring_buffer_base & = delete;
 
 public:
   static constexpr const auto min_ring_size{5U};
@@ -73,6 +73,8 @@ private:
 
   void update_position(std::size_t count, bool is_forward);
 
+  [[nodiscard]] auto get_stop_requested() const -> bool;
+
 protected:
   [[nodiscard]] auto has_reader_thread() const -> bool {
     return reader_thread_ != nullptr;
@@ -84,9 +86,9 @@ protected:
 
   [[nodiscard]] virtual auto on_check_start() -> bool = 0;
 
-  [[nodiscard]] virtual auto
-  on_chunk_downloaded(std::size_t chunk,
-                      const data_buffer &buffer) -> api_error = 0;
+  [[nodiscard]] virtual auto on_chunk_downloaded(std::size_t chunk,
+                                                 const data_buffer &buffer)
+      -> api_error = 0;
 
   [[nodiscard]] virtual auto
   on_read_chunk(std::size_t chunk, std::size_t read_size,
@@ -94,8 +96,8 @@ protected:
                 std::size_t &bytes_read) -> api_error = 0;
 
   [[nodiscard]] virtual auto
-  use_buffer(std::size_t chunk,
-             std::function<api_error(data_buffer &)> func) -> api_error = 0;
+  use_buffer(std::size_t chunk, std::function<api_error(data_buffer &)> func)
+      -> api_error = 0;
 
 public:
   auto close() -> bool override;
@@ -139,9 +141,10 @@ public:
 
   void set_api_path(const std::string &api_path) override;
 
-  [[nodiscard]] auto
-  write(std::uint64_t /* write_offset */, const data_buffer & /* data */,
-        std::size_t & /* bytes_written */) -> api_error override {
+  [[nodiscard]] auto write(std::uint64_t /* write_offset */,
+                           const data_buffer & /* data */,
+                           std::size_t & /* bytes_written */)
+      -> api_error override {
     return api_error::not_supported;
   }
 };

repertory/librepertory/include/file_manager/ring_buffer_open_file.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/file_manager/upload.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -47,8 +47,8 @@ private:
 private:
   bool cancelled_{false};
   api_error error_{api_error::success};
-  std::unique_ptr<std::thread> thread_;
   stop_type stop_requested_{false};
+  std::unique_ptr<std::thread> thread_;
 
 private:
   void upload_thread();

repertory/librepertory/include/platform/platform.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/platform/unix_platform.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/platform/win32_platform.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/providers/base_provider.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -53,19 +53,19 @@ private:
   i_file_manager *fm_{};
 
 private:
-  void add_all_items(const stop_type &stop_requested);
+  void add_all_items(stop_type &stop_requested);
 
   void process_removed_directories(std::deque<removed_item> removed_list,
-                                   const stop_type &stop_requested);
+                                   stop_type &stop_requested);
 
   void process_removed_files(std::deque<removed_item> removed_list,
-                             const stop_type &stop_requested);
+                             stop_type &stop_requested);
 
-  void process_removed_items(const stop_type &stop_requested);
+  void process_removed_items(stop_type &stop_requested);
 
-  void remove_deleted_items(const stop_type &stop_requested);
+  void remove_deleted_items(stop_type &stop_requested);
 
-  void remove_unmatched_source_files(const stop_type &stop_requested);
+  void remove_unmatched_source_files(stop_type &stop_requested);
 
 protected:
   [[nodiscard]] static auto create_api_file(std::string path, std::string key,

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -82,7 +82,7 @@ private:
                                const encrypt_config &cfg,
                                std::string &api_path) const -> bool;
 
-  void remove_deleted_files(const stop_type &stop_requested);
+  void remove_deleted_files(stop_type &stop_requested);
 
 public:
   [[nodiscard]] auto create_directory(const std::string &api_path,

repertory/librepertory/include/providers/i_provider.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/providers/provider.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/providers/s3/s3_provider.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -54,14 +54,18 @@ private:
                                       const std::string &object_name) const
       -> api_error;
 
+  [[nodiscard]] auto
+  create_directory_object(const std::string &api_path,
+                          const std::string &object_name) const -> api_error;
+
+  [[nodiscard]] auto create_directory_paths(const std::string &api_path,
+                                            const std::string &key) const
+      -> api_error;
+
   [[nodiscard]] auto create_file_extra(const std::string &api_path,
                                        api_meta_map &meta)
       -> api_error override;
 
-  [[nodiscard]] auto create_path_directories(const std::string &api_path,
-                                             const std::string &key) const
-      -> api_error;
-
   [[nodiscard]] auto decrypt_object_name(std::string &object_name) const
       -> api_error;
 
@@ -85,6 +89,9 @@ private:
     return s3_config_;
   }
 
+  [[nodiscard]] auto set_meta_key(const std::string &api_path,
+                                  api_meta_map &meta) -> api_error;
+
 protected:
   [[nodiscard]] auto create_directory_impl(const std::string &api_path,
                                            api_meta_map &meta)

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/rpc/client/client.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -38,12 +38,8 @@ private:
   std::unique_ptr<httplib::Server> server_;
   std::unique_ptr<std::thread> server_thread_;
   std::mutex start_stop_mutex_;
-  std::atomic<bool> started_ = false;
 
 private:
-  // [[nodiscard]] bool check_authorization(const httpserver::http_request
-  // &request);
-
   [[nodiscard]] auto check_authorization(const httplib::Request &req) -> bool;
 
   void handle_get_config(const httplib::Request &req, httplib::Response &res);

repertory/librepertory/include/types/remote.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/types/repertory.hpp

@@ -41,6 +41,7 @@ constexpr const auto default_task_wait_ms{100U};
 constexpr const auto default_timeout_ms{60000U};
 constexpr const auto max_orphaned_file_retention_days{std::uint16_t(31U)};
 constexpr const auto max_ring_buffer_file_size{std::uint16_t(1024U)};
+constexpr const auto max_s3_object_name_length{1024U};
 constexpr const auto min_cache_size_bytes{
     std::uint64_t(100UL * 1024UL * 1024UL)};
 constexpr const auto min_download_timeout_secs{std::uint8_t(5U)};
@@ -200,6 +201,7 @@ enum class api_error {
   item_exists,
   item_not_found,
   more_data,
+  name_too_long,
   no_disk_space,
   not_implemented,
   not_supported,
@@ -216,31 +218,49 @@ enum class api_error {
 
 [[nodiscard]] auto api_error_from_string(std::string_view str) -> api_error;
 
-[[nodiscard]] auto
-api_error_to_string(const api_error &error) -> const std::string &;
+[[nodiscard]] auto api_error_to_string(const api_error &error)
+    -> const std::string &;
 
 enum class database_type {
   rocksdb,
   sqlite,
 };
-[[nodiscard]] auto database_type_from_string(
-    std::string type,
-    database_type default_type = database_type::rocksdb) -> database_type;
-
 [[nodiscard]] auto
-database_type_to_string(const database_type &type) -> std::string;
+database_type_from_string(std::string type,
+                          database_type default_type = database_type::rocksdb)
+    -> database_type;
+
+[[nodiscard]] auto database_type_to_string(const database_type &type)
+    -> std::string;
 
 enum class download_type {
   default_,
   direct,
   ring_buffer,
 };
-[[nodiscard]] auto download_type_from_string(
-    std::string type,
-    download_type default_type = download_type::default_) -> download_type;
+[[nodiscard]] auto
+download_type_from_string(std::string type,
+                          download_type default_type = download_type::default_)
+    -> download_type;
+
+[[nodiscard]] auto download_type_to_string(const download_type &type)
+    -> std::string;
+
+enum class event_level {
+  critical,
+  error,
+  warn,
+  info,
+  debug,
+  trace,
+};
 
 [[nodiscard]] auto
-download_type_to_string(const download_type &type) -> std::string;
+event_level_from_string(std::string level,
+                        event_level default_level = event_level::info)
+    -> event_level;
+
+[[nodiscard]] auto event_level_to_string(event_level level) -> std::string;
 
 enum class exit_code : std::int32_t {
   success = 0,
@@ -650,6 +670,18 @@ template <> struct adl_serializer<repertory::download_type> {
     value = repertory::download_type_from_string(data.get<std::string>());
   }
 };
+
+template <> struct adl_serializer<std::atomic<repertory::event_level>> {
+  static void to_json(json &data,
+                      const std::atomic<repertory::event_level> &value) {
+    data = repertory::event_level_to_string(value.load());
+  }
+
+  static void from_json(const json &data,
+                        std::atomic<repertory::event_level> &value) {
+    value.store(repertory::event_level_from_string(data.get<std::string>()));
+  }
+};
 NLOHMANN_JSON_NAMESPACE_END
 
 #endif // REPERTORY_INCLUDE_TYPES_REPERTORY_HPP_

repertory/librepertory/include/types/rpc.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/types/s3.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/types/startup_exception.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/utils/cli_utils.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/utils/error_utils.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/utils/file_utils.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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

repertory/librepertory/include/utils/polling.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -40,7 +40,7 @@ public:
   struct polling_item final {
     std::string name;
     frequency freq;
-    std::function<void(const stop_type &stop_requested)> action;
+    std::function<void(stop_type &stop_requested)> action;
   };
 
 public:
@@ -75,6 +75,8 @@ private:
   void frequency_thread(std::function<std::uint32_t()> get_frequency_seconds,
                         frequency freq);
 
+  [[nodiscard]] auto get_stop_requested() const -> bool;
+
 public:
   void remove_callback(const std::string &name);
 

repertory/librepertory/include/utils/single_thread_service_base.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -36,7 +36,7 @@ private:
   const std::string service_name_;
   mutable std::mutex mtx_;
   mutable std::condition_variable notify_;
-  stop_type stop_requested_ = false;
+  stop_type stop_requested_{false};
   std::unique_ptr<std::thread> thread_;
 
 protected:
@@ -46,9 +46,7 @@ protected:
     return notify_;
   }
 
-  [[nodiscard]] auto get_stop_requested() const -> bool {
-    return stop_requested_;
-  }
+  [[nodiscard]] auto get_stop_requested() const -> bool;
 
   void notify_all() const;
 

repertory/librepertory/include/utils/tasks.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  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
@@ -30,7 +30,7 @@ class app_config;
 class tasks final {
 public:
   struct task final {
-    std::function<void(const stop_type &task_stopped)> action;
+    std::function<void(stop_type &task_stopped)> action;
   };
 
   class i_task {
@@ -104,6 +104,8 @@ private:
 private:
   void task_thread();
 
+  [[nodiscard]] auto get_stop_requested() const -> bool;
+
 public:
   auto schedule(task item) -> task_ptr;
 

repertory/librepertory/include/utils/throttle.hpp

@@ -1,59 +0,0 @@
-/*
-  Copyright <2018-2024> <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_UTILS_THROTTLE_HPP_
-#define REPERTORY_INCLUDE_UTILS_THROTTLE_HPP_
-
-namespace repertory {
-class throttle final {
-public:
-  throttle() : max_size_(10u) {}
-
-  explicit throttle(std::size_t max_size) : max_size_(max_size) {}
-
-public:
-  throttle(const throttle &) noexcept = delete;
-  throttle(throttle &&) noexcept = delete;
-  auto operator=(const throttle &) -> throttle & = delete;
-  auto operator=(throttle &&) -> throttle & = delete;
-
-public:
-  ~throttle() { shutdown(); }
-
-private:
-  const std::size_t max_size_;
-  std::size_t count_ = 0u;
-  bool shutdown_ = false;
-  std::mutex mutex_;
-  std::condition_variable notify_;
-
-public:
-  void decrement();
-
-  void increment_or_wait();
-
-  void reset();
-
-  void shutdown();
-};
-} // namespace repertory
-
-#endif // REPERTORY_INCLUDE_UTILS_THROTTLE_HPP_