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

Catalog generation: Do not crash is a book in the library has no uuid. Fixes #1565242 [Generate catalog fails](https://bugs.launchpad.net/calibre/+bug/1565242)

Browse Source
This commit is contained in:
Kovid Goyal 2016-04-02 16:01:23 +05:30
parent a951180190
commit 0a5d6a3bf4
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/calibre/library/catalogs/epub_mobi_builder.py
View File

@ -4341,35 +4341,37 @@ class CatalogBuilder(object):
cover_crc = hex(zlib.crc32(data)) cover_crc = hex(zlib.crc32(data))
# Test cache for uuid # Test cache for uuid
zf = _open_archive() uuid = title.get('uuid')
if zf is not None: if uuid:
with zf: zf = _open_archive()
try:
zf.getinfo(title['uuid'] + cover_crc)
except:
pass
else:
# uuid found in cache with matching crc
thumb_data = zf.read(title['uuid'] + cover_crc)
with open(os.path.join(image_dir, thumb_file), 'wb') as f:
f.write(thumb_data)
return
# Save thumb for catalog. If invalid data, error returns to generate_thumbnails()
thumb_data = thumbnail(data,
width=self.thumb_width, height=self.thumb_height)[-1]
with open(os.path.join(image_dir, thumb_file), 'wb') as f:
f.write(thumb_data)
# Save thumb to archive
if zf is not None:
# Ensure that the read succeeded
# If we failed to open the zip file for reading,
# we dont know if it contained the thumb or not
zf = _open_archive('a')
if zf is not None: if zf is not None:
with zf: with zf:
zf.writestr(title['uuid'] + cover_crc, thumb_data) try:
zf.getinfo(uuid + cover_crc)
except:
pass
else:
# uuid found in cache with matching crc
thumb_data = zf.read(uuid + cover_crc)
with open(os.path.join(image_dir, thumb_file), 'wb') as f:
f.write(thumb_data)
return
# Save thumb for catalog. If invalid data, error returns to generate_thumbnails()
thumb_data = thumbnail(data,
width=self.thumb_width, height=self.thumb_height)[-1]
with open(os.path.join(image_dir, thumb_file), 'wb') as f:
f.write(thumb_data)
# Save thumb to archive
if zf is not None:
# Ensure that the read succeeded
# If we failed to open the zip file for reading,
# we dont know if it contained the thumb or not
zf = _open_archive('a')
if zf is not None:
with zf:
zf.writestr(uuid + cover_crc, thumb_data)
def generate_thumbnails(self): def generate_thumbnails(self):
""" Generate a thumbnail cover for each book. """ Generate a thumbnail cover for each book.