From ac66240facd15bd26bc00ec9f8af9b96634cb66f Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Sun, 22 Dec 2024 11:46:30 -0600
Subject: [PATCH] refactor

---
 .../include/file_manager/direct_open_file.hpp             | 3 +++
 .../include/file_manager/ring_buffer_open_file.hpp        | 3 +++
 .../librepertory/src/file_manager/direct_open_file.cpp    | 8 ++++++--
 .../src/file_manager/ring_buffer_open_file.cpp            | 8 ++++++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/repertory/librepertory/include/file_manager/direct_open_file.hpp b/repertory/librepertory/include/file_manager/direct_open_file.hpp
index abb11e34..87002f15 100644
--- a/repertory/librepertory/include/file_manager/direct_open_file.hpp
+++ b/repertory/librepertory/include/file_manager/direct_open_file.hpp
@@ -47,6 +47,7 @@ public:
 
 private:
   std::size_t total_chunks_;
+  stop_type stop_requested_{false};
 
 protected:
   [[nodiscard]] auto is_download_complete() const -> bool override {
@@ -54,6 +55,8 @@ protected:
   }
 
 public:
+  auto close() -> bool override;
+
   [[nodiscard]] auto is_complete() const -> bool override { return true; }
 
   [[nodiscard]] auto is_write_supported() const -> bool override {
diff --git a/repertory/librepertory/include/file_manager/ring_buffer_open_file.hpp b/repertory/librepertory/include/file_manager/ring_buffer_open_file.hpp
index ac1e0055..fd8969b9 100644
--- a/repertory/librepertory/include/file_manager/ring_buffer_open_file.hpp
+++ b/repertory/librepertory/include/file_manager/ring_buffer_open_file.hpp
@@ -63,6 +63,7 @@ private:
   std::size_t current_chunk_{};
   std::size_t first_chunk_{};
   std::size_t last_chunk_;
+  stop_type stop_requested_{false};
 
 private:
   auto download_chunk(std::size_t chunk) -> api_error;
@@ -77,6 +78,8 @@ protected:
   }
 
 public:
+  auto close() -> bool override;
+
   void forward(std::size_t count);
 
   [[nodiscard]] auto get_current_chunk() const -> std::size_t {
diff --git a/repertory/librepertory/src/file_manager/direct_open_file.cpp b/repertory/librepertory/src/file_manager/direct_open_file.cpp
index b3d7a0f8..e8db0aa6 100644
--- a/repertory/librepertory/src/file_manager/direct_open_file.cpp
+++ b/repertory/librepertory/src/file_manager/direct_open_file.cpp
@@ -36,6 +36,11 @@ direct_open_file::direct_open_file(std::uint64_t chunk_size,
 
 direct_open_file::~direct_open_file() { close(); }
 
+auto direct_open_file::close() -> bool {
+  stop_requested_ = true;
+  return open_file_base::close();
+}
+
 auto direct_open_file::read(std::size_t read_size, std::uint64_t read_offset,
                             data_buffer &data) -> api_error {
   if (fsi_.directory) {
@@ -49,9 +54,8 @@ auto direct_open_file::read(std::size_t read_size, std::uint64_t read_offset,
     return api_error::success;
   }
 
-  stop_type stop_requested{false};
   auto res = provider_.read_file_bytes(fsi_.api_path, read_size, read_offset,
-                                       data, stop_requested);
+                                       data, stop_requested_);
   reset_timeout();
 
   return res;
diff --git a/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp b/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp
index 8e6f225b..877bd3a0 100644
--- a/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp
+++ b/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp
@@ -103,6 +103,11 @@ ring_buffer_open_file::~ring_buffer_open_file() {
   }
 }
 
+auto ring_buffer_open_file::close() -> bool {
+  stop_requested_ = true;
+  return open_file_base::close();
+}
+
 auto ring_buffer_open_file::download_chunk(std::size_t chunk) -> api_error {
   unique_mutex_lock chunk_lock(chunk_mtx_);
   if (active_downloads_.find(chunk) != active_downloads_.end()) {
@@ -123,10 +128,9 @@ auto ring_buffer_open_file::download_chunk(std::size_t chunk) -> api_error {
     data_buffer buffer((chunk == (total_chunks_ - 1U)) ? last_chunk_size_
                                                        : chunk_size_);
 
-    stop_type stop_requested = !!ring_state_[chunk % ring_state_.size()];
     auto res =
         provider_.read_file_bytes(fsi_.api_path, buffer.size(),
-                                  chunk * chunk_size_, buffer, stop_requested);
+                                  chunk * chunk_size_, buffer, stop_requested_);
     if (res == api_error::success) {
       res = do_io([&]() -> api_error {
         std::size_t bytes_written{};