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

Fix parsing of tmux verion output

Browse Source 
As tmux version could have prefix, the parsing must be updated to do not
throw an error.

Example of 'tmux -V' output which did lead to issue: "tmux next-3.4"
This commit is contained in:
Jerome Malinge 2024-04-06 19:51:10 +02:00
parent a34abe325a
commit 68df8b5b27
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
powerline/bindings/tmux/__init__.py
View File

@ -67,19 +67,45 @@ def source_tmux_file(fname):
run_tmux_command('source', fname)
NON_DIGITS = re.compile('[^0-9]+')
DIGITS = re.compile('[0-9]+')
NON_LETTERS = re.compile('[^a-z]+')
def build_tmux_output_re():
pattern = '^' # begin of tmux version output
pattern += '\s*' # optionnal undefined number of spaces/tabs
pattern += '\w+' # tmux binary name (ie: "tmux")
pattern += '\s+' # undefined number of spaces/tabs
pattern += '(?P<version>' # named group for VERSION (ie: "3.4", "next-3.4", "master", ...)
pattern += '(?:' # non-capturing group for major.minor part
pattern += '(?:.*?-)?' # optionnal version prefix (ie: "next-")
pattern += '(?P<major>\d+)' # major part of version (ie: "3")
pattern += '(?:\.(?P<minor>\d+))?' # optional minor part of version (ie: "4")
pattern += ')' # end of non-capturing group
pattern += '|' # or
pattern += 'master' # allow "master" as a valid version
pattern += ')' # end of VERSION group
pattern += '\s*' # optionnal undefined number of spaces/tabs
pattern += '(?P<suffix>\w+)?' # suffix
pattern += '\s*' # optionnal undefined number of spaces/tabs
pattern += '$' # end of tmux version output
return re.compile(pattern)
TMUX_OUTPUT_RE = build_tmux_output_re()
def get_tmux_version(pl):
version_string = get_tmux_output(pl, '-V')
_, version_string = version_string.split(' ')
version_string = version_string.strip()
if version_string == 'master':
return TmuxVersionInfo(float('inf'), 0, version_string)
major, minor = version_string.split('.')
major = NON_DIGITS.subn('', major)[0]
suffix = DIGITS.subn('', minor)[0] or None
minor = NON_DIGITS.subn('', minor)[0]
m = TMUX_OUTPUT_RE.match(version_string)
if m.group('version') == 'master':
return TmuxVersionInfo(float('inf'), 0, m.group('version'))
major = m.group('major')
minor = m.group('minor')
minor = 0 if minor is None else minor
suffix = m.group('suffix')
return TmuxVersionInfo(int(major), int(minor), suffix)