tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-26 15:25:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve error reporting: do not fail on one segment in theme.py

Browse Source
This commit is contained in:
ZyX 2015-01-05 23:52:18 +03:00
parent dbc994887d
commit e1e591fedd
2 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
powerline/segment.py
View File

@ -220,6 +220,30 @@ def process_segment(pl, side, segment_info, parsed_segments, segment, mode, colo
always_true = lambda pl, segment_info, mode: True always_true = lambda pl, segment_info, mode: True
get_fallback_segment = {
'name': 'fallback',
'type': 'string',
'highlight_group': 'background',
'divider_highlight_group': None,
'before': None,
'after': None,
'contents': '',
'priority': None,
'draw_soft_divider': True,
'draw_hard_divider': True,
'draw_inner_divider': True,
'display_condition': always_true,
'width': None,
'align': None,
'expand': None,
'truncate': None,
'startup': None,
'shutdown': None,
'_rendered_raw': '',
'_rendered_hl': '',
'_len': None,
'_contents_len': None,
}.copy
def gen_segment_getter(pl, ext, common_config, theme_configs, default_module, get_module_attr, top_theme): def gen_segment_getter(pl, ext, common_config, theme_configs, default_module, get_module_attr, top_theme):
data = { data = {

54
powerline/theme.py
View File

@ -3,8 +3,8 @@ from __future__ import (unicode_literals, division, absolute_import, print_funct
import itertools import itertools
from powerline.segment import gen_segment_getter, process_segment from powerline.segment import gen_segment_getter, process_segment, get_fallback_segment
from powerline.lib.unicode import u from powerline.lib.unicode import u, safe_unicode
def requires_segment_info(func): def requires_segment_info(func):
@ -147,23 +147,35 @@ class Theme(object):
) )
for segment in parsed_segments: for segment in parsed_segments:
self.pl.prefix = segment['name'] self.pl.prefix = segment['name']
width = segment['width'] try:
align = segment['align'] width = segment['width']
if width == 'auto' and segment['expand'] is None: align = segment['align']
segment['expand'] = expand_functions.get(align) if width == 'auto' and segment['expand'] is None:
if segment['expand'] is None: segment['expand'] = expand_functions.get(align)
self.pl.error('Align argument must be “r”, “l” or “c”, not “{0}”', align) if segment['expand'] is None:
self.pl.error('Align argument must be “r”, “l” or “c”, not “{0}”', align)
segment['contents'] = segment['before'] + u(segment['contents'] if segment['contents'] is not None else '') + segment['after'] try:
# Align segment contents segment['contents'] = segment['before'] + u(
if segment['width'] and segment['width'] != 'auto': segment['contents'] if segment['contents'] is not None else ''
if segment['align'] == 'l': ) + segment['after']
segment['contents'] = segment['contents'].ljust(segment['width']) except Exception as e:
elif segment['align'] == 'r': self.pl.exception('Failed to compute segment contents: {0}', str(e))
segment['contents'] = segment['contents'].rjust(segment['width']) segment['contents'] = safe_unicode(segment.get('contents'))
elif segment['align'] == 'c': # Align segment contents
segment['contents'] = segment['contents'].center(segment['width']) if segment['width'] and segment['width'] != 'auto':
# We need to yield a copy of the segment, or else mode-dependent if segment['align'] == 'l':
# segment contents can’t be cached correctly e.g. when caching segment['contents'] = segment['contents'].ljust(segment['width'])
# non-current window contents for vim statuslines elif segment['align'] == 'r':
yield segment.copy() segment['contents'] = segment['contents'].rjust(segment['width'])
elif segment['align'] == 'c':
segment['contents'] = segment['contents'].center(segment['width'])
# We need to yield a copy of the segment, or else mode-dependent
# segment contents can’t be cached correctly e.g. when caching
# non-current window contents for vim statuslines
yield segment.copy()
except Exception as e:
self.pl.exception('Failed to compute segment: {0}', str(e))
fallback = get_fallback_segment()
fallback.update(side=side)
yield fallback