[formatter] support loading an f-string from a template file

"\fTF ~/path/to/file.txt"
This commit is contained in:
Mike Fährmann
2023-03-20 22:05:33 +01:00
parent 1a4d4a799b
commit 46fdf46f21
3 changed files with 51 additions and 14 deletions

View File

@@ -34,6 +34,8 @@ def parse(format_string, default=NONE, fmt=format):
if kind == "T":
cls = TemplateFormatter
elif kind == "TF":
cls = TemplateFStringFormatter
elif kind == "E":
cls = ExpressionFormatter
elif kind == "M":
@@ -197,15 +199,6 @@ class StringFormatter():
return lambda obj: fmt(conversion(obj))
class TemplateFormatter(StringFormatter):
"""Read format_string from file"""
def __init__(self, path, default=NONE, fmt=format):
with open(util.expand_path(path)) as fp:
format_string = fp.read()
StringFormatter.__init__(self, format_string, default, fmt)
class ExpressionFormatter():
"""Generate text by evaluating a Python expression"""
@@ -229,6 +222,24 @@ class FStringFormatter():
self.format_map = util.compile_expression('f"""' + fstring + '"""')
class TemplateFormatter(StringFormatter):
"""Read format_string from file"""
def __init__(self, path, default=NONE, fmt=format):
with open(util.expand_path(path)) as fp:
format_string = fp.read()
StringFormatter.__init__(self, format_string, default, fmt)
class TemplateFStringFormatter(FStringFormatter):
"""Read f-string from file"""
def __init__(self, path, default=NONE, fmt=format):
with open(util.expand_path(path)) as fp:
format_string = fp.read()
FStringFormatter.__init__(self, format_string, default, fmt)
def parse_field_name(field_name):
first, rest = _string.formatter_field_name_split(field_name)
funcs = []