Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ran black on text2html file for PEP8 cleanup

Browse source
This commit is contained in:
Griatch 2022-06-04 13:14:37 +02:00
parent 5df72530c6
commit cd503cd9fd
1 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

64
evennia/utils/text2html.py
View file

@ -38,7 +38,7 @@ class TextToHTMLparser(object):
ANSI_INV_BLINK, ANSI_INV_BLINK,
ANSI_INV_BLINK_HILITE, ANSI_INV_BLINK_HILITE,
] ]
ansi_color_codes = [ ansi_color_codes = [
# Foreground colors # Foreground colors
ANSI_BLACK, ANSI_BLACK,
@ -50,8 +50,8 @@ class TextToHTMLparser(object):
ANSI_CYAN, ANSI_CYAN,
ANSI_WHITE, ANSI_WHITE,
] ]
xterm_fg_codes = [ XTERM256_FG.format(i + 16) for i in range(240) ] xterm_fg_codes = [XTERM256_FG.format(i + 16) for i in range(240)]
ansi_bg_codes = [ ansi_bg_codes = [
# Background colors # Background colors
@ -64,14 +64,24 @@ class TextToHTMLparser(object):
ANSI_BACK_CYAN, ANSI_BACK_CYAN,
ANSI_BACK_WHITE, ANSI_BACK_WHITE,
] ]
xterm_bg_codes = [ XTERM256_BG.format(i + 16) for i in range(240) ]
re_style = re.compile(r"({})".format('|'.join(style_codes + ansi_color_codes + xterm_fg_codes + ansi_bg_codes + xterm_bg_codes).replace("[",r"\[")))
colorlist = [ ANSI_UNHILITE + code for code in ansi_color_codes ] + [ ANSI_HILITE + code for code in ansi_color_codes ] + xterm_fg_codes xterm_bg_codes = [XTERM256_BG.format(i + 16) for i in range(240)]
bglist = ansi_bg_codes + [ ANSI_HILITE + code for code in ansi_bg_codes ] + xterm_bg_codes re_style = re.compile(
r"({})".format(
"|".join(
style_codes + ansi_color_codes + xterm_fg_codes + ansi_bg_codes + xterm_bg_codes
).replace("[", r"\[")
)
)
colorlist = (
[ANSI_UNHILITE + code for code in ansi_color_codes]
+ [ANSI_HILITE + code for code in ansi_color_codes]
+ xterm_fg_codes
)
bglist = ansi_bg_codes + [ANSI_HILITE + code for code in ansi_bg_codes] + xterm_bg_codes
re_string = re.compile( re_string = re.compile(
r"(?P<htmlchars>[<&>])|(?P<tab>[\t]+)|(?P<lineend>\r\n|\r|\n)", r"(?P<htmlchars>[<&>])|(?P<tab>[\t]+)|(?P<lineend>\r\n|\r|\n)",
@ -175,7 +185,7 @@ class TextToHTMLparser(object):
url=url, text=text url=url, text=text
) )
return val return val
def sub_text(self, match): def sub_text(self, match):
""" """
Helper method to be passed to re.sub, Helper method to be passed to re.sub,
@ -197,15 +207,15 @@ class TextToHTMLparser(object):
text = cdict["tab"].replace("\t", " " * (self.tabstop)) text = cdict["tab"].replace("\t", " " * (self.tabstop))
return text return text
return None return None
def format_styles(self, text): def format_styles(self, text):
""" """
Takes a string with parsed ANSI codes and replaces them with Takes a string with parsed ANSI codes and replaces them with
HTML spans and CSS classes. HTML spans and CSS classes.
Args: Args:
text (str): The string to process. text (str): The string to process.
Returns: Returns:
text (str): Processed text. text (str): Processed text.
""" """
@ -221,7 +231,7 @@ class TextToHTMLparser(object):
fg = ANSI_WHITE fg = ANSI_WHITE
# default bg is black # default bg is black
bg = ANSI_BACK_BLACK bg = ANSI_BACK_BLACK
for i, substr in enumerate(str_list): for i, substr in enumerate(str_list):
# reset all current styling # reset all current styling
if substr == ANSI_NORMAL and not clean: if substr == ANSI_NORMAL and not clean:
@ -258,13 +268,16 @@ class TextToHTMLparser(object):
if substr in (ANSI_HILITE, ANSI_UNHILITE, ANSI_INV_HILITE, ANSI_INV_BLINK_HILITE): if substr in (ANSI_HILITE, ANSI_UNHILITE, ANSI_INV_HILITE, ANSI_INV_BLINK_HILITE):
# set new hilight status # set new hilight status
hilight = ANSI_UNHILITE if substr == ANSI_UNHILITE else ANSI_HILITE hilight = ANSI_UNHILITE if substr == ANSI_UNHILITE else ANSI_HILITE
# inversion codes # inversion codes
if substr in (ANSI_INVERSE, ANSI_INV_HILITE, ANSI_INV_BLINK_HILITE): if substr in (ANSI_INVERSE, ANSI_INV_HILITE, ANSI_INV_BLINK_HILITE):
inverse = True inverse = True
# blink codes # blink codes
if substr in (ANSI_BLINK, ANSI_BLINK_HILITE, ANSI_INV_BLINK_HILITE) and "blink" not in classes: if (
substr in (ANSI_BLINK, ANSI_BLINK_HILITE, ANSI_INV_BLINK_HILITE)
and "blink" not in classes
):
classes.append("blink") classes.append("blink")
# underline # underline
@ -273,7 +286,7 @@ class TextToHTMLparser(object):
else: else:
# normal text, add text back to list # normal text, add text back to list
if not str_list[i-1]: if not str_list[i - 1]:
# prior entry was cleared, which means style change # prior entry was cleared, which means style change
# get indices for the fg and bg codes # get indices for the fg and bg codes
bg_index = self.bglist.index(bg) bg_index = self.bglist.index(bg)
@ -285,12 +298,12 @@ class TextToHTMLparser(object):
if inverse: if inverse:
# inverse means swap fg and bg indices # inverse means swap fg and bg indices
bg_class = "bgcolor-{}".format(str(color_index).rjust(3,"0")) bg_class = "bgcolor-{}".format(str(color_index).rjust(3, "0"))
color_class = "color-{}".format(str(bg_index).rjust(3,"0")) color_class = "color-{}".format(str(bg_index).rjust(3, "0"))
else: else:
# use fg and bg indices for classes # use fg and bg indices for classes
bg_class = "bgcolor-{}".format(str(bg_index).rjust(3,"0")) bg_class = "bgcolor-{}".format(str(bg_index).rjust(3, "0"))
color_class = "color-{}".format(str(color_index).rjust(3,"0")) color_class = "color-{}".format(str(color_index).rjust(3, "0"))
# black bg is the default, don't explicitly style # black bg is the default, don't explicitly style
if bg_class != "bgcolor-000": if bg_class != "bgcolor-000":
@ -302,10 +315,10 @@ class TextToHTMLparser(object):
prefix = '<span class="{}">'.format(" ".join(classes)) prefix = '<span class="{}">'.format(" ".join(classes))
# close any prior span # close any prior span
if not clean: if not clean:
prefix = '</span>' + prefix prefix = "</span>" + prefix
# add span to output # add span to output
str_list[i-1] = prefix str_list[i - 1] = prefix
# clean out color classes to easily update next time # clean out color classes to easily update next time
classes = [cls for cls in classes if "color" not in cls] classes = [cls for cls in classes if "color" not in cls]
# flag as currently being styled # flag as currently being styled
@ -316,7 +329,6 @@ class TextToHTMLparser(object):
str_list.append("</span>") str_list.append("</span>")
# recombine back into string # recombine back into string
return "".join(str_list) return "".join(str_list)
def parse(self, text, strip_ansi=False): def parse(self, text, strip_ansi=False):
""" """