mirror of
https://github.com/znc/znc.git
synced 2026-05-03 20:12:29 +02:00
Add --no-color switch and only use escape sequences if isatty() says so
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@926 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
62
Utils.cpp
62
Utils.cpp
@@ -370,45 +370,71 @@ bool CUtils::GetInput(const CString& sPrompt, CString& sRet, const CString& sDef
|
||||
}
|
||||
|
||||
void CUtils::PrintError(const CString& sMessage) {
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[31m ** \033[34m]\033[39m\033[22m %s\n", sMessage.c_str());
|
||||
if (stdoutIsTTY)
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[31m ** \033[34m]\033[39m\033[22m %s\n", sMessage.c_str());
|
||||
else
|
||||
fprintf(stdout, "[ ** ] %s\n", sMessage.c_str());
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
void CUtils::PrintPrompt(const CString& sMessage) {
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[33m ?? \033[34m]\033[39m\033[22m %s: ", sMessage.c_str());
|
||||
if (stdoutIsTTY)
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[33m ?? \033[34m]\033[39m\033[22m %s: ", sMessage.c_str());
|
||||
else
|
||||
fprintf(stdout, "[ ?? ] %s: ", sMessage.c_str());
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
void CUtils::PrintMessage(const CString& sMessage, bool bStrong) {
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[33m ** \033[34m]\033[39m\033[22m %s%s%s\n",
|
||||
((bStrong) ? "\033[1m" : ""),
|
||||
sMessage.c_str(),
|
||||
((bStrong) ? "\033[22m" : "")
|
||||
);
|
||||
if (stdoutIsTTY) {
|
||||
if (bStrong)
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[33m ** \033[34m]\033[39m\033[22m \033[1m%s\033[22m\n",
|
||||
sMessage.c_str());
|
||||
else
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[33m ** \033[34m]\033[39m\033[22m %s\n",
|
||||
sMessage.c_str());
|
||||
} else
|
||||
fprintf(stdout, "%s\n", sMessage.c_str());
|
||||
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
void CUtils::PrintAction(const CString& sMessage) {
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[32m \033[34m]\033[39m\033[22m %s... ", sMessage.c_str());
|
||||
if (stdoutIsTTY)
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[32m \033[34m]\033[39m\033[22m %s... ", sMessage.c_str());
|
||||
else
|
||||
fprintf(stdout, "%s... ", sMessage.c_str());
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
void CUtils::PrintStatus(bool bSuccess, const CString& sMessage) {
|
||||
if (!sMessage.empty()) {
|
||||
if (bSuccess) {
|
||||
fprintf(stdout, "%s", sMessage.c_str());
|
||||
} else {
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[31m %s \033[34m]\033[39m\033[22m", sMessage.c_str());
|
||||
if (stdoutIsTTY) {
|
||||
if (!sMessage.empty()) {
|
||||
if (bSuccess) {
|
||||
fprintf(stdout, "%s", sMessage.c_str());
|
||||
} else {
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[31m %s \033[34m]"
|
||||
"\033[39m\033[22m", sMessage.c_str());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fprintf(stdout, "\r");
|
||||
fprintf(stdout, "\r");
|
||||
|
||||
if (bSuccess) {
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[32m ok \033[34m]\033[39m\033[22m\n");
|
||||
if (bSuccess) {
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[32m ok \033[34m]\033[39m\033[22m\n");
|
||||
} else {
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[31m !! \033[34m]\033[39m\033[22m\n");
|
||||
}
|
||||
} else {
|
||||
fprintf(stdout, "\033[1m\033[34m[\033[31m !! \033[34m]\033[39m\033[22m\n");
|
||||
if (bSuccess) {
|
||||
fprintf(stdout, "%s\n", sMessage.c_str());
|
||||
} else {
|
||||
if (!sMessage.empty()) {
|
||||
fprintf(stdout, "[ %s ]", sMessage.c_str());
|
||||
}
|
||||
|
||||
fprintf(stdout, "\n[ !! ]\n");
|
||||
}
|
||||
}
|
||||
|
||||
fflush(stdout);
|
||||
|
||||
Reference in New Issue
Block a user