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 metadata option in the conversion_option field in recipes not being applied to final book.

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-06 10:48:08 -06:00
parent 895cd6ef58
commit 884b8da3a6
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/calibre/ebooks/conversion/plumber.py
View File

@ -555,20 +555,8 @@ OptionRecommendation(name='language',
rec.recommended_value = val rec.recommended_value = val
rec.level = level rec.level = level
def read_user_metadata(self): def opts_to_mi(self, mi):
''' from calibre.ebooks.metadata import string_to_authors
Read all metadata specified by the user. Command line options override
metadata from a specified OPF file.
'''
from calibre.ebooks.metadata import MetaInformation, string_to_authors
from calibre.ebooks.metadata.opf2 import OPF
mi = MetaInformation(None, [])
if self.opts.read_metadata_from_opf is not None:
self.opts.read_metadata_from_opf = os.path.abspath(
self.opts.read_metadata_from_opf)
opf = OPF(open(self.opts.read_metadata_from_opf, 'rb'),
os.path.dirname(self.opts.read_metadata_from_opf))
mi = MetaInformation(opf)
for x in self.metadata_option_names: for x in self.metadata_option_names:
val = getattr(self.opts, x, None) val = getattr(self.opts, x, None)
if val is not None: if val is not None:
@ -579,6 +567,23 @@ OptionRecommendation(name='language',
elif x in ('rating', 'series_index'): elif x in ('rating', 'series_index'):
val = float(val) val = float(val)
setattr(mi, x, val) setattr(mi, x, val)
def read_user_metadata(self):
'''
Read all metadata specified by the user. Command line options override
metadata from a specified OPF file.
'''
from calibre.ebooks.metadata import MetaInformation
from calibre.ebooks.metadata.opf2 import OPF
mi = MetaInformation(None, [])
if self.opts.read_metadata_from_opf is not None:
self.opts.read_metadata_from_opf = os.path.abspath(
self.opts.read_metadata_from_opf)
opf = OPF(open(self.opts.read_metadata_from_opf, 'rb'),
os.path.dirname(self.opts.read_metadata_from_opf))
mi = MetaInformation(opf)
self.opts_to_mi(mi)
if mi.cover: if mi.cover:
mi.cover_data = ('', open(mi.cover, 'rb').read()) mi.cover_data = ('', open(mi.cover, 'rb').read())
mi.cover = None mi.cover = None
@ -649,6 +654,8 @@ OptionRecommendation(name='language',
self.oeb = self.input_plugin(stream, self.opts, self.oeb = self.input_plugin(stream, self.opts,
self.input_fmt, self.log, self.input_fmt, self.log,
accelerators, tdir) accelerators, tdir)
if self.input_fmt == 'recipe':
self.opts_to_mi(self.user_metadata)
if self.opts.debug_input is not None: if self.opts.debug_input is not None:
self.log('Debug input called, aborting the rest of the pipeline.') self.log('Debug input called, aborting the rest of the pipeline.')
return return