Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-30 12:32:33 +01:00
Code Issues Projects Releases Wiki Activity

Simplify handling of overlong last lines in split_into_lines

Browse source 
Instead of sometimes moving the last word in the last line, just always add an empty line as the new last line.
This commit is contained in:
Maximilian Merz 2018-03-31 18:06:57 +02:00
parent ac03469c72
commit 26c2e1f862
1 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
beets/ui/__init__.py
View file

@ -724,26 +724,19 @@ def split_into_lines(string, raw_string, width_tuple):
result['col'].append(next_substr)
next_substr_raw = words_raw[i]
next_substr = words[i]
# Assure that last line fits.
if len(next_substr_raw) <= last_width:
result['raw'].append(next_substr_raw)
result['col'].append(next_substr)
else:
words_raw = next_substr_raw.split()
words = next_substr.split()
assert len(words_raw) == len(words)
if len(words_raw) > 1:
last_substr_raw = words_raw.pop()
last_substr = words.pop()
next_substr_raw = ' '.join(words_raw)
next_substr = ' '.join(words)
else:
last_substr_raw = u''
last_substr = u''
result['raw'].append(next_substr_raw)
result['col'].append(next_substr)
result['raw'].append(last_substr_raw)
result['col'].append(last_substr)
# We finished constructing the substrings, but the last substring
# has not yet been added to the result.
result['raw'].append(next_substr_raw)
result['col'].append(next_substr)
# Also, the length of the last substring was only checked against
# `middle_width`. Append an empty substring as the new last substring if
# the last substring is too long.
if not len(next_substr_raw) <= last_width:
result['raw'].append(u'')
result['col'].append(u'')
return result