diff --git a/src/calibre/devices/jetbook/driver.py b/src/calibre/devices/jetbook/driver.py index 0d815640b1..2af1b03bf7 100644 --- a/src/calibre/devices/jetbook/driver.py +++ b/src/calibre/devices/jetbook/driver.py @@ -9,6 +9,7 @@ from itertools import cycle from calibre.devices.usbms.driver import USBMS from calibre import sanitize_file_name as sanitize +from calibre.ebooks.metadata import string_to_authors class JETBOOK(USBMS): name = 'Ectaco JetBook Device Interface' @@ -118,7 +119,7 @@ class JETBOOK(USBMS): match = cls.JETBOOK_FILE_NAME_PATTERN.match(fn) if match is not None: mi.title = check_unicode(match.group('title')) - authors = match.group('authors').split('&') + authors = string_to_authors(match.group('authors')) mi.authors = map(check_unicode, authors) return mi diff --git a/src/calibre/ebooks/lrf/meta.py b/src/calibre/ebooks/lrf/meta.py index 6ec87892d6..af1fad128f 100644 --- a/src/calibre/ebooks/lrf/meta.py +++ b/src/calibre/ebooks/lrf/meta.py @@ -19,7 +19,7 @@ import xml.dom.minidom as dom from functools import wraps from calibre.devices.prs500.prstypes import field -from calibre.ebooks.metadata import MetaInformation +from calibre.ebooks.metadata import MetaInformation, string_to_authors BYTE = ">sys.stderr, msg.encode('utf8') diff --git a/src/calibre/ebooks/metadata/rtf.py b/src/calibre/ebooks/metadata/rtf.py index bd8b1098c1..b1ee453218 100644 --- a/src/calibre/ebooks/metadata/rtf.py +++ b/src/calibre/ebooks/metadata/rtf.py @@ -5,7 +5,7 @@ Edit metadata in RTF files. """ import re, cStringIO, sys -from calibre.ebooks.metadata import MetaInformation +from calibre.ebooks.metadata import MetaInformation, string_to_authors title_pat = re.compile(r'\{\\info.*?\{\\title(.*?)(?