fix: fix Read method

feat: add Close method to ReadFile class

Author: Gleb Zhizhchenko

example/main.c

@@ -52,7 +52,11 @@ int main() {
         return 1;
     }
 
-    fs_db_rf_destroy(&rf);
+    err = fs_db_rf_close(&rf);
+    if (err) {
+        printf("%s\n", fs_db_err_msg(err));
+        return 1;
+    }
     printf("\n");
 
     err = fs_db_delete((fs_db_store*)conn, KEY);

inc/read_file.h

@@ -26,8 +26,10 @@ namespace fs_db {
 
     public:
         ReadFile(ReadFile &&other) noexcept;
+        ~ReadFile();
 
         size_t Read(char data[], size_t size);
+        void Close();
 
         ReadFile &operator=(ReadFile &&other) noexcept;
     };
@@ -45,7 +47,7 @@ typedef struct fs_db_rf fs_db_rf;
 extern "C" {
 #endif
     fs_db_err fs_db_rf_read(fs_db_rf *rf, char data[], size_t size, size_t *read);
-    void fs_db_rf_destroy(fs_db_rf **rf);
+    fs_db_err fs_db_rf_close(fs_db_rf **rf);
 #ifdef __cplusplus
 }
 #endif

src/read_file.cpp

@@ -6,14 +6,17 @@ fs_db::ReadFile::ReadFile(ReadFile &&other) noexcept: buf(std::move(other.buf)),
 
 fs_db::ReadFile::ReadFile(std::unique_ptr<grpc::ClientContext> &&ctx, std::unique_ptr<grpc::ClientReader<store::GetFileResponse>> &&r): ctx(std::move(ctx)), r(std::move(r)) {}
 
+fs_db::ReadFile::~ReadFile() {
+    Close();
+}
+
 size_t fs_db::ReadFile::Read(char data[], size_t size) {
     if (r == nullptr) {
         return 0;
     }
 
     store::GetFileResponse msg;
     while (buf.size() < size && r->Read(&msg)) {
-        handleError(r->Finish());
         buf += msg.chunk();
     }
 
@@ -24,6 +27,18 @@ size_t fs_db::ReadFile::Read(char data[], size_t size) {
     return size;
 }
 
+void fs_db::ReadFile::Close() {
+    if (r == nullptr) {
+        return;
+    }
+
+    handleError(r->Finish());
+    buf.clear();
+    ctx.reset();
+    r.reset();
+}
+
+
 fs_db::ReadFile &fs_db::ReadFile::operator=(ReadFile &&other) noexcept {
     buf = std::move(other.buf);
     ctx = std::move(other.ctx);
@@ -38,7 +53,13 @@ fs_db_err fs_db_rf_read(fs_db_rf *rf, char data[], const size_t size, size_t *re
     });
 }
 
-void fs_db_rf_destroy(fs_db_rf **rf) {
+fs_db_err fs_db_rf_close(fs_db_rf **rf) {
+    const fs_db_err err = fs_db::Exception::try_catch([&] {
+        (*rf)->Close();
+    });
+
     delete *rf;
     *rf = nullptr;
+
+    return err;
 }

src/write_file.cpp

@@ -47,6 +47,8 @@ void fs_db::WriteFile::Close() {
 
     w->WritesDone();
     handleError(w->Finish());
+    ctx.reset();
+    resp.reset();
     w.reset();
 }