Implemented

Author: sea5kg

README.md

@@ -37,24 +37,38 @@ int main(int argc, char* argv[]) {
     WSJCppYAML yaml;
     if (yaml.loadFromString(
         "# yaml content\n"
-        "yaml: nice format\n"
+        "yaml1: nice format\n"
         "some-map: value1\n"
         "some-map2: value2\n"
         "some-array:\n"
         "  - test1 \n"
         "  - test2 \n"
+        "some-am: # array + map element \n"
+        "  - p1: v1 \n"
+        "    p2: v2 \n"
+        "  - p1: v3 \n"
+        "    p2: v4 \n"
+        "param2: 111\n"
     )) {
         WSJCppLog::throw_err(TAG, "Error parsing");
         return -1;
     }
 
-    std::cout << "yaml is " << yaml.getRoot()->getElement("yaml")->getValue() << std::endl;
-    std::cout << "some-map is " << yaml.getRoot()->getElement("some-map")->getValue() << std::endl;
-    std::cout << "some-map2 is " << yaml.getRoot()->getElement("some-map2")->getValue() << std::endl;
-    std::cout << "some-array has " << std::to_string(yaml.getRoot()->getElement("some-array")->getLength()) << std::endl;
-    std::cout << "some-array element 1 is " << yaml.getRoot()->getElement("some-array")->->getElement(0)->getValue() << std::endl;
-    std::cout << "some-array element 2 is " << yaml.getRoot()->getElement("some-array")->->getElement(1)->getValue() << std::endl;
+    std::cout << "yaml is " << yaml["yaml1"].getValue() << std::endl;
+    std::cout << "some-map is " << yaml["some-map"].getValue() << std::endl;
+    std::cout << "some-map2 is " << yaml["some-map2"].getValue() << std::endl;
+    std::cout << "some-array has " << std::to_string(yaml["some-array"].getLength()) << std::endl;
+    std::cout << "some-array element 0 is " << yaml["some-array"][0].getValue() << std::endl;
+    std::cout << "some-array element 1 is " << yaml["some-array"][1].getValue() << std::endl;
+    std::cout << "some-am has " << std::to_string(yaml["some-am"].getLength()) << std::endl;
+    std::cout << "some-am is array: " << (yaml["some-am"].isArray() ? "yes" : "no") << std::endl;
+    std::cout << "some-am has comment " << yaml["some-am"].getComment() << std::endl;
+    std::cout << "some-am element 0 : p1 is  " << yaml["some-am"][0]["p1"].getValue() << std::endl;
+    std::cout << "some-am element 0 : p2 is  " << yaml["some-am"][0]["p2"].getValue() << std::endl;
+    std::cout << "some-am element 1 : p1 is  " << yaml["some-am"][1]["p1"].getValue() << std::endl;
+    std::cout << "some-am element 1 : p2 is  " << yaml["some-am"][1]["p2"].getValue() << std::endl;
+
     return 0;
 }
 
-```
+```

src.wsjcpp/CMakeLists.txt

@@ -1,6 +1,6 @@
-# Automaticly generated by wsjcpp-yaml@0.0.1
+# Automaticly generated by wsjcpp-yaml@0.0.2
 
-add_definitions(-DWSJCPP_VERSION="0.0.1")
+add_definitions(-DWSJCPP_VERSION="0.0.2")
 add_definitions(-DWSJCPP_NAME="wsjcpp-yaml")
 
 # set(CMAKE_AUTOMOC ON)

src.wsjcpp/wsjcpp-core/wsjcpp_core.cpp

@@ -15,6 +15,7 @@
 #include <thread>
 #include <cstdint>
 #include <unistd.h>
+#include <streambuf>
 
 // ---------------------------------------------------------------------
 
@@ -282,7 +283,7 @@ bool WSJCppCore::makeDir(const std::string &sDirname) {
 
 bool WSJCppCore::writeFile(const std::string &sFilename, const std::string &sContent) {
 
-    std::ofstream f(sFilename, std::ios::out);
+    std::ofstream f(sFilename, std::ifstream::in);
     if (!f) {
         std::cout << "FAILED could not create file to wtite " << sFilename << std::endl;
         return false;
@@ -295,6 +296,24 @@ bool WSJCppCore::writeFile(const std::string &sFilename, const std::string &sCon
 
 // ---------------------------------------------------------------------
 
+bool WSJCppCore::readTextFile(const std::string &sFilename, std::string &sContent) {
+    
+    std::ifstream f(sFilename);
+    if (!f) {
+        std::cout << "FAILED could not open file to read " << sFilename << std::endl;
+        return false;
+    }
+
+    sContent = std::string(
+        (std::istreambuf_iterator<char>(f)),
+        std::istreambuf_iterator<char>()
+    );
+
+    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) {
@@ -307,6 +326,7 @@ bool WSJCppCore::writeFile(const std::string &sFilename, const char *pBuffer, co
 }
 
 
+
 // ---------------------------------------------------------------------
 
 std::string& WSJCppCore::ltrim(std::string& str, const std::string& chars) {

src.wsjcpp/wsjcpp-core/wsjcpp_core.h

@@ -36,7 +36,9 @@ class WSJCppCore {
         static std::vector<std::string> listOfFiles(const std::string &sDirname);     
         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 writeFile(const std::string &sFilename, const char *pBuffer, const int nBufferSize);
+        
 
         static std::string& ltrim(std::string& str, const std::string& chars = "\t\n\v\f\r ");
         static std::string& rtrim(std::string& str, const std::string& chars = "\t\n\v\f\r ");

src/main.cpp

@@ -14,8 +14,16 @@ int main(int argc, char* argv[]) {
     if (!WSJCppCore::dirExists(appLogPath)) {
         WSJCppCore::makeDir(appLogPath);
     }
-
-    // TODO load and check yaml format
+    WSJCppYAML yaml;
+    if (!yaml.loadFromFile("./wsjcpp.yml")) {
+        WSJCppLog::err(TAG, "Could not read data from file");
+        return -1;
+    }
+    
+    if (!yaml.saveToFile("./wsjcpp.yml")) {
+        WSJCppLog::err(TAG, "Could not save data to file");
+        return -1;
+    }
 
     return 0;
-}
+}