directory structuring, program code refactoring

Author: lizewskik

config.ini

@@ -1,3 +1,3 @@
 [database]
-source=
-target=
+source=C:/Users/Kacper/Desktop/DBGRAPH/graphs/db/bin
+target=D:/test2

include/fileio.hpp

@@ -8,6 +8,7 @@
 #include <filesystem>
 #include <vector>
 #include <map>
+#include <cassert>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/ini_parser.hpp>
@@ -36,6 +37,10 @@ class FileIO {
     // file handling constants
     static const char* READ_BINARY;
     static const char* SPLIT_REGEX;
+
+    // graph files specific constants
+    static const std::string FIRST_FROM_PAIR;
+    static const std::string SECOND_FROM_PAIR;
 };
 
 #endif //FILE_IO_H

include/filewriter.hpp

@@ -11,9 +11,8 @@ class FileWriter : public FileIO {
 
 public:
     void create_required_directories(const std::string& target_path) const;
-
-private:
     void create_directory(const std::string &parent_path, const std::string &directory_name) const;
+    bool create_directories(const std::string &fullpath) const;
 };
 
 #endif //FILE_WRITER_H

include/graphfile.hpp

@@ -13,10 +13,23 @@ class GraphFile : public GraphFileBase {
     std::string group;
     std::string size_group;
     std::string ordinal;
+    std::string pair_label;
+    std::string pair_id;
 
 public:
     GraphFile(std::filesystem::path& path, const std::string source_db_uri, const std::string target_db_uri);
     const std::string build_target_absolute() const;
+
+    // getters
+    const std::string get_congruence() const;
+    const std::string get_group() const;
+    const std::string get_size_group() const;
+    const std::string get_ordinal() const;
+    const std::string get_pair_label() const;
+    const std::string get_pair_id() const;
+
+private:
+    void set_pair_characteristics();
 };
 
 #endif //GRAPH_FILE_DETAILS

include/graphfilebase.hpp

@@ -4,11 +4,13 @@
 #define GRAPH_FILE_H
 
 #include "filereader.hpp"
+#include "filewriter.hpp"
 
 class GraphFileBase : public FileIO {
 
 private:
     FileReader reader;
+    FileWriter writer;
 
     std::string filename;
     std::string relative;
@@ -31,6 +33,7 @@ class GraphFileBase : public FileIO {
     const std::string get_source_db_uri() const;
     const std::string get_target_db_uri() const;
     const FileReader get_reader() const;
+    const FileWriter get_writer() const;
 
     // setters
     void set_target_absolute(std::string target_absolute);

include/graphio.hpp

@@ -25,7 +25,8 @@ class GraphIO {
     static const int ALL_GRAPH_AMOUNT;
 
     GraphIO();
-    void do_preactions() const;
+    void preactions() const;
+    void postactions() const;
     void convert() const;
 
 public:

src/application.cpp

@@ -3,6 +3,7 @@
 void Application::run()
 {
     GraphIO graphio;
-    graphio.do_preactions();
+    graphio.preactions();
     graphio.convert();
+    graphio.postactions();
 }

src/fileio.cpp

@@ -12,4 +12,7 @@ const std::string FileIO::CSV_EXTENSION = ".csv";
 const std::string FileIO::UNDERSCORE = "_";
 
 const char* FileIO::READ_BINARY = "rb";
-const char* FileIO::SPLIT_REGEX = "_.";
+const char* FileIO::SPLIT_REGEX = "_.";
+
+const std::string FileIO::FIRST_FROM_PAIR = "A";
+const std::string FileIO::SECOND_FROM_PAIR = "B";

src/filewriter.cpp

@@ -15,6 +15,15 @@ void FileWriter::create_directory(const std::string &parent_path, const std::str
     std::filesystem::create_directories(target_path);
 }
 
+bool FileWriter::create_directories(const std::string &fullpath) const
+{
+	std::filesystem::path target_fullpath(fullpath);
+	if (std::filesystem::exists(target_fullpath) && std::filesystem::is_directory(fullpath)) {
+		return false;
+	}
+    return std::filesystem::create_directories(target_fullpath);
+}
+
 void FileWriter::create_required_directories(const std::string &target_path) const
 {
     std::vector<std::string> bvg_vec {

src/graphfile.cpp

@@ -10,16 +10,67 @@ GraphFile::GraphFile(std::filesystem::path &path, const std::string source_db_ur
     this->group = filename_parts.at(1);
     this->size_group = filename_parts.at(2);
     this->ordinal = filename_parts.at(3);
+    set_pair_characteristics();
 
     this->set_target_filename(boost::algorithm::join(filename_parts, FileIO::UNDERSCORE).append(FileIO::CSV_EXTENSION));
     this->set_target_absolute(this->build_target_absolute());
 }
 
 const std::string GraphFile::build_target_absolute() const
 {
-    std::string target_uri = this->get_target_db_uri();
-    return target_uri
+    std::string base_uri = this->get_target_db_uri();
+
+    std::string target_path = base_uri
         .append(this->get_relative())
+        .append(FileIO::UNIX_SEPARATOR)
+        .append(this->get_size_group())
+        .append(FileIO::UNIX_SEPARATOR)
+        .append(this->get_pair_id());
+
+    this->get_writer().create_directories(target_path);
+
+    return target_path
         .append(FileIO::UNIX_SEPARATOR)
         .append(this->get_target_filename());
 }
+
+// getters
+
+const std::string GraphFile::get_congruence() const
+{
+    return this->congruence;
+}
+
+const std::string GraphFile::get_group() const
+{
+    return this->group;
+}
+
+const std::string GraphFile::get_size_group() const
+{
+    return this->size_group;
+}
+
+const std::string GraphFile::get_ordinal() const
+{
+    return this->ordinal;
+}
+
+const std::string GraphFile::get_pair_label() const
+{
+    return this->pair_label;
+}
+
+const std::string GraphFile::get_pair_id() const
+{
+    return this->pair_id;
+}
+
+// private methods
+
+void GraphFile::set_pair_characteristics()
+{
+    assert(this->ordinal.length() == 3);
+    this->pair_label = this->ordinal.substr(0,1);
+    this->pair_id = this->ordinal.substr(1);
+}