Merge pull request #29 from eosswedenorg/only-color-tty

Closes #26

CMakeLists.txt

@@ -38,6 +38,7 @@ set (PROGRAM_SOURCE
 	src/core/file.cpp
 	src/core/dictionary.cpp
 	src/core/string.cpp
+	src/core/isatty.cpp
 	src/crypto/base58.cpp
 	src/crypto/WIF.cpp
 	src/console.cpp

src/console.cpp

@@ -21,10 +21,28 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <iostream>
+#include "core/isatty.h"
 #include "console.h"
 
 namespace eoskeygen { namespace console {
 
 bool disable_color = false;
 
+FILE* _getFileFromStream(const std::ostream& os) {
+
+	if (&os == &std::cout) {
+    	return stdout;
+	} else if (&os == &std::cerr) {
+        return stderr;
+	}
+	return NULL;
+}
+
+bool isColorsSupported(const std::ostream& os) {
+
+	FILE* fd = _getFileFromStream(os);
+	return disable_color == false && isatty(fd);
+}
+
 } } // namespace eoskeygen::console

src/console.h

@@ -63,6 +63,8 @@ namespace console {
 		italic
 	};
 
+	bool isColorsSupported(const std::ostream& os);
+
 	// Resets all colors/attributes
 	std::ostream& reset(std::ostream& os);
 

src/console_ansi.cpp

@@ -30,7 +30,7 @@ namespace console {
 
 std::ostream& reset(std::ostream& os) {
 
-	if (disable_color) {
+	if (!isColorsSupported(os)) {
 		return os;
 	}
 	return os << "\033[0m";
@@ -42,7 +42,7 @@ std::ostream& operator<<(std::ostream& os, const fg& obj) {
 	int attr;
 	int code;
 
-	if (disable_color) {
+	if (!isColorsSupported(os)) {
 		return os;
 	}
 

src/console_win32.cpp

@@ -48,10 +48,20 @@ namespace eoskeygen {
 
 namespace console {
 
+HANDLE _getNativeHandle(const std::ostream& os) {
+
+	if (&os == &std::cout) {
+    	return ::GetStdHandle(STD_OUTPUT_HANDLE);
+	} else if (&os == &std::cerr) {
+        return ::GetStdHandle(STD_ERROR_HANDLE);
+	}
+	return NULL;
+}
+
 std::ostream& reset(std::ostream& os) {
 
-	if (disable_color == false) {
-		::SetConsoleTextAttribute(::GetStdHandle(STD_OUTPUT_HANDLE), FG_DEFAULT);
+	if (isColorsSupported(os)) {
+		::SetConsoleTextAttribute(_getNativeHandle(os), FG_DEFAULT);
 	}
 	return os;
 }
@@ -61,7 +71,7 @@ std::ostream& operator<<(std::ostream& os, const fg& obj) {
 
 	int code;
 
-	if (disable_color == false) {
+	if (isColorsSupported(os)) {
 
 		switch(obj._color) {
 			case black : code = FG_BLACK; break;
@@ -84,7 +94,7 @@ std::ostream& operator<<(std::ostream& os, const fg& obj) {
 				code = FG_DEFAULT;
 		}
 
-		::SetConsoleTextAttribute(::GetStdHandle(STD_OUTPUT_HANDLE), code);
+		::SetConsoleTextAttribute(_getNativeHandle(os), code);
 	}
 
 	// WinAPI does not support text attributes in the console.

src/core/isatty.cpp

@@ -0,0 +1,21 @@
+#if _WIN32
+#include <io.h>
+#else
+#include <unistd.h>
+#define _isatty isatty
+#define _fileno fileno
+#endif
+#include "isatty.h"
+
+namespace eoskeygen {
+
+bool isatty(int fd) {
+    return ::_isatty(fd);
+}
+
+bool isatty(FILE* fd) {
+	// fileno() segfaults if fd is null.
+    return fd ? isatty(_fileno(fd)) : false;
+}
+
+} // namespace eoskeygen

src/core/isatty.h

@@ -0,0 +1,37 @@
+/**
+ * MIT License
+ *
+ * Copyright (c) 2019-2020 EOS Sw/eden
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef EOSIOKEYGEN_CORE_ISATTY_H
+#define EOSIOKEYGEN_CORE_ISATTY_H
+
+#include <stdio.h>
+
+namespace eoskeygen {
+
+bool isatty(int fd);
+
+bool isatty(FILE* fd);
+
+} // namespace eoskeygen
+
+#endif /* EOSIOKEYGEN_CORE_ISATTY_H */