parse: add multiple color options in hexcodes colors

Author: Toni500github

cufetch.1

@@ -1,10 +1,60 @@
 .\" It was automatically generated by help2man 1.49.3 at the beggining
 .TH CUSTOMFETCH "1" "August 2024" "customfetch @VERSION@ branch @BRANCH@" "User Commands"
 .SH NAME
-customfetch \- A command\-line and GUI system information tool (or neofetch like program), which its focus point is customizability and perfomance
+customfetch \- A command\-line and GUI system information tool (or neofetch like program)
 .SH SYNOPSIS
 .B cufetch
 [\fI\,OPTION\/\fR]...
+.SH CONFIGURATION
+customfetch focus point is to be customizable and fast at the same time.
+.PP
+How does it work?
+.PP
+We got the config.toml file, in there we got an array variable called "layout". That's the variable where you customize how the infos should be displayed.
+.br
+You have 3 components: $<module.submod>, ${color}, $(bash command). They can be used in the ascii art text file and layout, but how to use them?
+.PP
+Here's a simple bare-minimal example:
+.br
+layout = [
+.br
+        "My OS is $<os.name>, and username is $<user.name>",
+.br
+        "The color of the following text will be ${red}red",
+.br
+        "And this is a $(echo \\"bash command\\")"
+.br
+]
+.PP
+The \fBInfo component $<>\fR let's you print a part of a module. All the modules and their parts are listed in the `--list-modules` argument
+.PP
+The \fBColor component ${}\fR is used for printing the text of a certain color.
+.br
+The colors can be: \fIblack\fR, \fIred\fR, \fIgreen\fR, \fIblue\fR, \fIcyan\fR, \fIyellow\fR, \fImagenta\fR, \fIwhite\fR and they can be configured in the config file.
+.br
+They can have hexcodes colors, e.g "#5522dd".
+.br
+It's possible to enable multiple options, put these symbols before '#':
+.br
+* \fBb\fR for making the color in the background
+.br
+* \fBu\fR for underline the text
+.br
+* \fB!\fR for making the text bold
+.br
+* \fBi\fR for making the text italic
+
+OR They can have ANSI escape codes, e.g "\\e[1;31m" and "\\e[38;5;160m" (\fBNOTE\fR: 256 colors ANSI escape codes, those that have \\e[38 or \\e[48, can't be used in GUI)
+.br
+You can also use them inside the component, like ${!#343345} or ${\\e[1;31m}.
+.PP
+To reset colors use ${0} or ${1} for reset and bold text.
+.br
+To instead use the colors that the ascii art logo uses, use ${auto} for getting the 1st color, ${auto4} for the 4th one and so on.
+.PP
+The \fBBash command component $()\fR speaks for itself. It can execute normal bash commands.
+.PP
+To escape any $ or bracket, just use \\
 .SH OPTIONS
 .TP
 \fB\-n\fR, \fB\-\-no\-display\fR
@@ -82,46 +132,6 @@ Syntax MUST be "name=value" with no space beetween "=", example: --color "foo=#4
 Thus replaces any instance of foo with #444333. Can be done with multiple colors separetly.
 .br
 Matter of fact, you can: --color "#hexcode=#anotherhexcode"
-.SH CONFIGURATION
-customfetch is a command\-line and GUI system information tool (or "neofetch like program"). It's focus point is being customizable and fast at the same time.
-.PP
-How does it work?
-.PP
-We got the config.toml file, in there we got an array variable called "layout". That's the variable where you customize how the infos should be displayed.
-.br
-You have 3 components: $<module.submod>, ${color}, $(bash command). They can be used in the ascii art text file and layout, but how to use them?
-.PP
-Here's a simple bare-minimal example:
-.br
-layout = [
-.br
-	"My OS is $<os.name>, and username is $<user.name>",
-.br
-	"The color of the following text will be ${red}red",
-.br
-	"And this is a $(echo \\"bash command\\")"
-.br
-]
-.PP
-The \fBInfo component $<>\fR let's you print a part of a module. All the modules and their parts are listed in the `--list-modules` argument
-.PP
-The \fBColor component ${}\fR is used for printing the text of a certain color.
-.br
-The colors can be: \fIblack\fR, \fIred\fR, \fIgreen\fR, \fIblue\fR, \fIcyan\fR, \fIyellow\fR, \fImagenta\fR, \fIwhite\fR and they can be configured in the config file.
-.br
-These can have hexcodes colors, e.g "#5522dd" or "!#888eed" for bold color text
-.br
-OR They can have ANSI escape codes, e.g "\\e[1;31m" and "\\e[38;5;160m" (\fBNOTE\fR: 256 colors ANSI escape codes, those that have \\e[38 or \\e[48, can't be used in GUI)
-.br
-You can also use them inside the component, like ${!#343345} or ${\\e[1;31m}.
-.PP
-To reset colors use ${0} or ${1} for reset and bold text.
-.br
-To instead use the colors that the ascii art logo uses, use ${auto} for getting the 1st color, ${auto4} for the 4th one and so on.   
-.PP
-The \fBBash command component $()\fR speaks for itself. It can execute normal bash commands.
-.PP
-To escape any $ or bracket, just use \\
 .SH BUGS
 \fR
 Report any bugs to \fIhttps://github.com/Toni500github/customfetch/issues\fR

include/config.hpp

@@ -72,7 +72,7 @@ class Config
     std::string getThemeValue(const std::string& value, const std::string& fallback) const;
     void        generateConfig(const std::string_view filename);
 
-    std::vector<std::string> getValueArrayStr(const std::string& value, const std::vector<std::string>& fallback);
+    std::vector<std::string> getValueArrayStr(const std::string_view value, const std::vector<std::string>& fallback);
 
     template <typename T>
     T getValue(const std::string& value, const T&& fallback) const
@@ -106,7 +106,14 @@ inline constexpr std::string_view AUTOCONFIG = R"#([config]
 
 # ${} is used for which color to use for colorizing the text
 # e.g "${red}hello world" will indeed print "hello world" in red (or the color you set in the variable)
-# you can even put a custom hex color e.g: ${#ff6622} (for bold text put ! before # e.g ${!#ff6622} )
+# you can even put a custom hex color e.g: ${#ff6622}
+#
+# It's possible to enable multiple options, put these symbols before '#':
+# * b, for making the color in the background
+# * u, for underline the text
+# * !, for making the text bold
+# * i, for making the text italic
+#
 # OR bash escape code colors e.g ${\e[1;32m} or ${\e[0;34m}.
 # For auto coloring, depending on the ascii logo colors, use ${auto}.
 # They can be used for different colors too. So for getting the 2nd color of the ascii logo,

include/parse.hpp

@@ -18,4 +18,12 @@ void addValueFromModule(systemInfo_t& sysInfo, const std::string& moduleName, co
 
 std::string getInfoFromName(const systemInfo_t& systemInfo, const std::string_view moduleName,
                             const std::string_view moduleValueName);
+
+// Function to combine multiple fmt::text_style arguments
+template <typename... Styles>
+void append_styles(fmt::text_style& current_style, Styles&&... styles)
+{
+    current_style = current_style | (styles | ...);
+}
+
 #endif

src/config.cpp

@@ -38,7 +38,7 @@ void Config::loadConfigFile(const std::string_view filename, colors_t& colors)
 
     // clang-format off
     // Idk but with `this->` looks more readable
-    this->layout            = this->getValueArrayStr("config.layout", {});
+    this->layout             = this->getValueArrayStr("config.layout", {});
     this->gui                = this->getValue<bool>("gui.enable", false);
     this->ascii_logo_type    = this->getValue<std::string>("config.ascii-logo-type", "");
     this->source_path        = this->getValue<std::string>("config.source-path", "os");
@@ -90,20 +90,21 @@ std::string Config::getThemeValue(const std::string& value, const std::string& f
     return this->tbl.at_path(value).value<std::string>().value_or(fallback);
 }
 
-std::vector<std::string> Config::getValueArrayStr(const std::string& value, const std::vector<std::string>& fallback)
+std::vector<std::string> Config::getValueArrayStr(const std::string_view          value,
+                                                  const std::vector<std::string>& fallback)
 {
     std::vector<std::string> ret;
 
     // https://stackoverflow.com/a/78266628
     const auto& array = tbl.at_path(value);
-    if (toml::array* array_it = array.as_array())
+    if (const toml::array* array_it = array.as_array())
     {
         array_it->for_each(
-            [&ret, value](auto&& el)
+            [&](auto&& el)
             {
-                if (toml::value<std::string>* str_elem = el.as_string())
+                if (const toml::value<std::string>* str_elem = el.as_string())
                 {
-                    toml::value<std::string> v = *str_elem;
+                    const toml::value<std::string>& v = *str_elem;
                     ret.push_back(v->data());
                 }
                 else

src/display.cpp

@@ -19,20 +19,23 @@
 std::string Display::detect_distro(const Config& config)
 {
     debug("/etc/os-release = \n{}", shell_exec("cat /etc/os-release"));
+
     if (!config.m_custom_distro.empty())
     {
         return fmt::format("{}/ascii/{}.txt", config.data_dir, config.m_custom_distro);
     }
     else
     {
+        const std::string& ascii_logo_type = (config.ascii_logo_type.empty() ? "" : "_" + config.ascii_logo_type);
+
         Query::System system;
         std::string   format;
 
-        format = fmt::format("{}/ascii/{}.txt", config.data_dir, str_tolower(system.os_id()) + (config.ascii_logo_type.empty() ? "" : "_" + config.ascii_logo_type));
+        format = fmt::format("{}/ascii/{}.txt", config.data_dir, str_tolower(system.os_id()) + ascii_logo_type);
         if (std::filesystem::exists(format))
             return format;
 
-        format = fmt::format("{}/ascii/{}.txt", config.data_dir, str_tolower(system.os_name()) + (config.ascii_logo_type.empty() ? "" : "_" + config.ascii_logo_type));
+        format = fmt::format("{}/ascii/{}.txt", config.data_dir, str_tolower(system.os_name()) + ascii_logo_type);
         if (std::filesystem::exists(format))
             return format;