Implemented readFileToBuffer

Author: sea5kg

README.md

@@ -187,6 +187,18 @@ if (WSJCppCore::readTextFile("./file.txt", sContent)) {
 }
 ```
 
+### readFileToBuffer
+
+Read file binary content to buffer
+
+```
+char *pBuffer = nullptr;
+int nBufferSize = 0;
+if (WSJCppCore::readFileToBuffer("./data/readFileToBuffer.txt", &pBuffer, nBufferSize)) {
+    // your can work with buffer here
+}
+```
+
 ### removeFile
 
 ```

src.wsjcpp/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Automaticly generated by [email protected]
 cmake_minimum_required(VERSION 3.0)
 
-add_definitions(-DWSJCPP_VERSION="v0.0.7")
+add_definitions(-DWSJCPP_VERSION="v0.0.8")
 add_definitions(-DWSJCPP_NAME="wsjcpp-core")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

src/wsjcpp_core.cpp

@@ -345,6 +345,33 @@ bool WSJCppCore::readTextFile(const std::string &sFilename, std::string &sConten
 
 // ---------------------------------------------------------------------
 
+bool WSJCppCore::readFileToBuffer(const std::string &sFilename, char *pBuffer[], int &nBufferSize) {
+    std::ifstream f(sFilename, std::ifstream::binary);
+    if (!f) {
+        return false;
+    }
+
+    // get length of file:
+    f.seekg (0, f.end);
+    nBufferSize = f.tellg();
+    f.seekg (0, f.beg);
+
+    *pBuffer = new char [nBufferSize];
+
+    // read data as a block:
+    f.read (*pBuffer, nBufferSize);
+    if (!f) {
+        WSJCppLog::err("WSJCppCore::readFileToBuffer", "Only " + std::to_string(f.gcount()) + " could be read");
+        delete[] pBuffer;
+        f.close();
+        return false;
+    }
+    f.close();
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
 bool WSJCppCore::writeFile(const std::string &sFilename, const char *pBuffer, const int nBufferSize) {
     std::ofstream f(sFilename, std::ios::out | std::ios::binary);
     if (!f) {

src/wsjcpp_core.h

@@ -38,6 +38,7 @@ class WSJCppCore {
         static bool makeDir(const std::string &sDirname);
         static bool writeFile(const std::string &sFilename, const std::string &sContent);
         static bool readTextFile(const std::string &sFilename, std::string &sOutputContent);
+        static bool readFileToBuffer(const std::string &sFilename, char *pBuffer[], int &nBufferSize);
         static bool writeFile(const std::string &sFilename, const char *pBuffer, const int nBufferSize);
         static bool removeFile(const std::string &sFilename);
         static bool createEmptyFile(const std::string &sFilename);

unit-tests.wsjcpp/CMakeLists.txt

@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(unit-tests C CXX)
-add_definitions(-DWSJCPP_VERSION="ut-v0.0.7")
+add_definitions(-DWSJCPP_VERSION="ut-v0.0.8")
 add_definitions(-DWSJCPP_NAME="unit-tests-wsjcpp-core")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -19,7 +19,7 @@ set (WSJCPP_SOURCES "")
 find_package(Threads REQUIRED)
 list (APPEND WSJCPP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 
-# wsjcpp-core:v0.0.7
+# wsjcpp-core:v0.0.8
 list (APPEND WSJCPP_INCLUDE_DIRS "../src")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_core.cpp")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_core.h")
@@ -55,6 +55,8 @@ list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_split.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_split.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_create_empty_file.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_create_empty_file.cpp")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_read_file_to_buffer.h")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_read_file_to_buffer.cpp")
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.user-custom.txt)
 

unit-tests.wsjcpp/data/readFileToBuffer.txt

@@ -0,0 +1,2 @@
+1234567890
+qwerty123456

unit-tests.wsjcpp/src/unit_test_read_file_to_buffer.cpp

@@ -0,0 +1,36 @@
+#include "unit_test_read_file_to_buffer.h"
+#include <vector>
+#include <algorithm>
+#include <wsjcpp_core.h>
+
+REGISTRY_UNIT_TEST(UnitTestReadFileToBuffer)
+
+UnitTestReadFileToBuffer::UnitTestReadFileToBuffer()
+    : WSJCppUnitTestBase("UnitTestReadFileToBuffer") {
+}
+
+// ---------------------------------------------------------------------
+
+void UnitTestReadFileToBuffer::init() {
+    // nothing
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestReadFileToBuffer::run() {
+    bool bTestSuccess = true;
+    std::string sExpected = "1234567890\nqwerty123456";
+    char *pBuffer = nullptr;
+    int nBufferSize = 0;
+    WSJCppCore::readFileToBuffer("./data/readFileToBuffer.txt", &pBuffer, nBufferSize);
+    compareN(bTestSuccess, "Size of readed", nBufferSize, sExpected.length());
+    int nMin = std::min(nBufferSize, (int)sExpected.length());
+    for (int i = 0; i < nMin; i++) {
+        char c_got = pBuffer[i];
+        char c_expected = sExpected[i];
+        compareN(bTestSuccess, "Check the " + std::to_string(i), c_got, c_expected);
+    }
+    // compareB(bTestSuccess, "Not implemented", true, false);
+    return bTestSuccess;
+}
+

unit-tests.wsjcpp/src/unit_test_read_file_to_buffer.h

@@ -0,0 +1,15 @@
+#ifndef UNIT_TEST_READ_FILE_TO_BUFFER_H
+#define UNIT_TEST_READ_FILE_TO_BUFFER_H
+
+#include <wsjcpp_unit_tests.h>
+
+// Description: TODO
+class UnitTestReadFileToBuffer : public WSJCppUnitTestBase {
+    public:
+        UnitTestReadFileToBuffer();
+        virtual void init();
+        virtual bool run();
+};
+
+#endif // UNIT_TEST_READ_FILE_TO_BUFFER_H
+

wsjcpp.yml

@@ -62,3 +62,5 @@ unit-tests:
       description: "Test split function"
     - name: "CreateEmptyFile"
       description: "Test create empty file"
+    - name: "ReadFileToBuffer"
+      description: "test for readFileToBuffer"