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

Fix bug #4646: Support eReader PDB with 116 Byte header.

Browse Source
This commit is contained in:
John Schember 2010-01-23 13:14:41 -05:00
parent fe64ffb3a5
commit b0edb9896c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/pdb/ereader/reader.py
View File

@ -20,7 +20,7 @@ class Reader(FormatReader):
if record0_size == 132: if record0_size == 132:
self.reader = Reader132(header, stream, log, options) self.reader = Reader132(header, stream, log, options)
elif record0_size == 202: elif record0_size in (116, 202):
self.reader = Reader202(header, stream, log, options) self.reader = Reader202(header, stream, log, options)
else: else:
raise EreaderError('Size mismatch. eReader header record size %s KB is not supported.' % record0_size) raise EreaderError('Size mismatch. eReader header record size %s KB is not supported.' % record0_size)

4
src/calibre/ebooks/pdb/ereader/reader202.py
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
''' '''
Read content from ereader pdb file with a 202 byte header created by Makebook. Read content from ereader pdb file with a 116 and 202 byte header created by Makebook.
''' '''
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2009, John Schember <john@nachtimwald.com>' __copyright__ = '2009, John Schember <john@nachtimwald.com>'
@ -44,7 +44,7 @@ class Reader202(FormatReader):
self.header_record = HeaderRecord(self.section_data(0)) self.header_record = HeaderRecord(self.section_data(0))
if self.header_record.version != 4: if self.header_record.version not in (2, 4):
raise EreaderError('Unknown book version %i.' % self.header_record.version) raise EreaderError('Unknown book version %i.' % self.header_record.version)
from calibre.ebooks.metadata.pdb import get_metadata from calibre.ebooks.metadata.pdb import get_metadata