Another big change set. I refrain from using the term "doozy" each time it gets this big.

Started implementing an API layer, currently only adding, clearing, saving, and loading factions is supported. Pulled the relevant startup code out of the console driver and into the API.

Restructued some of the code. Gto rid of the ConfigManager class and library, making Config loading handled by the API layer on startup.

Moved third-party header-only libraries to the top-level include folder (only the Catch header and spdlog libs currently).

Added the spdlog logging library.

Author: sensualcoder

.vscode/c_cpp_properties.json

@@ -34,14 +34,16 @@
                 "/usr/lib/gcc/x86_64-pc-linux-gnu/7.2.0/include-fixed",
                 "/usr/include",
                 "${workspaceRoot}",
-                "${workspaceRoot}/Configuration/include",
+                "${workspaceRoot}/include",
                 "${workspaceRoot}/DataAccess/include",
                 "${workspaceRoot}/DiceRoll/include",
                 "${workspaceRoot}/FactionControl/include",
                 "${workspaceRoot}/HexGrid/include",
                 "${workspaceRoot}/Models/include",
                 "${workspaceRoot}/SectorGen/include",
-                "${workspaceRoot}/SGT/include"
+                "${workspaceRoot}/SwnGmToolAPI/include",
+                "${workspaceRoot}/Driver/include",
+                "${workspaceRoot}/Tests/include"
             ],
             "defines": [],
             "intelliSenseMode": "clang-x64",

CMakeLists.txt

@@ -9,10 +9,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O2")
 option(BUILD_DRIVER "Build driver" ON)
 option(BUILD_TESTS "Build tests" ON)
 
-# Configuration lib
-include_directories(${PROJECT_SOURCE_DIR}/Configuration/include)
-add_subdirectory(Configuration)
-
 # Data Access lib
 include_directories(${PROJECT_SOURCE_DIR}/DataAccess/include)
 add_subdirectory(DataAccess)
@@ -36,9 +32,13 @@ include_directories(${PROJECT_SOURCE_DIR}/Models/include)
 include_directories(${PROJECT_SOURCE_DIR}/SectorGen/include)
 add_subdirectory(SectorGen)
 
-# SGT (Driver)
-include_directories(${PROJECT_SOURCE_DIR}/SGT/include)
-add_subdirectory(SGT)
+# SwnGmToolAPI
+include_directories(${PROJECT_SOURCE_DIR}/SwnGmToolAPI/include)
+add_subdirectory(SwnGmToolAPI)
+
+# Driver
+include_directories(${PROJECT_SOURCE_DIR}/Driver/include)
+add_subdirectory(Driver)
 
 # Tests
 if(BUILD_TESTS)
@@ -47,7 +47,8 @@ endif(BUILD_TESTS)
 
 if(BUILD_DRIVER)
     # Add all extra libs
-    set(EXTRA_LIBS ${EXTRA_LIBS} Configuration DataAccess DiceRoll HexGrid FactionControl SectorGen SGT)
+    set(EXTRA_LIBS ${EXTRA_LIBS} DataAccess DiceRoll HexGrid FactionControl SectorGen SwnGmToolAPI Driver)
+    set(EXTRA_LIBS ${EXTRA_LIBS} pthread)
 
     include_directories(${PROJECT_SOURCE_DIR}/include)
     set(SOURCES main.cpp)

Configuration/CMakeLists.txt

@@ -10,7 +10,6 @@
 #include <cereal/archives/json.hpp>
 
 #include <fmt/format.h>
-#include <fmt/printf.h>
 
 namespace SwnGmTool
 {
@@ -30,7 +29,7 @@ namespace SwnGmTool
                 }
                 catch(cereal::RapidJSONException ex)
                 {
-                    fmt::printf("Error saving: {0}\n", ex.what() );
+                    //fmt::printf("Error saving: {0}\n", ex.what() );
                     throw(ex);
                 }
             }
@@ -45,7 +44,7 @@ namespace SwnGmTool
                 }
                 catch(cereal::RapidJSONException ex)
                 {
-                    fmt::printf("Error loading: {0}\n", ex.what() );
+                    //fmt::printf("Error loading: {0}\n", ex.what() );
                     throw(ex);
                 }
             }

Configuration/include/ConfigManager.hpp

@@ -0,0 +1,5 @@
+include_directories(${PROJECT_SOURCE_DIR}/include)
+
+set(SOURCES src/Driver.cpp)
+
+add_library(Driver SHARED ${SOURCES})

Configuration/src/ConfigManager.cpp

@@ -0,0 +1,55 @@
+#ifndef DRIVER_HPP
+#define DRIVER_HPP
+
+#include <iostream>
+#include <memory>
+#include <vector>
+
+#include "spdlog/spdlog.h"
+
+#include "MenuOptions.hpp"
+#include "SwnGmToolAPI.hpp"
+
+namespace Driver
+{
+    class Driver
+    {
+        public:
+            Driver();
+
+            bool Init();
+            void Run();
+
+            void PrintMenu(const std::vector<MenuOption>&);
+            void PrintMainMenu();
+            void PrintFactionMenu();
+
+            void GetMainMenuInput(std::istream& = std::cin);
+            void GetFactionControlInput(std::istream& = std::cin);
+
+            void RunFactionControl();
+            void ShowFactionList();
+            void AddFaction(std::istream& = std::cin);
+            void RemoveFaction(std::istream& = std::cin);
+            void ClearFactionlist();
+
+            void RunAssetControl();
+            void AddAsset();
+            void RemoveAsset();
+            void RemoveAllAssetsOfType();
+            void ClearAssetList();
+
+            void Save(std::ostream& = std::cout);
+            void Load(std::istream& in = std::cin);
+
+        private:
+            std::shared_ptr<spdlog::logger> _clogger;          
+            std::unique_ptr<SwnGmTool::SwnGmToolAPI> SGTAPI;
+            
+            bool IsRunning;
+            bool IsRunningFC;
+            bool IsRunningAC;
+    };
+}
+
+#endif

DataAccess/include/FileAccess.hpp

@@ -15,7 +15,7 @@ namespace Driver
     const std::vector<MenuOption> MainMenuOptions
     {
         { '1', "Manage Factions" },
-        //{ '2', "Manage Sector" },
+        { '2', "Manage Sector" },
         { 'Q', "Quit" }
     };