Fixed #5 added WSJCPP-OBJ-TREE-FILE

Author: sea5kg

.gitignore

@@ -3,6 +3,9 @@ tmp/*
 wsjcpp-obj-tree
 .logs/*
 .vscode/*
+some.obj-tree
+some2.obj-tree
+unit-tests.wsjcpp/data/tmp/*
 
 # Prerequisites
 *.d

.travis.yml

@@ -17,6 +17,9 @@ addons:
 # Build steps
 script:
   - ./build_simple.sh
+  - ./wsjcpp-obj-tree --example -o some.wsjcpp-obj-tree
+  - ./wsjcpp-obj-tree -i some.wsjcpp-obj-tree -o some2.wsjcpp-obj-tree
+  - rm some.wsjcpp-obj-tree && rm some2.wsjcpp-obj-tree
   - cd unit-tests.wsjcpp
   - ./build_simple.sh
   - ./unit-tests

src/examples/wsjcpp_obj_tree_node_building.cpp

@@ -91,6 +91,12 @@ const char *WsjcppObjTreeNodeBuilding::getData() {
 
 // ---------------------------------------------------------------------
 
+bool WsjcppObjTreeNodeBuilding::readDataPartFromFile(std::ifstream &f, std::string &sError) {
+    
+}
+
+// ---------------------------------------------------------------------
+
 std::string WsjcppObjTreeNodeBuilding::toString(const std::string &sIntent) {
     return
         "Building: st. " + m_value.getStreetName() + ", " + m_value.getBuildingNumber()

src/examples/wsjcpp_obj_tree_node_building.h

@@ -34,6 +34,7 @@ class WsjcppObjTreeNodeBuilding : public WsjcppObjTreeNode {
         // WsjcppObjTreeNode
         virtual int getDataSize() override;
         virtual const char *getData() override;
+        virtual bool readDataPartFromFile(std::ifstream &f, std::string &sError) override;
         virtual std::string toString(const std::string &sIntent = "") override;
 
     private:

src/main.cpp

@@ -61,6 +61,13 @@ int main(int argc, const char* argv[]) {
 
     std::cout << tree.toString();
 
+    std::string sError;
+    tree.writeTreeToFile("some.obj-tree", sError);
+    tree.readTreeFromFile("some.obj-tree", sError);
+
+    std::cout << tree.toString();
+    WsjcppCore::removeFile("some.obj-tree");
+
     return 0;
 }
 

src/wsjcpp_obj_tree.cpp

@@ -99,6 +99,18 @@ bool WsjcppObjTree::readTreeFromFile(const std::string &sFilename, std::string &
     std::ifstream f;
     f.open(sFilename.c_str(), std::ios::in | std::ios::binary);
 
+    char sExpectedFileHeader[20];
+    f.read(sExpectedFileHeader, 20);
+    if (!f) {
+        sError = "readTreeFromFile. Could not read string len. File broken. Can read " + std::to_string(f.gcount());
+        return false;
+    }
+
+    if (std::string(sExpectedFileHeader,20) != "WSJCPP-OBJ-TREE-FILE") {
+        sError = "readTreeFromFile. Expected first 20 bytes of file like this WSJCPP-OBJ-TREE-FILE";
+        return false;
+    }
+
     uint32_t nTreeSize = 0;
     if (!this->readUInt32(f, nTreeSize, sError)) {
         return false;
@@ -167,6 +179,8 @@ bool WsjcppObjTree::writeTreeToFile(const std::string &sFilename, std::string &s
         std::cout << "FAILED could not create file to write " << sFilename << std::endl;
         return false;
     }
+    static const std::string sFileHeader = "WSJCPP-OBJ-TREE-FILE";
+    f.write(sFileHeader.c_str(), sFileHeader.length());
 
     // m_nLastId
     int nTreeSize = m_vNodes.size();

unit-tests.wsjcpp/data/readtreetest/example1.obj-tree

@@ -37,6 +37,9 @@ bool UnitTestReadTree::run() {
     std::string sError;
     bool bWrote = comp.readTreeFromFile(sFilename, sError);
     compareB(bTestSuccess, "read from file", bWrote, true);
+    if (!bWrote) {
+        WsjcppLog::err(TAG, sError);
+    }
 
     WsjcppLog::info(TAG, "\n" + comp.toString());
 

unit-tests.wsjcpp/data/tmp/example.obj-tree

@@ -73,7 +73,7 @@ bool UnitTestWriteTree::run() {
     int nBufferSize = 0;
     WsjcppCore::readFileToBuffer(sFilename, &pBuffer, nBufferSize);
 
-    compareN(bTestSuccess, "write to file", nBufferSize, 296);
+    compareN(bTestSuccess, "write to file", nBufferSize, 316);
 
     return bTestSuccess;
 }