Smallcase folders part 1

src/CMakeLists.txt

@@ -2,13 +2,13 @@
 
 if (BUILD_SERVER OR BUILD_CLIENT)
     if (BUILD_SERVER)
-        add_subdirectory(Display)
+        add_subdirectory(display)
-        add_subdirectory(Model)
+        add_subdirectory(model)
     endif()
-    add_subdirectory(Helpers)
+    add_subdirectory(helpers)
-    add_subdirectory(Config)
+    add_subdirectory(config)
-    add_subdirectory(Metrics)
+    add_subdirectory(metrics)
-    add_subdirectory(Network)
+    add_subdirectory(network)
 
-    add_subdirectory(Main)
+    add_subdirectory(main)
 endif()

src/Display/CMakeLists.txt

@@ -1,4 +0,0 @@
-message(STATUS "·Configuring Display")
-
-add_subdirectory(Graphics)
-add_subdirectory(UI)

src/Display/UI/CMakeLists.txt

@@ -1,7 +0,0 @@
-message(STATUS "··Configuring UI")
-
-add_subdirectory(Bar)
-add_subdirectory(Text)
-add_subdirectory(Header)
-add_subdirectory(HostBlock)
-add_subdirectory(Theme)

src/config/CMakeLists.txt

@@ -1,9 +1,9 @@
 message(STATUS "·Configuring Config")
 
-add_subdirectory(Common)
+add_subdirectory(common)
 if (BUILD_SERVER)
-    add_subdirectory(Server)
+    add_subdirectory(server)
 endif()
 if (BUILD_CLIENT)
-    add_subdirectory(Client)
+    add_subdirectory(client)
 endif()

src/config/client/CollectorConfig.h

@@ -7,6 +7,6 @@ namespace config::client
 {
     struct CollectorConfig
     {
-        std::vector<std::string> disks{{"/"}};
+        std::vector<std::vector<std::string>> disks{{{"R", "/"}}};
     };
 } // namespace config::client

src/config/client/Config.cpp

@@ -1,5 +1,5 @@
-#include "Config/Client/Config.h"
+#include "config/client/Config.h"
-#include "Config/Common/IniParser.h"
+#include "config/common/IniParser.h"
 #include <sstream>
 
 namespace config::client
@@ -13,7 +13,11 @@ namespace config::client
         cfg.network.serverHost = ini.get("network", "server_host", "127.0.0.1");
         cfg.network.serverPort = std::stoi(ini.get("network", "server_port", "5005"));
         cfg.network.intervalMs = std::chrono::milliseconds(std::stoi(ini.get("network", "interval_ms", "1000")));
-        cfg.collector.disks = config::splitList(ini.get("collector", "disks", "/"));
+
+        const std::string disks_line = ini.get("collector", "disks", "R:/");
+        const std::vector<std::string> disks_vec = config::splitList(disks_line, ',');
+        for (const std::string &disk : disks_vec)
+            cfg.collector.disks.push_back(config::splitList(disk, ':'));
 
         return cfg;
     }

src/config/client/Config.h

@@ -1,8 +1,8 @@
 #pragma once
 #include <string>
-#include "Display/Graphics/Color.h"
+#include "display/graphics/Color.h"
-#include "Config/Client/NetworkConfig.h"
+#include "config/client/NetworkConfig.h"
-#include "Config/Client/CollectorConfig.h"
+#include "config/client/CollectorConfig.h"
 
 namespace config::client
 {

src/config/common/IniParser.cpp

@@ -1,4 +1,4 @@
-#include "Config/Common/IniParser.h"
+#include "config/common/IniParser.h"
 #include <fstream>
 #include <sstream>
 #include <algorithm>

src/config/common/IniParser.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <vector>
 #include <string>
+
 #include <unordered_map>
 
 namespace config

src/config/server/BarStyleConfig.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Display/Graphics/Color.h"
+#include "display/graphics/Color.h"
 
 namespace config::server
 {

src/display/CMakeLists.txt

@@ -0,0 +1,4 @@
+message(STATUS "·Configuring Display")
+
+add_subdirectory(graphics)
+add_subdirectory(ui)

src/display/ui/CMakeLists.txt

@@ -0,0 +1,7 @@
+message(STATUS "··Configuring UI")
+
+add_subdirectory(bar)
+add_subdirectory(text)
+add_subdirectory(header)
+add_subdirectory(hostblock)
+add_subdirectory(theme)

src/main/CMakeLists.txt

@@ -1,8 +1,8 @@
 message(STATUS "·Configuring Main")
 
 if (BUILD_SERVER)
-    add_subdirectory(Server)
+    add_subdirectory(server)
 endif()
 if (BUILD_CLIENT)
-    add_subdirectory(Client)
+    add_subdirectory(client)
 endif()

src/network/CMakeLists.txt

@@ -1,9 +1,9 @@
 message(STATUS "·Configuring Network")
 
-add_subdirectory(Common)
+add_subdirectory(common)
 if (BUILD_SERVER)
-    add_subdirectory(Server)
+    add_subdirectory(server)
 endif()
 if (BUILD_CLIENT)
-    add_subdirectory(Client)
+    add_subdirectory(client)
 endif()