From 28971cd7647a79253000fb33e52b5d2129e5ba62 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Thu, 22 Sep 2022 02:33:04 +0200 Subject: flow-info.py: Command line arguments --no-color, --no-statusbar (both useful for tests/CI) and --print-analyse-results. * run_tests.sh: Use flow-info.py for additional DIFF tests. Signed-off-by: Toni Uhlig --- dependencies/nDPIsrvd.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'dependencies/nDPIsrvd.py') diff --git a/dependencies/nDPIsrvd.py b/dependencies/nDPIsrvd.py index 4bb0f451a..aa395bf06 100644 --- a/dependencies/nDPIsrvd.py +++ b/dependencies/nDPIsrvd.py @@ -28,12 +28,12 @@ PKT_TYPE_ETH_IP6 = 0x86DD class TermColor: - HINT = '\033[33m' + HINT = '\033[33m' WARNING = '\033[93m' - FAIL = '\033[91m' - BOLD = '\033[1m' - END = '\033[0m' - BLINK = '\x1b[5m' + FAIL = '\033[91m' + BOLD = '\033[1m' + END = '\033[0m' + BLINK = '\x1b[5m' if USE_COLORAMA is True: COLOR_TUPLES = [ (Fore.BLUE, [Back.RED, Back.MAGENTA, Back.WHITE]), @@ -51,6 +51,17 @@ class TermColor: (Fore.LIGHTWHITE_EX, [Back.LIGHTBLACK_EX, Back.BLACK]), (Fore.LIGHTYELLOW_EX, [Back.LIGHTRED_EX, Back.RED]) ] + @staticmethod + def disableColor(): + TermColor.HINT = '' + TermColor.WARNING = '' + TermColor.FAIL = '' + TermColor.BOLD = '' + TermColor.END = '' + TermColor.BLINK = '' + global USE_COLORAMA + USE_COLORAMA = False + @staticmethod def calcColorHash(string): h = 0 @@ -68,6 +79,7 @@ class TermColor: @staticmethod def setColorByString(string): + global USE_COLORAMA if USE_COLORAMA is True: fg_color, bg_color = TermColor.getColorsByHash(string) color_hash = TermColor.calcColorHash(string) -- cgit v1.2.3