misc: code stuff, nothing important

WE reached 300 commits in less than 5 months. Thanks yall for the support :)

Author: Toni500github

include/gui.hpp

@@ -18,7 +18,7 @@ namespace GUI
 class Window : public Gtk::Window
 {
 public:
-    Window(const Config& config, const colors_t& colors);
+    Window(const Config& config, const colors_t& colors, const std::string_view path);
     virtual ~Window();
 
 private:

src/gui.cpp

@@ -1,9 +1,9 @@
-#include <array>
 #ifdef GUI_MODE
 
 #define STB_IMAGE_IMPLEMENTATION
 #include <filesystem>
 #include <fstream>
+#include <array>
 
 #include "config.hpp"
 #include "display.hpp"
@@ -64,20 +64,16 @@ static std::vector<std::string> render_with_image(const Config& config, const co
     return layouts;
 }
 
-Window::Window(const Config& config, const colors_t& colors)
+Window::Window(const Config& config, const colors_t& colors, const std::string_view path)
 {
     set_title("customfetch - Higly customizable and fast neofetch like program");
     set_default_size(1000, 600);
-
-    std::string path = config.m_display_distro ? Display::detect_distro(config) : config.source_path;
-    if (!std::filesystem::exists(path) &&
-        !std::filesystem::exists((path = config.data_dir + "/ascii/linux.txt")))
-        die("'{}' doesn't exist. Can't load image/text file", path);
+    set_position(Gtk::WIN_POS_CENTER_ALWAYS);
 
     bool useImage = false;
 
     debug("Window::Window analyzing file");
-    std::ifstream f(path);
+    std::ifstream f(path.data());
     std::array<unsigned char, 32> buffer;
     f.read(reinterpret_cast<char*>(&buffer.at(0)), buffer.size());
     if (is_file_image(buffer.data()))
@@ -86,7 +82,7 @@ Window::Window(const Config& config, const colors_t& colors)
     // useImage can be either a gif or an image
     if (useImage && !config.m_disable_source)
     {
-        Glib::RefPtr<Gdk::PixbufAnimation> img = Gdk::PixbufAnimation::create_from_file(path);
+        Glib::RefPtr<Gdk::PixbufAnimation> img = Gdk::PixbufAnimation::create_from_file(path.data());
         m_img                                  = Gtk::manage(new Gtk::Image(img));
         m_img->set(img);
         m_img->set_alignment(Gtk::ALIGN_CENTER);

src/main.cpp

@@ -428,11 +428,25 @@ int main (int argc, char *argv[]) {
 
     config.m_display_distro = (config.source_path == "os");
 
+    std::string path = config.m_display_distro ? Display::detect_distro(config) : config.source_path;
+    if (!std::filesystem::exists(path) &&
+        !std::filesystem::exists((path = config.data_dir + "/ascii/linux.txt")))
+        die("'{}' doesn't exist. Can't load image/text file", path);
+
+    if (!config.ascii_logo_type.empty())
+    {
+        const size_t& pos = path.rfind('.');
+        if (pos != std::string::npos)
+            path.insert(pos, "_" + config.ascii_logo_type);
+        else
+            path += "_" + config.ascii_logo_type;
+    }
+
 #ifdef GUI_MODE
     if (config.gui)
     {
-        auto        app = Gtk::Application::create("org.toni.customfetch");
-        GUI::Window window(config, colors);
+        const Glib::RefPtr<Gtk::Application>& app = Gtk::Application::create("org.toni.customfetch");
+        GUI::Window window(config, colors, path);
         return app->run(window);
     }
 #else
@@ -441,16 +455,6 @@ int main (int argc, char *argv[]) {
             "Compile customfetch with GUI_MODE=1 or contact your distro to enable it");
 #endif
 
-    std::string path = config.m_display_distro ? Display::detect_distro(config) : config.source_path;
-    if (!config.ascii_logo_type.empty())
-    {
-        const size_t& pos = path.rfind('.');
-        if (pos != std::string::npos)
-            path.insert(pos, "_" + config.ascii_logo_type);
-        else
-            path += "_" + config.ascii_logo_type;
-    }
-
     Display::display(Display::render(config, colors, false, path));
 
     return 0;

src/parse.cpp

@@ -52,7 +52,7 @@ static std::array<std::string, 3> get_ansi_color(const std::string_view str, con
         col.erase(0, 2);
 
     debug("col = {}", col);
-    int n = std::stoi(col);
+    const int n = std::stoi(col);
 
     // unfortunatly you can't do bold and light in pango
     if ((n >= 100 && n <= 107) || (n >= 90 && n <= 97))
@@ -63,18 +63,17 @@ static std::array<std::string, 3> get_ansi_color(const std::string_view str, con
 
     // last number
     // https://stackoverflow.com/a/5030086
-    n = col.back() - '0';
 
-    switch (n)
+    switch (col.back())
     {
-        case 0: col = colors.gui_black;   break;
-        case 1: col = colors.gui_red;     break;
-        case 2: col = colors.gui_green;   break;
-        case 3: col = colors.gui_yellow;  break;
-        case 4: col = colors.gui_blue;    break;
-        case 5: col = colors.gui_magenta; break;
-        case 6: col = colors.gui_cyan;    break;
-        case 7: col = colors.gui_white;   break;
+        case '0': col = colors.gui_black;   break;
+        case '1': col = colors.gui_red;     break;
+        case '2': col = colors.gui_green;   break;
+        case '3': col = colors.gui_yellow;  break;
+        case '4': col = colors.gui_blue;    break;
+        case '5': col = colors.gui_magenta; break;
+        case '6': col = colors.gui_cyan;    break;
+        case '7': col = colors.gui_white;   break;
     }
 
     if (col[0] != '#')
@@ -536,7 +535,7 @@ void addValueFromModule(systemInfo_t& sysInfo, const std::string& moduleName, co
 {
 #define SYSINFO_INSERT(x) sysInfo[moduleName].insert({ moduleValueName, variant(x) })
     // yikes, here we go.
-    auto                                 moduleValue_hash = fnv1a16::hash(moduleValueName);
+    const  auto&                         moduleValue_hash = fnv1a16::hash(moduleValueName);
     static std::vector<std::uint16_t>    queried_gpus;
     static std::vector<std::string_view> queried_disks;
     static std::vector<std::string>      queried_themes_names;