Merge pull request #38 from SPauly/iss34

Closes #34 #37

Author: SPauly

GetIntoCPPAgain.exe

@@ -80,27 +80,40 @@ namespace csv
     {
         _header_size = this->size();
         _header_ptr = m_data.data();
+        m_header = _row;
     };
 
+    std::string_view Header::string(){
+        return m_header;
+    }
+
     //end class Header
 
     //class CSVParser
     CSVParser::CSVParser(const std::string *PATH_ptr, Header& _header_structure)
     {
+        //initialize important references before exceptions
+        m_CURRENT_FILE = *PATH_ptr;
+        _ptr_header = &_header_structure;
         m_DATABASE.exceptions(std::fstream::failbit);
 
         try
         {
-            m_CURRENT_FILE = *PATH_ptr;
+
             //open csv file
             m_DATABASE.open(*PATH_ptr, std::ios::in | std::ios::out | std::ios::binary);
 
             //init header of file
             std::string *tmp_line = new std::string;
             tmp_line->clear();
             fm::_getline(m_DATABASE, *tmp_line);
-            _ptr_header = new Header(*tmp_line);
+            if(*tmp_line != _header_structure.string()){
+                m_DATABASE.seekp(0, std::ios::beg);
+                m_DATABASE << _header_structure.string() << "\r\n";    //temporary solution!!! Use insert in file function here instead
+                m_DATABASE.flush();
+            }
             tmp_line->clear();
+
             //check m_DATABASE for consistency
 
             //init m_content
@@ -118,17 +131,13 @@ namespace csv
             delete tmp_line;
             m_DATABASE.clear();
             m_DATABASE.flush();
+            
             _csvgood = true;
         }
         catch (const std::fstream::failure &e)
         {
             try{
-                m_DATABASE.open(*PATH_ptr, std::ios::in | std::ios::out | std::ios::binary | std::ios::app);
-                addRow(_header_structure);
-                _ptr_header = &_header_structure;
-
-                m_DATABASE.clear();
-                m_DATABASE.flush();
+                m_create_database();
                 _csvgood = true;
             }
             catch (const std::fstream::failure &e){
@@ -147,7 +156,6 @@ namespace csv
         _csvgood = false;
         m_DATABASE.close();
         m_content.clear();
-        delete _ptr_header;
     }
 
     const unsigned int CSVParser::size() {
@@ -210,6 +218,16 @@ namespace csv
         return false;
     }
 
+    std::fstream &CSVParser::m_create_database()
+    {
+        m_DATABASE.open(m_CURRENT_FILE, std::ios::in | std::ios::out | std::ios::binary | std::ios::app);
+        addRow(*_ptr_header);
+
+        m_DATABASE.clear();
+        m_DATABASE.flush();
+        return m_DATABASE;
+    }
+
 #ifdef _DEBUG_CSV
     void CSVParser::print_csv()
     {

src/CSVParser.cpp

@@ -48,11 +48,14 @@ namespace csv
 
     class Header : public Row
     {
+    private:
+        std::string m_header;
     public:
         Header() = delete;
         Header(std::string_view);
         Header(std::string_view, Row*) = delete;
 
+        std::string_view string();
     public:
         _HEADER_TYPE _header_size;
         std::string *_header_ptr;
@@ -76,12 +79,13 @@ namespace csv
     public:
         Header *_ptr_header;
         bool _csvgood;
-    private:
-        //void m_check_consistency();
+
     private:
         std::string m_CURRENT_FILE;
         std::fstream m_DATABASE;
         std::vector<Row> m_content;
+    private:
+        std::fstream& m_create_database();
     };
 
 } // namespace csv

src/CSVParser.h

@@ -18,7 +18,6 @@ int main() {
 		lib.run_library();
 		//allow the user to do something with the application
 		//user->log_activity();
-		//user->logout();
 		//user->get_activity();
 		std::cin.get();
 		delete user;