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

...

Browse Source
This commit is contained in:
Kovid Goyal 2012-04-10 19:22:27 +05:30
parent 396ad1c9dd
commit ad764f3cd9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,8 +413,14 @@ class USBMS(CLI, Device):
return '(.+?)' return '(.+?)'
s = set() s = set()
f = functools.partial(replfunc, seen=s) f = functools.partial(replfunc, seen=s)
template = cls.save_template().rpartition('/')[2] template = None
return re.compile(re.sub('{([^}]*)}', f, template) + '([_\d]*$)') try:
template = cls.save_template().rpartition('/')[2]
return re.compile(re.sub('{([^}]*)}', f, template) + '([_\d]*$)')
except:
prints(u'Failed to parse template: %r'%template)
template = u'{title} - {authors}'
return re.compile(re.sub('{([^}]*)}', f, template) + '([_\d]*$)')
@classmethod @classmethod
def path_to_unicode(cls, path): def path_to_unicode(cls, path):

1
src/calibre/ebooks/mobi/debug/mobi8.py
View File

@ -63,7 +63,6 @@ class MOBIFile(object):
self.raw_text = b''.join(r.raw for r in self.text_records) self.raw_text = b''.join(r.raw for r in self.text_records)
self.header = self.mf.mobi8_header self.header = self.mf.mobi8_header
self.kf8_records = mf.records[offset:]
self.extract_resources() self.extract_resources()
self.read_fdst() self.read_fdst()