Builds/wownero
1
0
Fork 0
forked from such-gitea/wownero
Code Pull Requests Actions Releases 3 Activity

logging: Generalize terminal color detection

Browse Source 
Assume the terminal supports color codes if TERM ends with `-color` or
`-256color`, rather than special-casing a handful of such terminals.

Co-authored-by: laanwj <126646+laanwj@users.noreply.github.com>
This commit is contained in:
iamamyth
2025-02-19 13:09:35 -08:00
committed by nahuhh
parent ae08557f71
commit 1075acee90
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
external/easylogging++/easylogging++.cc vendored
View File

@@ -1244,11 +1244,19 @@ std::string OS::currentHost(void) {
#endif // ELPP_OS_UNIX && !ELPP_OS_ANDROID #endif // ELPP_OS_UNIX && !ELPP_OS_ANDROID
} }
static bool endswith(const std::string &s, const std::string &ending)
{
return s.size() >= ending.size() && s.substr(s.size() - ending.size()) == ending;
}
bool OS::termSupportsColor(std::string& term) {
return term == "xterm" || term == "screen" || term == "linux" || term == "cygwin"
|| endswith(term, "-color") || endswith(term, "-256color");
}
bool OS::termSupportsColor(void) { bool OS::termSupportsColor(void) {
std::string term = getEnvironmentVariable("TERM", ""); std::string term = getEnvironmentVariable("TERM", "");
return term == "xterm" || term == "xterm-color" || term == "xterm-256color" return termSupportsColor(term);
|| term == "screen" || term == "linux" || term == "cygwin"
|| term == "screen-256color" || term == "screen.xterm-256color";
} }
// DateTime // DateTime

4
external/easylogging++/easylogging++.h vendored
View File

@@ -1210,7 +1210,9 @@ class OS : base::StaticClass {
/// ///
/// @detail For android systems this is device name with its manufacturer and model seperated by hyphen /// @detail For android systems this is device name with its manufacturer and model seperated by hyphen
static std::string currentHost(void); static std::string currentHost(void);
/// @brief Whether or not terminal supports colors /// @brief Whether or not the named terminal supports colors
static bool termSupportsColor(std::string& term);
/// @brief Whether or not the process's current terminal supports colors
static bool termSupportsColor(void); static bool termSupportsColor(void);
}; };
/// @brief Contains utilities for cross-platform date/time. This class make use of el::base::utils::Str /// @brief Contains utilities for cross-platform date/time. This class make use of el::base::utils::Str