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

GwR improved diagnostics for metadata, cover failures

Browse Source
This commit is contained in:
GRiker 2010-03-26 04:44:52 -07:00
parent a00acf999e
commit 5091859c49
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/ebooks/metadata/topaz.py
View File

@ -4,7 +4,7 @@ __copyright__ = '2010, Greg Riker <griker@hotmail.com>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
''' Read/write metadata from Amazon's topaz format ''' ''' Read/write metadata from Amazon's topaz format '''
import StringIO, sys import os, StringIO, sys
from struct import pack from struct import pack
from calibre.ebooks.metadata import MetaInformation from calibre.ebooks.metadata import MetaInformation
@ -83,7 +83,7 @@ class MetadataUpdater(object):
sig = self.data[:4] sig = self.data[:4]
if not sig.startswith('TPZ'): if not sig.startswith('TPZ'):
raise ValueError('Not a Topaz file') raise ValueError("'%s': unexpected Topaz signature '%s'" % (os.path.basename(stream.name),self.data[:4]))
offset = 4 offset = 4
self.header_records, consumed = self.decode_vwi(self.data[offset:offset+4]) self.header_records, consumed = self.decode_vwi(self.data[offset:offset+4])
@ -92,13 +92,13 @@ class MetadataUpdater(object):
# First integrity test - metadata header # First integrity test - metadata header
if not 'metadata' in self.topaz_headers: if not 'metadata' in self.topaz_headers:
raise ValueError('Invalid Topaz format - no metadata record') raise ValueError("'%s': Topaz metadata record missing" % os.path.basename(stream.name))
# Second integrity test - metadata body # Second integrity test - metadata body
md_offset = self.topaz_headers['metadata']['blocks'][0]['offset'] md_offset = self.topaz_headers['metadata']['blocks'][0]['offset']
md_offset += self.base md_offset += self.base
if self.data[md_offset+1:md_offset+9] != 'metadata': if self.data[md_offset+1:md_offset+9] != 'metadata':
raise ValueError('Damaged metadata record') raise ValueError("'%s': damaged Topaz metadata record" % os.path.basename(stream.name))
def book_length(self): def book_length(self):
''' convenience method for retrieving book length ''' ''' convenience method for retrieving book length '''

2
src/calibre/ebooks/mobi/reader.py
View File

@ -833,7 +833,7 @@ def get_metadata(stream):
try: try:
im = PILImage.open(buf) im = PILImage.open(buf)
except: except:
log.exception('Failed to read MOBI cover') log.exception("Failed to read MOBI cover: '%s'" % os.path.basename(stream.name))
else: else:
obuf = cStringIO.StringIO() obuf = cStringIO.StringIO()
im.convert('RGB').save(obuf, format='JPEG') im.convert('RGB').save(obuf, format='JPEG')