misc: improve docs + more compile-time in pci.ids.hpp

also remove trailing newline when executing the command tag

Author: Toni500github

include/pci.ids.hpp

@@ -7,11 +7,11 @@
 #if !CF_ANDROID
 
 #include <array>
-#include <string>
+#include <string_view>
 
-inline constexpr std::array<std::string_view, 2424> get_pci_vendors_array()
-{
-    return {
+using namespace std::string_view_literals;
+
+inline constexpr std::array<std::string_view, 2424> pci_vendors_array = {
         "0001", "0010", "0014", "0018", "001c", "003d", "0059", "0070", "0071", "0095", "00a7", "0100", "0123", "0128",
         "018a", "01de", "0200", "021b", "025e", "0270", "0291", "02ac", "02e0", "0303", "0308", "0315", "0357", "0432",
         "0497", "060e", "0675", "0709", "0721", "0731", "0777", "0795", "07d1", "0824", "0911", "0925", "0a89", "0b0b",
@@ -187,11 +187,8 @@ inline constexpr std::array<std::string_view, 2424> get_pci_vendors_array()
         "f111", "f117", "f15e", "f1d0", "f5f5", "f849", "fa57", "fab7", "fe19", "febd", "feda", "fede", "ffe1", "fffd",
         "fffe", "ffff"
     };
-}
 
-inline constexpr std::array<int, 2424> get_pci_vendors_location_array()
-{
-    return {
+inline constexpr std::array<int, 2424> pci_vendors_location_array = {
         842,     867,     965,     1987,    2075,    2240,    2340,    2380,    2442,    2472,    2624,    2650,
         2673,    2696,    2776,    2833,    3020,    3098,    3184,    4801,    4848,    4953,    5021,    5058,
         5099,    5149,    5180,    5255,    5345,    5372,    5415,    5557,    5632,    5653,    6374,    6404,
@@ -395,11 +392,8 @@ inline constexpr std::array<int, 2424> get_pci_vendors_location_array()
         1491995, 1492053, 1492083, 1493844, 1493884, 1493921, 1494051, 1494090, 1494135, 1494165, 1494271, 1494349,
         1495118, 1495199, 1495237, 1495291, 1495319, 1495387, 1495423, 1495512, 1495551, 1495649, 1495777, 1495829
     };
-}
 
-inline std::string get_pci_ids()
-{
-    return R"(#
+inline constexpr std::string_view all_ids = R"(#
 #	List of PCI ID's
 #
 #	Version: 2025.02.12
@@ -39890,16 +39884,11 @@ C 12  Processing accelerators
 C 13  Non-Essential Instrumentation
 C 40  Coprocessor
 C ff  Unassigned class
-)";
-}
-
-extern const 	 std::string& 			    all_ids;
-inline constexpr std::array<std::string_view, 2424> pci_vendors_array          = get_pci_vendors_array();
-inline constexpr std::array<int, 2424>              pci_vendors_location_array = get_pci_vendors_location_array();
+)"sv;
 
 #else
 
-extern const     std::string&                       all_ids;
+inline constexpr std::string_view                   all_ids                    = {};
 inline constexpr std::array<std::string_view, 2424> pci_vendors_array          = {};
 inline constexpr std::array<int, 2424>              pci_vendors_location_array = {};
 

include/texts.hpp

@@ -164,21 +164,22 @@ For details, see `man customfetch` or run `--how-it-works`.
 )");
 
 constexpr std::string_view explain_customfetch = (R"(
-customfetch is designed for maximum customizability, allowing users to display system information exactly how they want it.
-The layout and logo is controlled through special tags that can output system info, execute commands, apply conditional logic, add colors, and calculate percentages with some colors.
+customfetch is designed for super customizability, allowing users to display fetched information the way they want.
+The layout and logo is controlled through special tags that can output fetched infos, execute commands, apply conditional logic, add colors, and calculate percentages with some colors.
 
 Tag References:
 1. Information Tag ($<>)
-    Retrieves system information from modules.
+    Retrieves fetched information from modules.
+    Information can be from installed plugins or builtin system-information fetching.
 
-    Syntax: $<module.submodule.sub...> or $<module>
+    Syntax: $<module.submodule.recurisve..> or $<module>
 
     Examples:
-    - $<user.name>       # Displays login username
+    - $<user.name>       # Shows login username
     - $<os.kernel.name>  # Shows kernel name only
     - $<ram>             # Shows formatted RAM usage
 
-    Use `--list-modules` to see all available modules and members.
+    Use `--list-modules` to see all available modules and recursive submodules.
 
 2. Bash Command Tag ($())
     Executes shell commands and outputs the result.
@@ -188,29 +189,28 @@ Tag References:
 
     Examples:
     - $(echo "hello")             # Outputs: hello
-    - $(date +%F)                 # Shows current date
     - $(uname -r | cut -d'-' -f1) # Shows kernel version number only
 
 3. Conditional Tag ($[])
     Displays different outputs based on conditions.
 
-    Syntax: $[condition,comparison,true_output,false_output]
+    Syntax: $[something,something_else,if_equal,if_not_equal]
 
     Examples:
     - $[$<user.name>,toni,Welcome back!,Access denied]
     - $[$(date +%m-%d),12-25,Merry Christmas!,]
     - $[$<os.name.id>,arch,${green}I use arch btw,${red}Non-arch user]
 
 4. Color Tag (${})
-    Applies colors and text formatting.
+    Applies colors and text formatting for following text.
 
     Basic syntax: ${color} or ${modifiers#RRGGBB}
 
     Color options:
-    - Named colors from config
+    - Named colors from config (cyan, from alias-colors, ...)
     - Hex colors: ${#ff00cc}
     - Special colors: ${auto} (uses logo colors)
-    - Reset styles: ${0} (normal), ${1} (bold reset)
+    - Reset styles: ${0} (normal reset), ${1} (bold reset)
 
     Formatting modifiers (prefix before hexcolor):
     - ! = Bold
@@ -232,18 +232,18 @@ Tag References:
     - w(value) = Font weight (light/normal/bold/ultrabold or 100-1000)
 
     Examples:
-GUI App only:
+    GUI App only:
         ${oU(#ff0000)L(double)}Error            # Double red underline
         ${a(50%)#00ff00}Semi-transparent green
-    Cross-platform:
+    GUI and Terminal:
         ${\e[1;33m}Bold yellow
         ${b#222222}${white}White on gray
         ${auto3}The 3rd logo color
 
     Notes:
-    - customfetch will try to convert ANSI escape codes to GUI app equivalent
     - customfetch will ignore GUI-specific modifiers on terminal.
-    - if you're using the GUI app and want to display a custom logo that's an image, all the auto colors will be the same colors as the distro ones.
+    - if you're using the GUI app and want to display a custom logo that's an image,
+      all the ${auto} colors will be the same colors as the auto-detected distro ASCII art.
 
 5. Percentage Tag ($%%)
     Calculates and displays colored percentages.
@@ -261,13 +261,13 @@ Pro Tip:
 
 FAQ:
 Q: Why do special characters (&, <) break the GUI display?
-A: Escape these characters with \\ (e.g replace "<" with "\\<" from both config and ASCII art):
+A: Escape these characters with \\ (e.g replace "<" with "\\<"):
    This doesn't affect terminal output.
 
 Q: How can I use cbonsai as ASCII art?
 A: 1. Create a text file containing: $(!cbonsai -p)
    2. Use: customfetch -s "/path/to/file.txt"
-   3. Adjust offset for proper alignment
+   3. Adjust offset for proper alignment (not dynamic)
 
 Q: Does customfetch support nested tags?
 A: Yes! Complex nesting is supported, for example:

libcufetch/parse.cc

@@ -402,6 +402,8 @@ std::optional<std::string> parse_command_tag(Parser& parser, parse_args_t& parse
     if (!parse_args.parsingLayout && !removetag && parser.dollar_pos != std::string::npos)
         parse_args.pureOutput.replace(parser.dollar_pos, command.length() + "$()"_len, cmd_output);
 
+    if (!cmd_output.empty() && cmd_output.back() == '\n')
+        cmd_output.pop_back();
     return cmd_output;
 }
 

scripts/generate_pci_arrays.py

@@ -96,35 +96,29 @@
     f.write("""#ifndef _PCI_IDS_HPP
 #define _PCI_IDS_HPP
 
+/* TODO: delete any subdevices (what the fuck man this REALLY needs a rewrite) */
+
 #include "platform.hpp"
 #if !CF_ANDROID
 
 #include <array>
-#include <string>
+#include <string_view>
 
-inline constexpr std::array<std::string_view, %s> get_pci_vendors_array() {
-    return %s;
-}
+using namespace std::string_view_literals;
 
-inline constexpr std::array<int, %s> get_pci_vendors_location_array() {
-    return %s;
-}
+inline constexpr std::array<std::string_view, %s> pci_vendors_array = %s;
 
-inline std::string get_pci_ids() {
-    return R"(%s)";
-}
+inline constexpr std::array<int, %s> pci_vendors_location_array = %s;
 
-inline const std::string& all_ids = get_pci_ids();
-inline constexpr std::array<std::string_view, %s> pci_vendors_array = get_pci_vendors_array();
-inline constexpr std::array<int, %s> pci_vendors_location_array = get_pci_vendors_location_array();
+inline constexpr std::string_view all_ids = R"(%s)"sv;
 
 #else
 
-inline const std::string& all_ids = {}
-inline constexpr std::array<std::string_view, %s> pci_vendors_array = {}
-inline constexpr std::array<int, %s> pci_vendors_location_array = {}
+inline constexpr std::string_view                   all_ids                    = {};
+inline constexpr std::array<std::string_view, %s>   pci_vendors_array          = {};
+inline constexpr std::array<int, %s>                pci_vendors_location_array = {};
 
-#endif // !CF_ANDROID
+#endif  // !CF_ANDROID
 
 #endif  // _PCI_IDS_HPP""" % (len(vendor_array), repr(vendor_array).replace("'", '"').replace('[', '{').replace(']', '}'), len(location_array), repr(location_array).replace("'", '"').replace('[', '{').replace(']', '}'), file, len(vendor_array), len(location_array)))
 

src/util.cpp

@@ -48,12 +48,6 @@
 #include "platform.hpp"
 #include "tiny-process-library/process.hpp"
 
-#if !CF_ANDROID
-const std::string& all_ids = get_pci_ids();
-#else
-const std::string& all_ids = "";
-#endif
-
 bool hasEnding(const std::string_view fullString, const std::string_view ending)
 {
     if (ending.length() > fullString.length())
@@ -480,7 +474,7 @@ std::string name_from_entry(size_t dev_entry_pos)
 {
     dev_entry_pos += 6;  // Offset from the first character to the actual name that we want (xxxx  <device name>)
 
-    std::string name = all_ids.substr(dev_entry_pos, all_ids.find('\n', dev_entry_pos) - dev_entry_pos);
+    std::string name = std::string(all_ids.substr(dev_entry_pos, all_ids.find('\n', dev_entry_pos) - dev_entry_pos));
 
     const size_t bracket_open_pos  = name.find('[');
     const size_t bracket_close_pos = name.find(']');
@@ -496,7 +490,7 @@ std::string vendor_from_entry(const size_t vendor_entry_pos, const std::string_v
     if (end_line_pos == std::string::npos)
         end_line_pos = all_ids.length();  // If no newline is found, set to end of string
 
-    const std::string& line = all_ids.substr(vendor_entry_pos, end_line_pos - vendor_entry_pos);
+    const std::string& line = std::string(all_ids.substr(vendor_entry_pos, end_line_pos - vendor_entry_pos));
 
     const size_t       after_id_pos = line.find(vendor_id_s) + 4;
     const std::string& description  = line.substr(after_id_pos);