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

GwR bail if metadata sequence out of order

Browse Source
This commit is contained in:
GRiker 2010-03-10 07:31:34 -07:00
parent 5aaee86983
commit 834fd93bc8
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,6 +253,7 @@ class MetadataUpdater(object):
offset = 5 offset = 5
topaz_headers = {} topaz_headers = {}
dkey_offset = 0 dkey_offset = 0
highest_payload_offset = 0
for x in range(self.header_records): for x in range(self.header_records):
marker = self.data[offset] marker = self.data[offset]
offset += 1 offset += 1
@ -267,6 +268,10 @@ class MetadataUpdater(object):
hdr_offset, consumed = self.decode_vwi(self.data[offset:offset+4]) hdr_offset, consumed = self.decode_vwi(self.data[offset:offset+4])
if tag == 'dkey': if tag == 'dkey':
dkey_offset = hdr_offset dkey_offset = hdr_offset
if tag != 'metadata':
if hdr_offset > highest_payload_offset:
highest_payload_offset = hdr_offset
#print "adjusting highest_payload_offset to 0x%x (%s)" % (hdr_offset,tag)
offset += consumed offset += consumed
len_uncomp, consumed = self.decode_vwi(self.data[offset:offset+4]) len_uncomp, consumed = self.decode_vwi(self.data[offset:offset+4])
offset += consumed offset += consumed
@ -275,14 +280,13 @@ class MetadataUpdater(object):
blocks[val] = dict(hdr_offset=hdr_offset,len_uncomp=len_uncomp,len_comp=len_comp) blocks[val] = dict(hdr_offset=hdr_offset,len_uncomp=len_uncomp,len_comp=len_comp)
topaz_headers[x] = dict(tag=tag,blocks=blocks) topaz_headers[x] = dict(tag=tag,blocks=blocks)
self.topaz_headers = topaz_headers self.topaz_headers = topaz_headers
self.highest_payload_offset = highest_payload_offset
self.eod = self.data[offset] self.eod = self.data[offset]
offset += 1 offset += 1
self.base = offset self.base = offset
self.base_value = None self.base_value = None
if dkey_offset: if dkey_offset:
self.base_value = self.data[offset:offset + dkey_offset] self.base_value = self.data[offset:offset + dkey_offset]
return md_header_offset, topaz_headers return md_header_offset, topaz_headers
def generate_metadata_stream(self): def generate_metadata_stream(self):
@ -348,6 +352,9 @@ class MetadataUpdater(object):
self.metadata[item]['metadata'] = value self.metadata[item]['metadata'] = value
return return
if self.md_start > self.highest_payload_offset:
raise ValueError('Unable to update metadata')
try: try:
from calibre.ebooks.conversion.config import load_defaults from calibre.ebooks.conversion.config import load_defaults
prefs = load_defaults('mobi_output') prefs = load_defaults('mobi_output')
@ -378,7 +385,7 @@ class MetadataUpdater(object):
self.stream.write(dkey) self.stream.write(dkey)
self.stream.write(updated_metadata) self.stream.write(updated_metadata)
self.stream.write(tail) self.stream.write(tail)
self.stream.close()
def set_metadata(stream, mi): def set_metadata(stream, mi):
mu = MetadataUpdater(stream) mu = MetadataUpdater(stream)