ahamilton/eris
1
0
Fork 0
Code Releases Activity

coding style

Browse source
This commit is contained in:
Andrew Hamilton 2015-12-30 00:45:53 +00:00
parent 39fd37dc6f
commit da280ea9b2
1 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

46
tools.py
View file

@ -69,20 +69,6 @@ _STATUS_TO_TERMSTR_SIMPLE[Status.empty] = "."
LS_COLOR_CODES = lscolors.get_color_codes(os.environ) LS_COLOR_CODES = lscolors.get_color_codes(os.environ)
def _convert_lscolor_code_to_charstyle(lscolor_code):
if lscolor_code is None:
return termstr.CharStyle()
parts = lscolor_code.split(";")
if len(parts) == 1:
# Is this correct?
is_bold = parts[0] == "1"
fg_color = termstr.Color.white
else:
is_bold = len(parts) == 4 and parts[3] == "1"
fg_color = int(parts[2])
return termstr.CharStyle(fg_color, is_bold=is_bold)
def fix_input(input_): def fix_input(input_):
input_str = input_.decode("utf-8") if isinstance(input_, bytes) else input_ input_str = input_.decode("utf-8") if isinstance(input_, bytes) else input_
return input_str.replace("\t", " " * 4) return input_str.replace("\t", " " * 4)
@ -595,28 +581,38 @@ def run_tool_no_error(path, tool):
return status, result return status, result
def _convert_lscolor_code_to_charstyle(lscolor_code):
parts = lscolor_code.split(";")
if len(parts) == 1:
is_bold = parts[0] == "1"
fg_color = None
else:
is_bold = len(parts) == 4 and parts[3] == "1"
fg_color = int(parts[2])
return termstr.CharStyle(fg_color=fg_color, is_bold=is_bold)
def _charstyle_of_path(path):
color_code = lscolors.color_code_for_path(path, LS_COLOR_CODES)
return (termstr.CharStyle() if color_code is None else
_convert_lscolor_code_to_charstyle(color_code))
@functools.lru_cache(maxsize=100) @functools.lru_cache(maxsize=100)
def _path_colored(path): def _path_colored(path):
color_code = lscolors.color_code_for_path(path, LS_COLOR_CODES) char_style = _charstyle_of_path(path)
char_style = _convert_lscolor_code_to_charstyle(color_code)
path = path[2:] path = path[2:]
dirname, basename = os.path.split(path) dirname, basename = os.path.split(path)
if dirname == "": if dirname == "":
return termstr.TermStr(basename, char_style) return termstr.TermStr(basename, char_style)
else: else:
dirname = dirname + os.path.sep dirname = dirname + os.path.sep
color_code = lscolors.color_code_for_path(dirname, LS_COLOR_CODES) return (termstr.TermStr(dirname, _charstyle_of_path(dirname)) +
dir_style = _convert_lscolor_code_to_charstyle(color_code)
return (termstr.TermStr(dirname, dir_style) +
termstr.TermStr(basename, char_style)) termstr.TermStr(basename, char_style))
@functools.lru_cache(maxsize=100) @functools.lru_cache(maxsize=100)
def _tool_name_colored(tool, path): def _tool_name_colored(tool, path):
if tool in generic_tools(): char_style = (termstr.CharStyle(is_bold=True) if tool in generic_tools()
char_style = termstr.CharStyle((255, 255, 255), (0, 0, 0), else _charstyle_of_path(path))
is_bold=True)
else:
color_code = lscolors.color_code_for_path(path, LS_COLOR_CODES)
char_style = _convert_lscolor_code_to_charstyle(color_code)
return termstr.TermStr(tool.__name__, char_style) return termstr.TermStr(tool.__name__, char_style)