refactor next stages

Author: lizewskik

.vscode/settings.json

@@ -70,6 +70,7 @@
         "typeindex": "cpp",
         "list": "cpp",
         "filesystem": "cpp",
-        "shared_mutex": "cpp"
+        "shared_mutex": "cpp",
+        "armadillo": "cpp"
     }
 }

CMakeLists.txt

@@ -49,6 +49,7 @@ set(SOURCES
     src/filewriter.cpp
     src/graphconverter.cpp
     src/filesystemutils.cpp
+    src/resourcelocation.cpp
 )
 
 add_executable(${PROJECT_NAME} ${SOURCES})

config.ini

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

include/filesystemutils.hpp

@@ -10,8 +10,8 @@
 class FilesystemUtils
 {  
 public:
-    bool create_directory(std::filesystem::path path, std::string directory_name) const;
-    bool create_directories(std::filesystem::path path) const;
+    static bool create_directory(std::filesystem::path path, std::string directory_name);
+    static bool create_directories(std::filesystem::path path);
 };
 
 

include/gfile.hpp

@@ -3,8 +3,12 @@
 #ifndef GFILE_H
 #define GFILE_H
 
+#include "fileio.hpp"
 #include "graphcharacteristics.hpp"
+#include "resourcelocation.hpp"
+#include <boost/algorithm/string.hpp>
 #include <filesystem>
+#include <vector>
 #include <string>
 
 namespace sfs = std::filesystem;
@@ -13,20 +17,23 @@ class GFile
 {
 private:
     sfs::path path;
+    sfs::path target_path;
     GraphCharacteristics characteristics;
 
 public:
-    GFile(){}; // to delete after implementation
-    virtual ~GFile() = default; // make this type polymorphic
+    GFile(){};
     GFile(const sfs::path filepath);
+    virtual ~GFile() = default;
 
-    const sfs::path relative_toward(const sfs::path base_path) const;
-    const sfs::path absolute() const;
+    virtual void build_target_absolute(const ResourceLocation resource) = 0;
+    virtual std::string build_target_filename() const = 0;
 
-    // getters
+    const sfs::path absolute() const;
     const sfs::path get_path() const;
+    const sfs::path get_target_path() const;
+    void set_target_path(std::filesystem::path target_path);
     const GraphCharacteristics get_characteristics() const;
+    const sfs::path relative_toward(const sfs::path base_path) const;
 };
 
-
 #endif //GFILE_H

include/graphconverter.hpp

@@ -11,6 +11,7 @@
 #include "graphwriter.hpp"
 #include "groundreader.hpp"
 #include "groundwriter.hpp"
+#include "resourcelocation.hpp"
 #include "filesystemutils.hpp"
 #include "filereader.hpp"
 #include <boost/log/trivial.hpp>
@@ -23,18 +24,15 @@ class GraphConverter
     GReader reader;
     GWriter writer;
     FileReader config;
-    FilesystemUtils fs_utils;
-    std::filesystem::path source_db_uri;
-    std::filesystem::path target_db_uri;
-    std::filesystem::path ground_db_uri;
+    // FilesystemUtils fs_utils;
+    ResourceLocation resource;
 
 public:
     GraphConverter();
     void preactions() const;
     void postactions();
     void convert();
 private:
-    void base_procedure(std::filesystem::path path, std::function<void(std::filesystem::path path)> procedure);
     void create_required_directories(std::filesystem::path path) const;
 };
 

include/graphreader.hpp

@@ -5,12 +5,13 @@
 
 #include "ireadable.hpp"
 #include "vgraphfile.hpp"
+#include "vgraphfile.hpp"
 #include <memory>
 
 class GraphReader : public IReadable
 {
 public:
-    virtual GFile read(GFile &file);
+    virtual GFile* read(GFile &file);
 private:
     unsigned short read_word(FILE* in) const;
     void read_graph(FILE* in, VGraphFile &file) const;

include/greader.hpp

@@ -10,12 +10,12 @@
 class GReader
 {
 private:
-    std::unique_ptr<IReadable> gcontext;
+    IReadable* gcontext;
 public:
-    explicit GReader(std::unique_ptr<IReadable> &&gcontext = {}) : gcontext(std::move(gcontext)){};
-    void set_context(std::unique_ptr<IReadable> &&gcontext);
-    GFile read(GFile &file) const;
+    GReader(){};
+    GReader(IReadable &gcontext);
+    void set_context(IReadable &gcontext);
+    GFile* read(GFile &file) const;
 };
 
-
 #endif //G_READER_H

include/groundfile.hpp

@@ -4,15 +4,24 @@
 #define GROUND_FILE_H
 
 #include "gfile.hpp"
+#include "itargetable.hpp"
 #include <map>
 
-class GroundFile : public GFile
+class GroundFile : public GFile//, public ITargetable
 {
 private:
     std::map<std::string, int> adjacencies;
 
 public:
-    GroundFile(const std::filesystem::path path); 
+    GroundFile() {}; // to delete after full implementation
+    GroundFile(const std::filesystem::path path) : GFile(path) {};
+
+    virtual void build_target_absolute(const ResourceLocation resource) override;
+    virtual std::string build_target_filename() const override;
+
+    // getters, setters
+    const std::map<std::string, int> get_adjacencies() const;
+    void set_adjacencies(std::map<std::string, int> adjacencies);
 };
 
 

include/groundreader.hpp

@@ -4,11 +4,12 @@
 #define GRAOUND_READER_H
 
 #include "ireadable.hpp"
+#include "groundfile.hpp"
 
 class GroundReader : public IReadable
 {
 public:
-    virtual GFile read(GFile &file);
+    virtual GFile* read(GFile &file);
 private:
 };