fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-21 21:48:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace list comprehension with generator

Browse source
This commit is contained in:
Aaron Lichtman 2019-11-07 04:49:01 +01:00
parent 82d3c65d82
commit 6ce83c7aa1
No known key found for this signature in database
GPG key ID: 22368077DE9F9903
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
jrnl/util.py
View file

@ -222,30 +222,32 @@ def highlight_tags_with_background_color(entry, text, color, bold=False):
:param bold: Bold flag text, passed to colorize() :param bold: Bold flag text, passed to colorize()
:return: Colorized str :return: Colorized str
""" """
def colorized_text_generator(fragments):
"""Efficiently generate colorized tags / text from text fragments.
:param fragments: List of strings representing parts of entry (tag or word)."""
# Taken from @shobrook. Thanks, buddy :)
for fragment in fragments:
for part in fragment.strip().split(" "):
if part and part[0] not in config['tagsymbols']:
yield colorize(part.strip(), color, bold)
else:
yield colorize(part.strip(), config['colors']['tags'], not bold)
config = entry.journal.config config = entry.journal.config
if config['highlight']: # highlight tags if config['highlight']: # highlight tags
if entry.journal.search_tags: if entry.journal.search_tags:
search_texts = [] text_fragments = []
for tag in entry.search_tags: for tag in entry.search_tags:
search_texts.append(re.split(re.compile(re.escape(tag), re.IGNORECASE), text_fragments.append(re.split(re.compile(re.escape(tag), re.IGNORECASE),
text, text,
flags=re.UNICODE)) flags=re.UNICODE))
else: else:
search_texts = re.split(entry.tag_regex(config['tagsymbols']), text) text_fragments = re.split(entry.tag_regex(config['tagsymbols']), text)
pretty_printed_entries = [] return " ".join(colorized_text_generator(text_fragments))
for text in search_texts:
colorized_parts = (colorize(part.strip(),
color,
bold)
if part and part[0] not in config['tagsymbols']
else colorize(part.strip(),
config['colors']['tags'],
not bold)
for part in text.strip().split(" "))
pretty_printed_entries.append(" ".join(colorized_parts)) else:
return " ".join(pretty_printed_entries) return text
def slugify(string): def slugify(string):