Clean up command line options display. Use opf2 instead of opf.

This commit is contained in:
John Schember 2009-04-17 08:06:35 -04:00
parent 7c06afcf8a
commit a66fb31027
3 changed files with 4 additions and 4 deletions

View File

@ -9,7 +9,7 @@ import os
from calibre.customize.conversion import InputFormatPlugin from calibre.customize.conversion import InputFormatPlugin
from calibre.ebooks.pdf.pdftohtml import pdftohtml from calibre.ebooks.pdf.pdftohtml import pdftohtml
from calibre.ebooks.metadata.opf import OPFCreator from calibre.ebooks.metadata.opf2 import OPFCreator
class PDFInput(InputFormatPlugin): class PDFInput(InputFormatPlugin):

View File

@ -9,7 +9,7 @@ import os
from calibre.customize.conversion import InputFormatPlugin from calibre.customize.conversion import InputFormatPlugin
from calibre.ebooks.markdown import markdown from calibre.ebooks.markdown import markdown
from calibre.ebooks.metadata.opf import OPFCreator from calibre.ebooks.metadata.opf2 import OPFCreator
class TXTInput(InputFormatPlugin): class TXTInput(InputFormatPlugin):

View File

@ -18,14 +18,14 @@ class TXTOutput(OutputFormatPlugin):
options = set([ options = set([
OptionRecommendation(name='newline', recommended_value='system', OptionRecommendation(name='newline', recommended_value='system',
level=OptionRecommendation.LOW, long_switch='newline', level=OptionRecommendation.LOW,
short_switch='n', choices=TxtNewlines.NEWLINE_TYPES.keys(), short_switch='n', choices=TxtNewlines.NEWLINE_TYPES.keys(),
help=_('Type of newline to use. Options are %s. Default is \'system\'. ' help=_('Type of newline to use. Options are %s. Default is \'system\'. '
'Use \'old_mac\' for compatibility with Mac OS 9 and earlier. ' 'Use \'old_mac\' for compatibility with Mac OS 9 and earlier. '
'For Mac OS X use \'unix\'. \'system\' will default to the newline ' 'For Mac OS X use \'unix\'. \'system\' will default to the newline '
'type used by this OS.' % sorted(TxtNewlines.NEWLINE_TYPES.keys()))), 'type used by this OS.' % sorted(TxtNewlines.NEWLINE_TYPES.keys()))),
OptionRecommendation(name='prepend_metadata', recommended_value='false', OptionRecommendation(name='prepend_metadata', recommended_value='false',
level=OptionRecommendation.LOW, long_switch='prepend_metadata', level=OptionRecommendation.LOW,
choices=['true', 'false'], choices=['true', 'false'],
help=_('Write the title and author to the beginning of the file. ' help=_('Write the title and author to the beginning of the file. '
'Default is \'true\'. Use \'false\' to disable.')), 'Default is \'true\'. Use \'false\' to disable.')),