From 0a70469cd059e230be4ab947232e43bc0f29cbe3 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sun, 22 Dec 2024 19:06:33 -0600 Subject: [PATCH] refactor --- .../include/file_manager/ring_buffer_open_file.hpp | 1 + .../src/file_manager/ring_buffer_open_file.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) 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 46120233..6d9eb91c 100644 --- a/repertory/librepertory/include/file_manager/ring_buffer_open_file.hpp +++ b/repertory/librepertory/include/file_manager/ring_buffer_open_file.hpp @@ -60,6 +60,7 @@ private: std::size_t ring_begin_{}; std::size_t ring_end_{}; std::size_t ring_pos_{}; + std::string source_path_; stop_type stop_requested_{false}; private: 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 5b9a80c7..0fcf512b 100644 --- a/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp +++ b/repertory/librepertory/src/file_manager/ring_buffer_open_file.cpp @@ -66,9 +66,9 @@ ring_buffer_open_file::ring_buffer_open_file(std::string buffer_directory, buffer_directory, utils::get_last_error_code())); } - fsi_.source_path = + source_path_ = utils::path::combine(buffer_directory, {utils::create_uuid_string()}); - nf_ = utils::file::file::open_or_create_file(fsi_.source_path); + nf_ = utils::file::file::open_or_create_file(source_path_); if (not *nf_) { throw std::runtime_error(fmt::format("failed to create buffer file|err|{}", utils::get_last_error_code())); @@ -87,9 +87,9 @@ ring_buffer_open_file::~ring_buffer_open_file() { close(); nf_->close(); - if (not utils::file::file(fsi_.source_path).remove()) { + if (not utils::file::file(source_path_).remove()) { utils::error::raise_api_path_error( - function_name, fsi_.api_path, fsi_.source_path, + function_name, fsi_.api_path, source_path_, utils::get_last_error_code(), "failed to delete file"); } }