query: auto: add new auto module name + change battery.capacity to battery.perc

finally fastfetch added auto detections like any other sysfetchs worth of note

Author: Toni500github

include/config.hpp

@@ -87,13 +87,16 @@ class Config
 
     // Variables of config file for
     // modules specific configs
-    // [uptime]
+    // [auto]
+    std::string auto_disks_fmt;
+
+    // [os.uptime]
     std::string uptime_d_fmt;
     std::string uptime_h_fmt;
     std::string uptime_m_fmt;
     std::string uptime_s_fmt;
 
-    // [pkgs]
+    // [os.pkgs]
     std::vector<std::string> pkgs_managers;
     std::vector<std::string> pacman_dirs;
     std::vector<std::string> flatpak_dirs;
@@ -141,11 +144,11 @@ class Config
      * @param fallback Default value if couldn't retrive value
      */
     template <typename T>
-    T getValue(const std::string_view value, const T&& fallback) const
+    T getValue(const std::string_view value, const T&& fallback, bool dont_expand_var = false) const
     {
         std::optional<T> ret = this->tbl.at_path(value).value<T>();
         if constexpr (toml::is_string<T>)  // if we want to get a value that's a string
-            return ret ? expandVar(ret.value()) : expandVar(fallback);
+            return ret ? expandVar(ret.value(), dont_expand_var) : expandVar(fallback, dont_expand_var);
         else
             return ret.value_or(fallback);
     }
@@ -267,14 +270,10 @@ layout = [
     "${auto}Font: $<theme-gtk-all.font>",
     "${auto}Cursor: $<theme.cursor>",
     "${auto}WM: $<user.wm_name>",
-    "${auto}DE: $<user.de_name>",
-    "${auto}Disk (/): $<disk(/)>",)#"
-#else
-    R"#(
-    "${auto}Disk (/): $<disk(/)>",
-    "${auto}Disk (/sdcard): $<disk(/storage/emulated/0)>",)#"
+    "${auto}DE: $<user.de_name>",)#"
 #endif
     R"#(
+    "$<auto.disk>",
     "${auto}Swap: $<swap>",
     "${auto}CPU: $<cpu>",
     "${auto}GPU: $<gpu>",
@@ -380,6 +379,19 @@ wrap-lines = false
 # e.g. falling back to gsettings when we can't find the config file for GTK
 slow-query-warnings = false
 
+# $<auto> config
+[auto]
+# Format for displaying the auto detected disks infos
+# %1 = mount directory
+# %2 = device path
+# %3 = type of filesystem
+# %4 = total amount of storage
+# %5 = free amount of storage
+# %6 = used amount of storage
+# %7 = percentage of used storage
+# %8 = percentage of free storage
+disk-fmt = "${auto}Disk (%1): $<disk(%1)>"
+
 # $<os.uptime> config
 [os.uptime]
 # how to display the name of the uptime

include/parse.hpp

@@ -27,44 +27,55 @@
 #define _PARSE_HPP
 
 #include <string>
+#include <unordered_map>
+#include <variant>
+#include <vector>
 
 #include "config.hpp"
-#include "query.hpp"
+
+// from query.hpp
+using systemInfo_t =
+    std::unordered_map<std::string, std::unordered_map<std::string, std::variant<std::string, size_t, double>>>;
 
 /* The additional args that parse() needs for getting the necessary infos/configs.
  * Only used for making the argument passing more clear.
  * Always pass it non-const and by reference
  */
 struct parse_args_t
 {
-    systemInfo_t&   systemInfo;
-    std::string&    pureOutput;
-    const Config&   config;
-    const colors_t& colors;
-    bool            parsingLayout;
-    bool            firstrun_clr  = true;
-    bool            no_more_reset = false;
-    std::string     endspan       = "";  // only for ANDROID_APP
+    systemInfo_t&             systemInfo;
+    std::string&              pureOutput;
+    std::vector<std::string>& layout;
+    std::vector<std::string>& tmp_layout;
+    const Config&             config;
+    const colors_t&           colors;
+    bool                      parsingLayout;
+    bool                      firstrun_clr  = true;
+    bool                      no_more_reset = false;
+    std::string               endspan       = "";  // only for ANDROID_APP
 };
 
 /* Parse input, in-place, with data from systemInfo.
  * Documentation on formatting is in the default config.toml file or the customfetch.1 manual.
  * @param input The string to parse
  * @param systemInfo The system infos
  * @param pureOutput The output of the string but without tags
+ * @param layout The layout of customfetch
+ * @param tmp_layout The temponary layout to be used for $<auto> modules
  * @param config The config
  * @param colors The colors
  * @param parsingLayout If we are parsing layout or not
  * @param no_more_reset If we are recursively parsing, e.g we are inside tags
  */
-std::string parse(std::string input, systemInfo_t& systemInfo, std::string& pureOutput, const Config& config,
-                  const colors_t& colors, const bool parsingLayout, bool& no_more_reset);
+std::string parse(std::string input, systemInfo_t& systemInfo, std::string& pureOutput,
+                  std::vector<std::string>& layout, std::vector<std::string>& tmp_layout,
+                  const Config& config, const colors_t& colors, const bool parsingLayout, bool& no_more_reset);
 
 // parse() for parse_args_t& arguments
-std::string parse(const std::string_view input, parse_args_t& parse_args);
+std::string parse(const std::string& input, parse_args_t& parse_args);
 // some times we don't want to use the original pureOutput,
 // so we have to create a tmp string just for the sake of the function arguments
-std::string parse(const std::string_view input, std::string& _, parse_args_t& parse_args);
+std::string parse(const std::string& input, std::string& _, parse_args_t& parse_args);
 
 /* Set module members values to a systemInfo_t map.
  * If the name of said module matches any module name, it will be added
@@ -85,14 +96,18 @@ void addValueFromModuleMember(const std::string& moduleName, const std::string&
 void addValueFromModule(const std::string& moduleName, parse_args_t& parse_args);
 
 /*
- * Return a module member value
+ * Return an info module member value
  * @param systemInfo The systemInfo_t map
  * @param moduleName The module name
  * @param moduleMemberName The module member name
  */
 std::string getInfoFromName(const systemInfo_t& systemInfo, const std::string_view moduleName,
                             const std::string_view moduleMemberName);
 
+
+std::string get_and_color_percentage(const float& n1, const float& n2, parse_args_t& parse_args,
+                                            const bool invert = false);
+
 // Function to combine multiple fmt::text_style arguments
 template <typename... Styles>
 void append_styles(fmt::text_style& current_style, Styles&&... styles)

include/query.hpp

@@ -31,8 +31,10 @@
 #include <string>
 #include <unordered_map>
 #include <variant>
+#include <vector>
 
 #include "config.hpp"
+#include "parse.hpp"
 #include "util.hpp"
 
 extern "C" {
@@ -254,7 +256,7 @@ class Battery
         std::string technology{ UNKNOWN };
         std::string capacity_level{ UNKNOWN };
         double      temp{ 0 };
-        double      capacity{ 0 };
+        double      perc{ 0 };
     };
 
     Battery();
@@ -264,7 +266,7 @@ class Battery
     std::string& status() noexcept;
     std::string& technology() noexcept;
     std::string& capacity_level() noexcept;
-    double&      capacity() noexcept;
+    double&      perc() noexcept;
     double&      temp() noexcept;
 
 private:
@@ -285,7 +287,8 @@ class Disk
         std::string mountdir;
     };
 
-    Disk(const std::string& path, systemInfo_t& queried_paths);
+    Disk(const std::string& path, systemInfo_t& queried_paths, parse_args_t& parse_args,
+         const bool auto_module = false);
 
     double&      total_amount() noexcept;
     double&      free_amount() noexcept;
@@ -294,7 +297,11 @@ class Disk
     std::string& device() noexcept;
     std::string& mountdir() noexcept;
 
+    std::vector<std::string>& disks_formats() noexcept
+    { return m_disks_formats; }
+
 private:
+    std::vector<std::string> m_disks_formats;
     static struct statvfs m_statvfs;
     static Disk_t         m_disk_infos;
 };

include/util.hpp

@@ -176,9 +176,10 @@ void ctrl_d_handler(const std::istream& cin);
 
 /* Replace special symbols such as ~ and $ (at the begging) in std::string
  * @param str The string
+ * @param dont Don't do it
  * @return The modified string
  */
-std::string expandVar(std::string ret);
+std::string expandVar(std::string ret, bool dont = false);
 
 /* Executes commands with execvp() and keep the program running without existing
  * @param cmd_str The command to execute

src/config.cpp

@@ -88,6 +88,8 @@ void Config::loadConfigFile(const std::string_view filename, colors_t& colors)
     this->font                = getValue<std::string>("gui.font", "Liberation Mono Normal 12");
     this->gui_bg_image        = getValue<std::string>("gui.bg-image", "disable");
 
+    this->auto_disks_fmt = getValue<std::string>("auto.disk-fmt", "${auto}Disk (%1): $<disk(%1)>", true);
+
     this->uptime_d_fmt = getValue<std::string>("os.uptime.days", " days");
     this->uptime_h_fmt = getValue<std::string>("os.uptime.hours", " hours");
     this->uptime_m_fmt = getValue<std::string>("os.uptime.mins", " mins");

src/display.cpp

@@ -26,6 +26,7 @@
 // Implementation of the system behind displaying/rendering the information
 
 #include "display.hpp"
+#include <cstddef>
 
 #ifndef GUI_MODE
 # define STB_IMAGE_IMPLEMENTATION
@@ -97,13 +98,23 @@ static std::vector<std::string> render_with_image(systemInfo_t& systemInfo, std:
     stbi_image_free(img);
 
     std::string  _;
-    parse_args_t parse_args{ systemInfo, _, config, colors, true };
-    for (std::string& line : layout)
+    std::vector<std::string> tmp_layout;
+    parse_args_t parse_args{ systemInfo, _, layout, tmp_layout, config, colors, true };
+    for (size_t i = 0; i < layout.size(); ++i)
     {
-        line = parse(line, parse_args);
-        if (!config.m_disable_colors)
-            line.insert(0, NOCOLOR);
+        layout[i] = parse(layout[i], parse_args);
         parse_args.no_more_reset = false;
+        if (!config.gui && !config.m_disable_colors)
+        {
+            layout[i].insert(0, NOCOLOR);
+        }
+
+        if (!tmp_layout.empty())
+        {
+            layout.erase(layout.begin()+i);
+            layout.insert(layout.begin()+i, tmp_layout.begin(), tmp_layout.end());
+            tmp_layout.clear();
+        }
     }
 
     // erase each element for each instance of MAGIC_LINE
@@ -116,9 +127,9 @@ static std::vector<std::string> render_with_image(systemInfo_t& systemInfo, std:
     const size_t height = image_height / font_height;
 
     if (config.m_image_backend == "kitty")
-        taur_exec({ "kitty", "+kitten", "icat", "--align",
-                    (config.logo_position == "top" ? "center" : config.logo_position), "--place",
-                    fmt::format("{}x{}@0x0", width, height), path });
+        taur_exec({ "kitty", "+kitten", "icat",
+                    "--align", (config.logo_position == "top" ? "center" : config.logo_position),
+                    "--place", fmt::format("{}x{}@0x0", width, height), path });
     else if (config.m_image_backend == "viu")
         taur_exec({ "viu", "-t", "-w", fmt::to_string(width), "-h", fmt::to_string(height), path });
     else
@@ -243,7 +254,8 @@ std::vector<std::string> Display::render(const Config& config, const colors_t& c
         // this is just for parse() to auto add the distro colors
         std::ifstream distro_file(distro_path);
         std::string   line, _;
-        parse_args_t  parse_args{ systemInfo, _, config, colors, false };
+        std::vector<std::string> tmp_layout;
+        parse_args_t  parse_args{ systemInfo, _, layout, tmp_layout, config, colors, false };
 
         while (std::getline(distro_file, line))
         {
@@ -296,7 +308,8 @@ std::vector<std::string> Display::render(const Config& config, const colors_t& c
     while (std::getline(file, line))
     {
         std::string  pureOutput;
-        parse_args_t parse_args{ systemInfo, pureOutput, config, colors, false };
+        std::vector<std::string> tmp_layout;
+        parse_args_t parse_args{ systemInfo, pureOutput, layout, tmp_layout, config, colors, false };
 
         std::string asciiArt_s   = parse(line, parse_args);
         parse_args.no_more_reset = false;
@@ -325,13 +338,23 @@ std::vector<std::string> Display::render(const Config& config, const colors_t& c
         return asciiArt;
 
     std::string  _;
-    parse_args_t parse_args{ systemInfo, _, config, colors, true };
-    for (std::string& line : layout)
+    std::vector<std::string> tmp_layout;
+    parse_args_t parse_args{ systemInfo, _, layout, tmp_layout, config, colors, true };
+    for (size_t i = 0; i < layout.size(); ++i)
     {
-        line                     = parse(line, parse_args);
+        layout[i] = parse(layout[i], parse_args);
         parse_args.no_more_reset = false;
         if (!config.gui && !config.m_disable_colors)
-            line.insert(0, NOCOLOR);
+        {
+            layout[i].insert(0, NOCOLOR);
+        }
+
+        if (!tmp_layout.empty())
+        {
+            layout.erase(layout.begin()+i);
+            layout.insert(layout.begin()+i, tmp_layout.begin(), tmp_layout.end());
+            tmp_layout.clear();
+        }
     }
 
     auto_colors.clear();

src/gui.cpp

@@ -87,19 +87,30 @@ static std::vector<std::string> render_with_image(const Config& config, const co
     // this is just for parse() to auto add the distro colors
     std::ifstream file(path, std::ios::binary);
     std::string   line, _;
-    parse_args_t  parse_args{ systemInfo, _, config, colors, false, true };
-
+    std::vector<std::string> tmp_layout;
+    parse_args_t  parse_args{ systemInfo, _, layout, tmp_layout, config, colors, false };
     while (std::getline(file, line))
     {
         parse(line, parse_args);
         parse_args.no_more_reset = false;
     }
 
     parse_args.parsingLayout = true;
-    for (std::string& line : layout)
+    for (size_t i = 0; i < layout.size(); ++i)
     {
-        line = parse(line, parse_args);
+        layout[i] = parse(layout[i], parse_args);
         parse_args.no_more_reset = false;
+        if (!config.gui && !config.m_disable_colors)
+        {
+            layout[i].insert(0, NOCOLOR);
+        }
+
+        if (!tmp_layout.empty())
+        {
+            layout.erase(layout.begin()+i);
+            layout.insert(layout.begin()+i, tmp_layout.begin(), tmp_layout.end());
+            tmp_layout.clear();
+        }
     }
 
     // erase each element for each instance of MAGIC_LINE

src/main.cpp

@@ -181,7 +181,7 @@ disk(/path/to/fs):
   CPU model name with number of virtual processors and max freq [AMD Ryzen 5 5500 (12) @ 4.90 GHz]
 
 battery:
-  battery current capacity and status [50.00% [Discharging]]
+  battery current percentage and status [50.00% [Discharging]]
 
 title:
   user and hostname colored with ${{auto2}} [toni@arch2]
@@ -344,7 +344,7 @@ cpu
 battery
   name:           battery model name
   temp:           battery temperature (by the chosen unit)
-  capacity:       battery current capacity
+  perc:           battery current percentage
   vendor:         battery manufacturer name
   status:         battery current status [Discharging, AC Connected]
   technology:     battery technology [Li-lion]
@@ -365,10 +365,7 @@ system
 
 static bool str_to_bool(const std::string_view str)
 {
-    if (str == "true" || str == "1" || str == "enable")
-        return true;
-
-    return false;
+    return (str == "true" || str == "1" || str == "enable");
 }
 
 // clang-format off