From 37fc8b0cf3ce5ae72bf4fd0430a2b86974b546ac Mon Sep 17 00:00:00 2001 From: Eugene Lykov Date: Mon, 29 Dec 2025 13:59:23 +0000 Subject: [PATCH] Smallcase folders part 2 --- src/config/server/Config.cpp | 4 ++-- src/config/server/Config.h | 8 ++++---- src/display/graphics/Framebuffer.cpp | 2 +- src/display/graphics/Framebuffer.h | 4 ++-- src/display/graphics/Renderer.cpp | 2 +- src/display/graphics/Renderer.h | 12 ++++++------ src/display/ui/bar/Bar.cpp | 2 +- src/display/ui/bar/Bar.h | 8 ++++---- src/display/ui/bar/Style.h | 4 ++-- src/display/ui/header/Header.cpp | 10 +++++----- src/display/ui/header/Header.h | 6 +++--- src/display/ui/hostblock/HostBlock.cpp | 12 ++++++------ src/display/ui/hostblock/HostBlock.h | 10 +++++----- src/display/ui/text/Fonts.cpp | 4 ++-- src/display/ui/text/Fonts.h | 6 +++--- src/display/ui/text/Helpers.cpp | 2 +- src/display/ui/text/Renderer.cpp | 4 ++-- src/display/ui/text/Renderer.h | 8 ++++---- src/display/ui/theme/Theme.h | 2 +- src/helpers/Paths.cpp | 25 +++++++++++++++++++++++++ src/helpers/Paths.h | 22 ++-------------------- src/main/client/main.cpp | 10 +++++----- src/main/server/main.cpp | 14 +++++++------- src/metrics/Collector.cpp | 17 +++++++++-------- src/metrics/Collector.h | 8 ++++---- src/metrics/Disk.h | 1 + src/metrics/Host.cpp | 8 +++++--- src/metrics/Host.h | 6 +++--- src/model/HostRegistry.cpp | 2 +- src/model/HostRegistry.h | 2 +- src/network/client/Agent.cpp | 2 +- src/network/client/Agent.h | 4 ++-- src/network/client/Client.cpp | 2 +- src/network/client/Client.h | 2 +- src/network/common/Buffer.cpp | 2 +- src/network/server/Server.cpp | 4 ++-- src/network/server/Server.h | 2 +- 37 files changed, 127 insertions(+), 116 deletions(-) diff --git a/src/config/server/Config.cpp b/src/config/server/Config.cpp index 11eb3ca..6484641 100644 --- a/src/config/server/Config.cpp +++ b/src/config/server/Config.cpp @@ -1,5 +1,5 @@ -#include "Config/Server/Config.h" -#include "Config/Common/IniParser.h" +#include "config/server/Config.h" +#include "config/common/IniParser.h" #include namespace config::server diff --git a/src/config/server/Config.h b/src/config/server/Config.h index 51c6125..cfc0569 100644 --- a/src/config/server/Config.h +++ b/src/config/server/Config.h @@ -1,10 +1,10 @@ #pragma once #include -#include "Config/Server/BarStyleConfig.h" -#include "Config/Server/DisplayConfig.h" -#include "Config/Server/NetworkConfig.h" -#include "Config/Server/TextStyleConfig.h" +#include "config/server/BarStyleConfig.h" +#include "config/server/DisplayConfig.h" +#include "config/server/NetworkConfig.h" +#include "config/server/TextStyleConfig.h" namespace config::server { diff --git a/src/display/graphics/Framebuffer.cpp b/src/display/graphics/Framebuffer.cpp index e2d9129..0965896 100644 --- a/src/display/graphics/Framebuffer.cpp +++ b/src/display/graphics/Framebuffer.cpp @@ -1,4 +1,4 @@ -#include "Framebuffer.h" +#include "display/graphics/Framebuffer.h" #include #include #include diff --git a/src/display/graphics/Framebuffer.h b/src/display/graphics/Framebuffer.h index 4febde2..0a06d93 100644 --- a/src/display/graphics/Framebuffer.h +++ b/src/display/graphics/Framebuffer.h @@ -2,8 +2,8 @@ #include #include -#include "Display/Graphics/Color.h" -#include "Display/Graphics/FramebufferRotation.h" +#include "display/graphics/Color.h" +#include "display/graphics/FramebufferRotation.h" namespace display::graphics { diff --git a/src/display/graphics/Renderer.cpp b/src/display/graphics/Renderer.cpp index 9e040ce..203deed 100644 --- a/src/display/graphics/Renderer.cpp +++ b/src/display/graphics/Renderer.cpp @@ -1,4 +1,4 @@ -#include "Renderer.h" +#include "display/graphics/Renderer.h" namespace display::graphics { diff --git a/src/display/graphics/Renderer.h b/src/display/graphics/Renderer.h index e5665c7..b9c3d32 100644 --- a/src/display/graphics/Renderer.h +++ b/src/display/graphics/Renderer.h @@ -1,10 +1,10 @@ #pragma once -#include "Display/Graphics/Framebuffer.h" -#include "Model/HostRegistry.h" -#include "Display/UI/Text/Renderer.h" -#include "Display/UI/Header/Header.h" -#include "Display/UI/HostBlock/HostBlock.h" -#include "Display/Graphics/Color.h" +#include "display/graphics/Framebuffer.h" +#include "model/HostRegistry.h" +#include "display/ui/text/Renderer.h" +#include "display/ui/header/Header.h" +#include "display/ui/hostblock/HostBlock.h" +#include "display/graphics/Color.h" #include namespace display::graphics diff --git a/src/display/ui/bar/Bar.cpp b/src/display/ui/bar/Bar.cpp index 425a217..e1b1f86 100644 --- a/src/display/ui/bar/Bar.cpp +++ b/src/display/ui/bar/Bar.cpp @@ -1,4 +1,4 @@ -#include "Display/UI/Bar/Bar.h" +#include "display/ui/bar/Bar.h" #include namespace display::ui::bar diff --git a/src/display/ui/bar/Bar.h b/src/display/ui/bar/Bar.h index 9a5712f..04f6915 100644 --- a/src/display/ui/bar/Bar.h +++ b/src/display/ui/bar/Bar.h @@ -1,8 +1,8 @@ #pragma once -#include "Display/Graphics/Framebuffer.h" -#include "Display/Graphics/Color.h" -#include "Display/UI/Bar/Orientation.h" -#include "Display/UI/Bar/Style.h" +#include "display/graphics/Framebuffer.h" +#include "display/graphics/Color.h" +#include "display/ui/bar/Orientation.h" +#include "display/ui/bar/Style.h" namespace display::ui::bar { diff --git a/src/display/ui/bar/Style.h b/src/display/ui/bar/Style.h index ce11807..f0df4bb 100644 --- a/src/display/ui/bar/Style.h +++ b/src/display/ui/bar/Style.h @@ -1,7 +1,7 @@ #pragma once -#include "Display/Graphics/Color.h" -#include "Display/UI/Theme/Theme.h" +#include "display/graphics/Color.h" +#include "display/ui/theme/Theme.h" namespace display::ui::bar { diff --git a/src/display/ui/header/Header.cpp b/src/display/ui/header/Header.cpp index 6842a6e..3415b55 100644 --- a/src/display/ui/header/Header.cpp +++ b/src/display/ui/header/Header.cpp @@ -1,4 +1,4 @@ -#include "Display/UI/Header/Header.h" +#include "display/ui/header/Header.h" #include #include @@ -6,10 +6,10 @@ #include #include -#include "Display/UI/Bar/Orientation.h" -#include "Display/UI/Bar/Style.h" -#include "Display/UI/Theme/Theme.h" -#include "Display/Graphics/Color.h" +#include "display/ui/bar/Orientation.h" +#include "display/ui/bar/Style.h" +#include "display/ui/theme/Theme.h" +#include "display/graphics/Color.h" namespace display::ui::header { diff --git a/src/display/ui/header/Header.h b/src/display/ui/header/Header.h index cf9b183..e414494 100644 --- a/src/display/ui/header/Header.h +++ b/src/display/ui/header/Header.h @@ -3,9 +3,9 @@ #include #include -#include "Display/Graphics/Framebuffer.h" -#include "Display/Graphics/Color.h" -#include "Display/UI/Text/Renderer.h" +#include "display/graphics/Framebuffer.h" +#include "display/graphics/Color.h" +#include "display/ui/text/Renderer.h" namespace display::ui::header { diff --git a/src/display/ui/hostblock/HostBlock.cpp b/src/display/ui/hostblock/HostBlock.cpp index bbe3423..591a3f7 100644 --- a/src/display/ui/hostblock/HostBlock.cpp +++ b/src/display/ui/hostblock/HostBlock.cpp @@ -1,12 +1,12 @@ -#include "Display/UI/HostBlock/HostBlock.h" +#include "display/ui/hostblock/HostBlock.h" #include -#include "Display/UI/Bar/Orientation.h" -#include "Display/UI/Bar/Style.h" -#include "Display/UI/Theme/Theme.h" -#include "Display/Graphics/Color.h" -#include "Display/UI/Text/Helpers.h" +#include "display/ui/bar/Orientation.h" +#include "display/ui/bar/Style.h" +#include "display/ui/theme/Theme.h" +#include "display/ui/text/Helpers.h" +#include "display/graphics/Color.h" namespace display::ui::hostblock { diff --git a/src/display/ui/hostblock/HostBlock.h b/src/display/ui/hostblock/HostBlock.h index 05dd7bb..e9e515d 100644 --- a/src/display/ui/hostblock/HostBlock.h +++ b/src/display/ui/hostblock/HostBlock.h @@ -3,11 +3,11 @@ #include #include -#include "Display/Graphics/Framebuffer.h" -#include "Display/Graphics/Color.h" -#include "Display/UI/Text/Renderer.h" -#include "Display/UI/Bar/Bar.h" -#include "Metrics/Host.h" +#include "display/graphics/Framebuffer.h" +#include "display/graphics/Color.h" +#include "display/ui/text/Renderer.h" +#include "display/ui/bar/Bar.h" +#include "metrics/Host.h" namespace display::ui::hostblock { diff --git a/src/display/ui/text/Fonts.cpp b/src/display/ui/text/Fonts.cpp index 49f433b..73a6aef 100644 --- a/src/display/ui/text/Fonts.cpp +++ b/src/display/ui/text/Fonts.cpp @@ -1,10 +1,10 @@ -#include "Display/UI/Text/Fonts.h" +#include "display/ui/text/Fonts.h" #include #include FT_FREETYPE_H #include #include #include -#include "Helpers/Paths.h" +#include "helpers/Paths.h" namespace display::ui::text { diff --git a/src/display/ui/text/Fonts.h b/src/display/ui/text/Fonts.h index 64ac60e..eae9518 100644 --- a/src/display/ui/text/Fonts.h +++ b/src/display/ui/text/Fonts.h @@ -2,9 +2,9 @@ #include #include #include -#include "Display/UI/Text/Font.h" -#include "Display/UI/Text/Glyph.h" -#include "Display/UI/Text/GlyphKey.h" +#include "display/ui/text/Font.h" +#include "display/ui/text/Glyph.h" +#include "display/ui/text/GlyphKey.h" namespace display::ui::text { diff --git a/src/display/ui/text/Helpers.cpp b/src/display/ui/text/Helpers.cpp index 5d96bfc..7b9f6eb 100644 --- a/src/display/ui/text/Helpers.cpp +++ b/src/display/ui/text/Helpers.cpp @@ -1,4 +1,4 @@ -#include "Display/UI/Text/Helpers.h" +#include "display/ui/text/Helpers.h" #include diff --git a/src/display/ui/text/Renderer.cpp b/src/display/ui/text/Renderer.cpp index a9c1f7a..527ceaa 100644 --- a/src/display/ui/text/Renderer.cpp +++ b/src/display/ui/text/Renderer.cpp @@ -1,5 +1,5 @@ -#include "Display/UI/Text/Renderer.h" -#include "Display/UI/Text/UTFDecoder.h" +#include "display/ui/text/Renderer.h" +#include "display/ui/text/UTFDecoder.h" #include diff --git a/src/display/ui/text/Renderer.h b/src/display/ui/text/Renderer.h index c745b92..2de7526 100644 --- a/src/display/ui/text/Renderer.h +++ b/src/display/ui/text/Renderer.h @@ -1,9 +1,9 @@ #pragma once -#include "Display/Graphics/Framebuffer.h" -#include "Display/UI/Text/Fonts.h" -#include "Display/UI/Text/Font.h" -#include "Display/Graphics/Color.h" +#include "display/graphics/Framebuffer.h" +#include "display/graphics/Color.h" +#include "display/ui/text/Fonts.h" +#include "display/ui/text/Font.h" #include #include diff --git a/src/display/ui/theme/Theme.h b/src/display/ui/theme/Theme.h index f7aba2b..d5af862 100644 --- a/src/display/ui/theme/Theme.h +++ b/src/display/ui/theme/Theme.h @@ -1,6 +1,6 @@ #pragma once -#include "Display/Graphics/Color.h" +#include "display/graphics/Color.h" namespace display::ui::theme { diff --git a/src/helpers/Paths.cpp b/src/helpers/Paths.cpp index e69de29..6ccb512 100644 --- a/src/helpers/Paths.cpp +++ b/src/helpers/Paths.cpp @@ -0,0 +1,25 @@ +#include "helpers/Paths.h" + +namespace helpers +{ + std::filesystem::path getExecutablePath() + { + char buf[PATH_MAX]; + ssize_t len = readlink("/proc/self/exe", buf, sizeof(buf) - 1); + if (len == -1) + throw std::runtime_error("readlink(/proc/self/exe) failed"); + + buf[len] = '\0'; + return std::filesystem::path(buf); + } + + Paths initPaths() + { + Paths p; + p.exe = getExecutablePath(); + p.exeDir = p.exe.parent_path(); + p.configDir = p.exeDir / "config"; + p.assetsDir = p.exeDir / "assets"; + return p; + } +} // namespace helpers diff --git a/src/helpers/Paths.h b/src/helpers/Paths.h index bb364b1..fb90a91 100644 --- a/src/helpers/Paths.h +++ b/src/helpers/Paths.h @@ -6,17 +6,6 @@ namespace helpers { - std::filesystem::path getExecutablePath() - { - char buf[PATH_MAX]; - ssize_t len = readlink("/proc/self/exe", buf, sizeof(buf) - 1); - if (len == -1) - throw std::runtime_error("readlink(/proc/self/exe) failed"); - - buf[len] = '\0'; - return std::filesystem::path(buf); - } - struct Paths { std::filesystem::path exe; @@ -25,13 +14,6 @@ namespace helpers std::filesystem::path assetsDir; }; - Paths initPaths() - { - Paths p; - p.exe = getExecutablePath(); - p.exeDir = p.exe.parent_path(); - p.configDir = p.exeDir / "config"; - p.assetsDir = p.exeDir / "assets"; - return p; - } + std::filesystem::path getExecutablePath(); + Paths initPaths(); } // namespace helpers diff --git a/src/main/client/main.cpp b/src/main/client/main.cpp index 52d9f5a..6c298a3 100644 --- a/src/main/client/main.cpp +++ b/src/main/client/main.cpp @@ -2,11 +2,11 @@ #include #include -#include "Network/Client/Client.h" -#include "Network/Client/Agent.h" -#include "Metrics/Collector.h" -#include "Config/Client/Config.h" -#include "Config/Client/NetworkConfig.h" +#include "network/client/Client.h" +#include "network/client/Agent.h" +#include "metrics/Collector.h" +#include "config/client/Config.h" +#include "config/client/NetworkConfig.h" int main(int argc, char **argv) { diff --git a/src/main/server/main.cpp b/src/main/server/main.cpp index 912d7d4..2dd1703 100644 --- a/src/main/server/main.cpp +++ b/src/main/server/main.cpp @@ -2,13 +2,13 @@ #include #include -#include "Display/Graphics/Framebuffer.h" -#include "Model/HostRegistry.h" -#include "Network/Server/Server.h" -#include "Display/Graphics/Renderer.h" -#include "Config/Server/Config.h" -#include "Config/Server/DisplayConfig.h" -#include "Config/Server/NetworkConfig.h" +#include "display/graphics/Framebuffer.h" +#include "model/HostRegistry.h" +#include "network/server/Server.h" +#include "display/graphics/Renderer.h" +#include "config/server/Config.h" +#include "config/server/DisplayConfig.h" +#include "config/server/NetworkConfig.h" int main(int argc, char **argv) { diff --git a/src/metrics/Collector.cpp b/src/metrics/Collector.cpp index 500d0e8..b9429ab 100644 --- a/src/metrics/Collector.cpp +++ b/src/metrics/Collector.cpp @@ -1,4 +1,4 @@ -#include "Metrics/Collector.h" +#include "metrics/Collector.h" #include #include @@ -11,7 +11,7 @@ namespace metrics { - Collector::Collector(const std::vector &disks) : disks(disks) + Collector::Collector(const std::vector> &disks) : disks(disks) { } @@ -33,8 +33,8 @@ namespace metrics prevCpu = curCpu; host.memory = readMemory(); - for (const std::string &disk : disks) - host.disks.push_back(readDisk(disk.c_str())); + for (const std::vector &disk : disks) + host.disks.push_back(readDisk(disk)); readLoad(host.load1, host.load5, host.load15); host.uptime = readUptime(); host.hostname = readHostname(); @@ -126,13 +126,13 @@ namespace metrics return memory; } - Disk Collector::readDisk(const char *path) + Disk Collector::readDisk(const std::vector &disk) { struct statvfs vfs; - if (statvfs(path, &vfs) != 0) + if (statvfs(disk.at(1).c_str(), &vfs) != 0) { throw std::runtime_error( - std::string("statvfs failed for ") + path + ": " + + std::string("statvfs failed for ") + disk.at(1).c_str() + ": " + std::strerror(errno)); } @@ -141,7 +141,8 @@ namespace metrics uint64_t used = total - free; Disk d; - d.name = path; + d.name = disk.at(0); + d.path = disk.at(1); d.total = total; d.free = free; d.used = used; diff --git a/src/metrics/Collector.h b/src/metrics/Collector.h index f951b8e..c4585a3 100644 --- a/src/metrics/Collector.h +++ b/src/metrics/Collector.h @@ -1,14 +1,14 @@ #pragma once -#include "Metrics/Host.h" #include #include +#include "metrics/Host.h" namespace metrics { class Collector { public: - Collector(const std::vector &disks = {"/"}); + Collector(const std::vector> &disks = {{"R", "/"}}); explicit Collector(); Host collect(); @@ -24,10 +24,10 @@ namespace metrics std::pair> prevCpu; std::pair> readCpuTimes(); - const std::vector disks; + const std::vector> disks; float cpuLoad(const CpuTimes &prev, const CpuTimes &cur); Memory readMemory(); - Disk readDisk(const char *path = "/"); + Disk readDisk(const std::vector &disk = {"R", "/"}); void readLoad(float &l1, float &l5, float &l15); uint64_t readUptime(); std::string readHostname(); diff --git a/src/metrics/Disk.h b/src/metrics/Disk.h index 96b2aa5..ab301d2 100644 --- a/src/metrics/Disk.h +++ b/src/metrics/Disk.h @@ -6,6 +6,7 @@ namespace metrics struct Disk { std::string name; + std::string path; float used; float free; float total; diff --git a/src/metrics/Host.cpp b/src/metrics/Host.cpp index bb2a6ab..e58b71f 100644 --- a/src/metrics/Host.cpp +++ b/src/metrics/Host.cpp @@ -1,10 +1,10 @@ -#include "Metrics/Host.h" +#include "metrics/Host.h" #include #include #include -#include "Network/Common/Buffer.h" +#include "network/common/Buffer.h" namespace metrics { @@ -51,6 +51,7 @@ namespace metrics for (const auto &d : disks) { buf.writeString(d.name); + buf.writeString(d.path); buf.writeFloat(d.used); buf.writeFloat(d.total); } @@ -91,9 +92,10 @@ namespace metrics for (uint8_t i = 0; i < numDisks; ++i) { std::string name = buf.readString(); + std::string path = buf.readString(); float used = buf.readFloat(); float total = buf.readFloat(); - h.disks.push_back({name, used, total}); + h.disks.push_back({name, path, used, total}); } return h; diff --git a/src/metrics/Host.h b/src/metrics/Host.h index 89a18d2..036adb0 100644 --- a/src/metrics/Host.h +++ b/src/metrics/Host.h @@ -3,9 +3,9 @@ #include #include -#include "Metrics/Cpu.h" -#include "Metrics/Memory.h" -#include "Metrics/Disk.h" +#include "metrics/Cpu.h" +#include "metrics/Memory.h" +#include "metrics/Disk.h" namespace metrics { diff --git a/src/model/HostRegistry.cpp b/src/model/HostRegistry.cpp index 6d97729..ff52039 100644 --- a/src/model/HostRegistry.cpp +++ b/src/model/HostRegistry.cpp @@ -1,4 +1,4 @@ -#include "Model/HostRegistry.h" +#include "model/HostRegistry.h" namespace model { diff --git a/src/model/HostRegistry.h b/src/model/HostRegistry.h index 5441297..2b34b5f 100644 --- a/src/model/HostRegistry.h +++ b/src/model/HostRegistry.h @@ -2,7 +2,7 @@ #include #include #include -#include "Metrics/Host.h" +#include "metrics/Host.h" namespace model { diff --git a/src/network/client/Agent.cpp b/src/network/client/Agent.cpp index 825ba2e..f036057 100644 --- a/src/network/client/Agent.cpp +++ b/src/network/client/Agent.cpp @@ -1,4 +1,4 @@ -#include "Network/Client/Agent.h" +#include "network/client/Agent.h" #include namespace network diff --git a/src/network/client/Agent.h b/src/network/client/Agent.h index 4b99195..730bdbd 100644 --- a/src/network/client/Agent.h +++ b/src/network/client/Agent.h @@ -1,7 +1,7 @@ #pragma once -#include "Network/Client/Client.h" -#include "Metrics/Collector.h" +#include "network/client/Client.h" +#include "metrics/Collector.h" #include #include diff --git a/src/network/client/Client.cpp b/src/network/client/Client.cpp index 75d0a89..71c9eff 100644 --- a/src/network/client/Client.cpp +++ b/src/network/client/Client.cpp @@ -1,4 +1,4 @@ -#include "Network/Client/Client.h" +#include "network/client/Client.h" #include #include #include diff --git a/src/network/client/Client.h b/src/network/client/Client.h index f0a4aa9..4a5dad0 100644 --- a/src/network/client/Client.h +++ b/src/network/client/Client.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include "Metrics/Host.h" +#include "metrics/Host.h" namespace network { diff --git a/src/network/common/Buffer.cpp b/src/network/common/Buffer.cpp index 249552e..5674bb8 100644 --- a/src/network/common/Buffer.cpp +++ b/src/network/common/Buffer.cpp @@ -1,4 +1,4 @@ -#include "Network/Common/Buffer.h" +#include "network/common/Buffer.h" namespace network { diff --git a/src/network/server/Server.cpp b/src/network/server/Server.cpp index ba26467..c9a69d2 100644 --- a/src/network/server/Server.cpp +++ b/src/network/server/Server.cpp @@ -1,9 +1,9 @@ -#include "Network/Server/Server.h" +#include "network/server/Server.h" #include #include #include #include -#include "Metrics/Host.h" +#include "metrics/Host.h" namespace network { diff --git a/src/network/server/Server.h b/src/network/server/Server.h index 9c5e8a8..0316e03 100644 --- a/src/network/server/Server.h +++ b/src/network/server/Server.h @@ -1,5 +1,5 @@ #pragma once -#include "Model/HostRegistry.h" +#include "model/HostRegistry.h" #include #include #include