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

Prevent exceptions when 1) both author and author_sort are used in "add" templates, and 2) books are added from a device, and 3) read metadata from file contents is not checked.

Browse Source
This commit is contained in:
Charles Haley 2012-04-10 18:16:42 +02:00
parent c843a1d7d0
commit e24adc0e35
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/devices/usbms/driver.py
View File

@ -402,14 +402,12 @@ class USBMS(CLI, Device):
def build_template_regexp(cls):
def replfunc(match, seen=None):
v = match.group(1)
if v in ['title', 'series', 'series_index', 'isbn']:
if v in ['authors', 'author_sort']:
v = 'author'
if v in ('title', 'series', 'series_index', 'isbn', 'author'):
if v not in seen:
seen |= set([v])
seen.add(v)
return '(?P<' + v + '>.+?)'
elif v in ['authors', 'author_sort']:
if v not in seen:
seen |= set([v])
return '(?P<author>.+?)'
return '(.+?)'
s = set()
f = functools.partial(replfunc, seen=s)