From 6bfe619896f9aa9f97a9686d3b8df4c910416db5 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 3 May 2009 10:59:54 -0400 Subject: [PATCH] fix bug in pdb metadata. Allow ztxt to use pdb metadata info. --- src/calibre/ebooks/metadata/pdb.py | 2 +- src/calibre/ebooks/pdb/ztxt/reader.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/metadata/pdb.py b/src/calibre/ebooks/metadata/pdb.py index e473925b87..a6f7c6796b 100644 --- a/src/calibre/ebooks/metadata/pdb.py +++ b/src/calibre/ebooks/metadata/pdb.py @@ -29,7 +29,7 @@ def get_metadata(stream, extract_cover=True): MetadataReader = MREADER.get(pheader.ident, None) if MetadataReader is None: - return MetaInformation(_('Unknown'), [_('Unknown')]) + return MetaInformation(pheader.title, [_('Unknown')]) return MetadataReader(stream, extract_cover) diff --git a/src/calibre/ebooks/pdb/ztxt/reader.py b/src/calibre/ebooks/pdb/ztxt/reader.py index cfd5ba6e79..42638669f4 100644 --- a/src/calibre/ebooks/pdb/ztxt/reader.py +++ b/src/calibre/ebooks/pdb/ztxt/reader.py @@ -34,6 +34,7 @@ class HeaderRecord(object): class Reader(FormatReader): def __init__(self, header, stream, log, encoding=None): + self.stream = stream self.log = log self.encoding = encoding @@ -69,7 +70,8 @@ class Reader(FormatReader): with open(os.path.join(output_dir, 'index.html'), 'wb') as index: index.write(html.encode('utf-8')) - mi = MetaInformation(_('Unknown'), _('Unknown')) + from calibre.ebooks.metadata.meta import get_metadata + mi = get_metadata(self.stream, 'pdb') manifest = [('index.html', None)] spine = ['index.html'] opf_writer(output_dir, 'metadata.opf', manifest, spine, mi)