Added text-to-speach, untested but the base is now added. It routes through if available. And can be accessed with directly if needed.

1 files changed, 1 insertions, 44 deletions

diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index e15f9bad..393bf69a 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -3,13 +3,7 @@ import time, pty
 from subprocess import Popen, STDOUT, PIPE, check_output
 from select import epoll, EPOLLIN, EPOLLHUP
 from .exceptions import *
-
-def log(*args, **kwargs):
-	string = ' '.join([str(x) for x in args])
-	if supports_color():
-		kwargs = {'bg' : 'black', 'fg': 'white', **kwargs}
-		string = stylize_output(string, **kwargs)
-	print(string)
+from .output import *
 
 def gen_uid(entropy_length=256):
 	return hashlib.sha512(os.urandom(entropy_length)).hexdigest()
@@ -28,43 +22,6 @@ def multisplit(s, splitters):
 		s = ns
 	return s
 
-# Heavily influenced by: https://github.com/django/django/blob/ae8338daf34fd746771e0678081999b656177bae/django/utils/termcolors.py#L13
-# Color options here: https://askubuntu.com/questions/528928/how-to-do-underline-bold-italic-strikethrough-color-background-and-size-i
-def stylize_output(text :str, *opts, **kwargs):
-	opt_dict = {'bold': '1', 'italic' : '3', 'underscore': '4', 'blink': '5', 'reverse': '7', 'conceal': '8'}
-	color_names = ('black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white')
-	foreground = {color_names[x]: '3%s' % x for x in range(8)}
-	background = {color_names[x]: '4%s' % x for x in range(8)}
-	RESET = '0'
-
-	code_list = []
-	if text == '' and len(opts) == 1 and opts[0] == 'reset':
-		return '\x1b[%sm' % RESET
-	for k, v in kwargs.items():
-		if k == 'fg':
-			code_list.append(foreground[v])
-		elif k == 'bg':
-			code_list.append(background[v])
-	for o in opts:
-		if o in opt_dict:
-			code_list.append(opt_dict[o])
-	if 'noreset' not in opts:
-		text = '%s\x1b[%sm' % (text or '', RESET)
-	return '%s%s' % (('\x1b[%sm' % ';'.join(code_list)), text or '')
-
-# Found first reference here: https://stackoverflow.com/questions/7445658/how-to-detect-if-the-console-does-support-ansi-escape-codes-in-python
-# And re-used this: https://github.com/django/django/blob/master/django/core/management/color.py#L12
-def supports_color():
-	"""
-	Return True if the running system's terminal supports color,
-	and False otherwise.
-	"""
-	supported_platform = sys.platform != 'win32' or 'ANSICON' in os.environ
-
-	# isatty is not always implemented, #6223.
-	is_a_tty = hasattr(sys.stdout, 'isatty') and sys.stdout.isatty()
-	return supported_platform and is_a_tty
-
 def locate_binary(name):
 	for PATH in os.environ['PATH'].split(':'):
 		for root, folders, files in os.walk(PATH):