diff --git a/Interlace/lib/core/__version__.py b/Interlace/lib/core/__version__.py index 4c3e058..71e0d8e 100644 --- a/Interlace/lib/core/__version__.py +++ b/Interlace/lib/core/__version__.py @@ -1 +1 @@ -__version__ = '1.9.6' +__version__ = '1.9.7' diff --git a/Interlace/lib/core/output.py b/Interlace/lib/core/output.py index 69d7454..562ac99 100644 --- a/Interlace/lib/core/output.py +++ b/Interlace/lib/core/output.py @@ -1,17 +1,25 @@ from enum import IntEnum from time import localtime, strftime -from colorclass import Color -from colorclass import disable_all_colors - from Interlace.lib.core.__version__ import __version__ +class bcolors: + # credit to: https://stackoverflow.com/questions/287871/how-do-i-print-colored-text-to-the-terminal + HEADER = '\033[95m' + OKBLUE = '\033[94m' + OKCYAN = '\033[96m' + OKGREEN = '\033[92m' + WARNING = '\033[93m' + FAIL = '\033[91m' + ENDC = '\033[0m' + BOLD = '\033[1m' + UNDERLINE = '\033[4m' + + class OutputHelper(object): def __init__(self, arguments): - if arguments.nocolor: - disable_all_colors() - + self._no_color = arguments.nocolor self.verbose = arguments.verbose self.silent = arguments.silent self.seperator = "=====================================================" @@ -29,11 +37,18 @@ class OutputHelper(object): if level == 0 and not self.verbose: return - formatting = { - 0: Color('{autoblue}[VERBOSE]{/autoblue}'), - 1: Color('{autogreen}[THREAD]{/autogreen}'), - 3: Color('{autobgyellow}{autored}[ERROR]{/autored}{/autobgyellow}') - } + if not self._no_color: + formatting = { + 0: f'{bcolors.OKBLUE}[VERBOSE]{bcolors.ENDC}', + 1: f'{bcolors.OKGREEN}[THREAD]{bcolors.ENDC}', + 3: f'{bcolors.FAIL}[ERROR]{bcolors.ENDC}' + } + else: + formatting = { + 0: '[VERBOSE]', + 1: '[THREAD]', + 3: '[ERROR]' + } leader = formatting.get(level, '[#]') diff --git a/requirements.txt b/requirements.txt index aff64d3..bc01fea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -colorclass==2.2.2 netaddr==0.7.20 tqdm==4.62.3