diff options
| author | Anton Khirnov <anton@khirnov.net> | 2021-02-10 15:20:53 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2021-02-10 15:20:53 +0100 |
| commit | 7bfa03a78ca1143bf11bafa89c1b9cf0c08c942b (patch) | |
| tree | 8ee6081e15bafb3ef39c565e347c22d51fcab39f /alot/widgets | |
| parent | 666aab1a3fcd5f33659f67540d23b96fa8fa2f98 (diff) | |
Add common message text sanitization.
Diffstat (limited to 'alot/widgets')
| -rw-r--r-- | alot/widgets/search.py | 4 | ||||
| -rw-r--r-- | alot/widgets/thread.py | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/alot/widgets/search.py b/alot/widgets/search.py index 12cf84e8..43a71434 100644 --- a/alot/widgets/search.py +++ b/alot/widgets/search.py @@ -212,9 +212,7 @@ def prepare_string(partname, thread, query, maxw): # get string s = content(thread, query) - # sanitize - s = s.replace('\n', ' ') - s = s.replace('\r', '') + s = s.translate(settings.sanitize_header_table) # shorten if max width is requested if maxw: diff --git a/alot/widgets/thread.py b/alot/widgets/thread.py index 7d3bafca..90eeabdf 100644 --- a/alot/widgets/thread.py +++ b/alot/widgets/thread.py @@ -40,6 +40,8 @@ class MessageSummaryWidget(urwid.WidgetWrap): if date is not None: text += " (%s)" % date + text = text.translate(settings.sanitize_header_table) + cols = [urwid.Text(text)] if settings.get('msg_summary_hides_threadwide_tags'): @@ -288,6 +290,8 @@ class _TextPart(_MIMEPartWidget): self._fold_context = settings.get('thread_fold_context') + text = text.translate(settings.sanitize_text_table) + # try highlighting with pygments first hilit = self._highlight_pygments(text, part, attr_text) if hilit is None: @@ -562,6 +566,8 @@ class HeadersWidget(urwid.WidgetWrap): widgets = [] for key, value in headers: + value = value.translate(settings.sanitize_header_table) + # TODO even/odd keyw = ('fixed', max_key_len + 1, urwid.Text((self._key_attr, key))) |