Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix the subitems formatter function to split only when the period is surrounded by non-white space and not another period

Browse Source
This commit is contained in:
Kovid Goyal 2011-12-08 08:36:39 +05:30
commit a9b701d685
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/utils/formatter_functions.py
View File

@ -717,15 +717,23 @@ class BuiltinSubitems(BuiltinFormatterFunction):
return '' return ''
si = int(start_index) si = int(start_index)
ei = int(end_index) ei = int(end_index)
has_periods = '.' in val
items = [v.strip() for v in val.split(',')] items = [v.strip() for v in val.split(',')]
rv = set() rv = set()
if has_periods:
pp = re.compile(r'(?<=[^\.\s])\.(?=[^\.\s])', re.U)
else:
pp = None
for item in items: for item in items:
component = item.split('.') if has_periods and '.' in item:
components = pp.split(item)
else:
components = [item]
try: try:
if ei == 0: if ei == 0:
rv.add('.'.join(component[si:])) rv.add('.'.join(components[si:]))
else: else:
rv.add('.'.join(component[si:ei])) rv.add('.'.join(components[si:ei]))
except: except:
pass pass
return ', '.join(sorted(rv, key=sort_key)) return ', '.join(sorted(rv, key=sort_key))