misc: don't use fmt/color.h instead just \x1b

I don't know why but it's so damn slow when printing to stdout and then to stderr, in my other program it was mixing up text input. I don't know if it's a bug fixed the latest {fmt} git version so I won't report it right away

Author: Toni500github

cufetchpm/src/main.cpp

@@ -63,7 +63,8 @@ const std::unordered_map<std::string_view, OPs> map{
     { "list", LIST },
     { "help", HELP },
     { "enable", ENABLE },
-    { "disable", UNINSTALL },
+    { "disable", DISABLE },
+    { "uninstall", UNINSTALL },
     { "gen-manifest", GEN_MANIFEST },
 };
 

include/libcufetch/common.hh

@@ -27,7 +27,6 @@
 
 #include <cstdlib>
 
-#include "fmt/color.h"
 #include "fmt/core.h"
 
 constexpr const char NOCOLOR[]      = "\033[0m";
@@ -47,8 +46,6 @@ constexpr const char MAGIC_LINE[] = "(cut this line NOW!! RAHHH)";
 #define PLUGIN_INIT void start
 #define PLUGIN_FINISH void finish
 
-#define BOLD_COLOR(x) (fmt::emphasis::bold | fmt::fg(fmt::rgb(x)))
-
 #if DEBUG
 inline bool debug_print = true;
 #else
@@ -58,14 +55,14 @@ inline bool debug_print = false;
 template <typename... Args>
 void error(const std::string_view fmt, Args&&... args) noexcept
 {
-    fmt::print(stderr, BOLD_COLOR(fmt::color::red), "ERROR: {}\033[0m\n",
+    fmt::print(stderr, "\033[1;31mERROR: {}\033[0m\n",
                fmt::format(fmt::runtime(fmt), std::forward<Args>(args)...));
 }
 
 template <typename... Args>
 void die(const std::string_view fmt, Args&&... args) noexcept
 {
-    fmt::print(stderr, BOLD_COLOR(fmt::color::red), "FATAL: {}\033[0m\n",
+    fmt::print(stderr, "\033[1;31mFATAL: {}\033[0m\n",
                fmt::format(fmt::runtime(fmt), std::forward<Args>(args)...));
     std::exit(1);
 }
@@ -74,22 +71,20 @@ template <typename... Args>
 void debug(const std::string_view fmt, Args&&... args) noexcept
 {
     if (debug_print)
-        fmt::print(BOLD_COLOR((fmt::color::hot_pink)), "[DEBUG]:\033[0m {}\n",
+        fmt::print("\033[1;38;2;255;105;180m[DEBUG]:\033[0m {}\n",
                    fmt::format(fmt::runtime(fmt), std::forward<Args>(args)...));
 }
 
 template <typename... Args>
 void warn(const std::string_view fmt, Args&&... args) noexcept
 {
-    fmt::print(BOLD_COLOR((fmt::color::yellow)), "WARNING: {}\033[0m\n",
+    fmt::print("\033[1;33mWARNING: {}\033[0m\n",
                fmt::format(fmt::runtime(fmt), std::forward<Args>(args)...));
 }
 
 template <typename... Args>
 void info(const std::string_view fmt, Args&&... args) noexcept
 {
-    fmt::print(BOLD_COLOR((fmt::color::cyan)), "INFO: {}\033[0m\n",
+    fmt::print("\033[1;36mINFO: {}\033[0m\n",
                fmt::format(fmt::runtime(fmt), std::forward<Args>(args)...));
 }
-
-#undef BOLD_COLOR

libcufetch/parse.cc

@@ -41,7 +41,6 @@
 #include "libcufetch/common.hh"
 #include "libcufetch/config.hh"
 #include "libcufetch/cufetch.hh"
-#include "fmt/color.h"
 #include "fmt/format.h"
 #include "switch_fnv1a.hpp"
 #include "util.hpp"

src/util.cpp

@@ -262,7 +262,7 @@ std::string shorten_vendor_name(std::string vendor)
 fmt::rgb hexStringToColor(const std::string_view hexstr)
 {
     std::stringstream ss;
-    ss << std::hex << hexstr.substr(1).data();
+    ss << std::hex << ((hexstr[0] == '#') ? hexstr.substr(1).data() : hexstr.data());
 
     uint value;
     ss >> value;