parse: fix ASCII arts that has commands such as cbonsai

Author: Toni500github

assets/config-examples/config_cool.toml

@@ -49,8 +49,17 @@
 # without quotes ofc
 
 # Little FAQ
-# Q: "Why when I use something like "$<os.kernel> <- Kernel" it won't work on GUI mode?"
-# A: replace "<-" with "\\<-". It won't affect the printing in terminal
+# Q: Why when I use & or < in the config or ASCII art, it won't work on GUI mode?
+# A: replace "<" with "\\<" in the config, or "\<" in the ascii art. Same goes for &
+#    It won't affect the printing in terminal
+
+# Q: I want to use `cbonsai` as ASCII art, how do I use it?
+# A: First off, create a text file and there put only `$(!cbonsai -p)`
+#    Save the file and use `-s "/path/to/text/file"`.
+#    Use `--offset` (`-o`) for aligning and put it under the bonsai.
+#
+#    Read the manual cufetch.1 for more infos with $() tag
+
 
 # Old pipelines screensavers inspired layout
 # This is really system depedent and really meassy

assets/config-examples/config_simple.toml

@@ -49,8 +49,17 @@
 # without quotes ofc
 
 # Little FAQ
-# Q: "Why when I use something like "$<os.kernel> <- Kernel" it won't work on GUI mode?"
-# A: replace "<-" with "\\<-". It won't affect the printing in terminal
+# Q: Why when I use & or < in the config or ASCII art, it won't work on GUI mode?
+# A: replace "<" with "\\<" in the config, or "\<" in the ascii art. Same goes for &
+#    It won't affect the printing in terminal
+
+# Q: I want to use `cbonsai` as ASCII art, how do I use it?
+# A: First off, create a text file and there put only `$(!cbonsai -p)`
+#    Save the file and use `-s "/path/to/text/file"`.
+#    Use `--offset` (`-o`) for aligning and put it under the bonsai.
+#
+#    Read the manual cufetch.1 for more infos with $() tag
+
 
 layout = [
     "${1}┌────────── Hardware Information ──────────┐",

assets/config-examples/nitch_like_config.toml

@@ -49,8 +49,17 @@
 # without quotes ofc
 
 # Little FAQ
-# Q: "Why when I use something like "$<os.kernel> <- Kernel" it won't work on GUI mode?"
-# A: replace "<-" with "\\<-". It won't affect the printing in terminal
+# Q: Why when I use & or < in the config or ASCII art, it won't work on GUI mode?
+# A: replace "<" with "\\<" in the config, or "\<" in the ascii art. Same goes for &
+#    It won't affect the printing in terminal
+
+# Q: I want to use `cbonsai` as ASCII art, how do I use it?
+# A: First off, create a text file and there put only `$(!cbonsai -p)`
+#    Save the file and use `-s "/path/to/text/file"`.
+#    Use `--offset` (`-o`) for aligning and put it under the bonsai.
+#
+#    Read the manual cufetch.1 for more infos with $() tag
+
 
 # Inspired by nitch default config
 # and this reddit post https://www.reddit.com/r/unixporn/comments/1eedqnm/gnome_clean_daily_driver/

cufetch.1

@@ -85,6 +85,10 @@ layout = [
 * The \fBBash command tag $()\fR speaks for itself.
 .br
   It can execute normal bash commands and print the output of it.
+.PP
+  \fBNOTE:\fR if you try to use programs such as cbonsai in an ASCII art, put a '!' before the command.
+.br
+  example: $(!cbonsai -p)
 .PP
 * The \fBPercentage tag $%%\fR is used for displaying the percentage between 2 numbers.
 .br

include/config.hpp

@@ -140,11 +140,16 @@ inline constexpr std::string_view AUTOCONFIG = R"#([config]
 # without quotes ofc
 
 # Little FAQ
-# Q: Why when I use something like "$<os.kernel> <- Kernel" it won't work on GUI mode?
-# A: replace "<-" with "\\<-" in the config, or "\<-" in the ascii art. It won't affect the printing in terminal
-
-# Q: It happens with '&' too, like "Yin & yang"
-# A: do the same as above explained, "\\&" in the config, or "\&" in the ascii art.
+# Q: Why when I use & or < in the config or ASCII art, it won't work on GUI mode?
+# A: replace "<" with "\\<" in the config, or "\<" in the ascii art. Same goes for &
+#    It won't affect the printing in terminal
+
+# Q: I want to use `cbonsai` as ASCII art, how do I use it?
+# A: First off, create a text file and there put only `$(!cbonsai -p)`
+#    Save the file and use `-s "/path/to/text/file"`.
+#    Use `--offset` (`-o`) for aligning and put it under the bonsai.
+#
+#    Read the manual cufetch.1 for more infos with $() tag
 
 layout = [
     "$<builtin.title>",

src/display.cpp

@@ -55,10 +55,12 @@ std::vector<std::string> Display::render(const Config& config, const colors_t& c
     debug("path = {}", path);
 
     std::ifstream file;
+    std::ifstream fileToAnalyze;  // both have same path
     if (!config.m_disable_source)
     {
         file.open(path.data(), std::ios::binary);
-        if (!file.is_open())
+        fileToAnalyze.open(path.data(), std::ios::binary);
+        if (!file.is_open() || !fileToAnalyze.is_open())
             die("Could not open ascii art file \"{}\"", path);
     }
 
@@ -73,12 +75,11 @@ std::vector<std::string> Display::render(const Config& config, const colors_t& c
     {
         debug("Display::render() analyzing file");
         std::array<unsigned char, 16> buffer;
-        file.read(reinterpret_cast<char*>(&buffer.at(0)), buffer.size());
+        fileToAnalyze.read(reinterpret_cast<char*>(&buffer.at(0)), buffer.size());
         if (is_file_image(buffer.data()))
             die("The source file '{}' is a binary file.\n"
                 "Please currently use the GUI mode for rendering the image/gif (use -h for more details)",
                 path);
-        file.seekg(0);
     }
 
     for (int i = 0; i < config.logo_padding_top; i++)

src/parse.cpp

@@ -265,11 +265,20 @@ std::string parse(const std::string_view input, systemInfo_t& systemInfo, std::s
         {
             case ')':
             {
+                const bool removetag = (command.front() == '!');
+                if (removetag)
+                    command.erase(0,1);
+
                 const std::string& shell_cmd = shell_exec(command);
                 output.replace(dollarSignIndex, taglen, shell_cmd);
 
                 if (!parsingLayout && tagpos != std::string::npos)
-                    pureOutput.replace(tagpos, taglen, shell_cmd);
+                {
+                    if (!removetag)
+                        pureOutput.replace(tagpos, taglen, shell_cmd);
+                    else
+                        pureOutput.erase(tagpos, taglen);
+                }
 
             } break;