From b3f5a3cd42f0a21b008fd38b620710ae7f8db4f0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 4 Jul 2018 09:46:00 +0530 Subject: [PATCH] Add the commit_name to all input/output plugins --- src/calibre/customize/conversion.py | 2 ++ src/calibre/ebooks/conversion/plugins/azw4_input.py | 1 + src/calibre/ebooks/conversion/plugins/chm_input.py | 1 + src/calibre/ebooks/conversion/plugins/comic_input.py | 1 + src/calibre/ebooks/conversion/plugins/djvu_input.py | 2 +- src/calibre/ebooks/conversion/plugins/docx_input.py | 1 + src/calibre/ebooks/conversion/plugins/docx_output.py | 1 + src/calibre/ebooks/conversion/plugins/epub_input.py | 1 + src/calibre/ebooks/conversion/plugins/epub_output.py | 1 + src/calibre/ebooks/conversion/plugins/fb2_input.py | 1 + src/calibre/ebooks/conversion/plugins/fb2_output.py | 1 + src/calibre/ebooks/conversion/plugins/html_input.py | 1 + src/calibre/ebooks/conversion/plugins/html_output.py | 1 + src/calibre/ebooks/conversion/plugins/htmlz_input.py | 1 + src/calibre/ebooks/conversion/plugins/htmlz_output.py | 1 + src/calibre/ebooks/conversion/plugins/lit_input.py | 1 + src/calibre/ebooks/conversion/plugins/lit_output.py | 3 +-- src/calibre/ebooks/conversion/plugins/lrf_input.py | 1 + src/calibre/ebooks/conversion/plugins/lrf_output.py | 1 + src/calibre/ebooks/conversion/plugins/mobi_input.py | 2 +- src/calibre/ebooks/conversion/plugins/mobi_output.py | 2 ++ src/calibre/ebooks/conversion/plugins/odt_input.py | 3 +-- src/calibre/ebooks/conversion/plugins/oeb_output.py | 2 +- src/calibre/ebooks/conversion/plugins/pdb_input.py | 1 + src/calibre/ebooks/conversion/plugins/pdb_output.py | 2 +- src/calibre/ebooks/conversion/plugins/pdf_input.py | 1 + src/calibre/ebooks/conversion/plugins/pdf_output.py | 1 + src/calibre/ebooks/conversion/plugins/pml_input.py | 1 + src/calibre/ebooks/conversion/plugins/pml_output.py | 1 + src/calibre/ebooks/conversion/plugins/rb_input.py | 1 + src/calibre/ebooks/conversion/plugins/rb_output.py | 1 + src/calibre/ebooks/conversion/plugins/recipe_input.py | 2 +- src/calibre/ebooks/conversion/plugins/rtf_input.py | 2 +- src/calibre/ebooks/conversion/plugins/rtf_output.py | 1 + src/calibre/ebooks/conversion/plugins/snb_input.py | 2 +- src/calibre/ebooks/conversion/plugins/snb_output.py | 1 + src/calibre/ebooks/conversion/plugins/tcr_input.py | 1 + src/calibre/ebooks/conversion/plugins/tcr_output.py | 1 + src/calibre/ebooks/conversion/plugins/txt_input.py | 1 + src/calibre/ebooks/conversion/plugins/txt_output.py | 1 + 40 files changed, 42 insertions(+), 11 deletions(-) diff --git a/src/calibre/customize/conversion.py b/src/calibre/customize/conversion.py index 2fccd85a21..ceb9df1d5a 100644 --- a/src/calibre/customize/conversion.py +++ b/src/calibre/customize/conversion.py @@ -136,6 +136,7 @@ class InputFormatPlugin(Plugin): type = _('Conversion input') can_be_disabled = False supported_platforms = ['windows', 'osx', 'linux'] + commit_name = None # unique name under which options for this plugin are saved #: Set of file types for which this plugin should be run #: For example: ``set(['azw', 'mobi', 'prc'])`` @@ -285,6 +286,7 @@ class OutputFormatPlugin(Plugin): type = _('Conversion output') can_be_disabled = False supported_platforms = ['windows', 'osx', 'linux'] + commit_name = None # unique name under which options for this plugin are saved #: The file type (extension without leading period) that this #: plugin outputs diff --git a/src/calibre/ebooks/conversion/plugins/azw4_input.py b/src/calibre/ebooks/conversion/plugins/azw4_input.py index e12868c29c..6a14cb5c5b 100644 --- a/src/calibre/ebooks/conversion/plugins/azw4_input.py +++ b/src/calibre/ebooks/conversion/plugins/azw4_input.py @@ -15,6 +15,7 @@ class AZW4Input(InputFormatPlugin): author = 'John Schember' description = 'Convert AZW4 to HTML' file_types = set(['azw4']) + commit_name = 'azw4_input' def convert(self, stream, options, file_ext, log, accelerators): diff --git a/src/calibre/ebooks/conversion/plugins/chm_input.py b/src/calibre/ebooks/conversion/plugins/chm_input.py index 062cd7cd6f..efc91d7704 100644 --- a/src/calibre/ebooks/conversion/plugins/chm_input.py +++ b/src/calibre/ebooks/conversion/plugins/chm_input.py @@ -16,6 +16,7 @@ class CHMInput(InputFormatPlugin): author = 'Kovid Goyal and Alex Bramley' description = 'Convert CHM files to OEB' file_types = set(['chm']) + commit_name = 'chm_input' def _chmtohtml(self, output_dir, chm_path, no_images, log, debug_dump=False): from calibre.ebooks.chm.reader import CHMReader diff --git a/src/calibre/ebooks/conversion/plugins/comic_input.py b/src/calibre/ebooks/conversion/plugins/comic_input.py index f64acc5acb..214fcfc964 100644 --- a/src/calibre/ebooks/conversion/plugins/comic_input.py +++ b/src/calibre/ebooks/conversion/plugins/comic_input.py @@ -21,6 +21,7 @@ class ComicInput(InputFormatPlugin): description = 'Optimize comic files (.cbz, .cbr, .cbc) for viewing on portable devices' file_types = set(['cbz', 'cbr', 'cbc']) is_image_collection = True + commit_name = 'comic_input' core_usage = -1 options = set([ diff --git a/src/calibre/ebooks/conversion/plugins/djvu_input.py b/src/calibre/ebooks/conversion/plugins/djvu_input.py index 5f144286ac..60f2e68fb2 100644 --- a/src/calibre/ebooks/conversion/plugins/djvu_input.py +++ b/src/calibre/ebooks/conversion/plugins/djvu_input.py @@ -19,6 +19,7 @@ class DJVUInput(InputFormatPlugin): author = 'Anthon van der Neut' description = 'Convert OCR-ed DJVU files (.djvu) to HTML' file_types = set(['djvu', 'djv']) + commit_name = 'djvu_input' def convert(self, stream, options, file_ext, log, accelerators): from calibre.ebooks.txt.processor import convert_basic @@ -61,4 +62,3 @@ class DJVUInput(InputFormatPlugin): meta_info_to_oeb_metadata(mi, oeb.metadata, log) return oeb - diff --git a/src/calibre/ebooks/conversion/plugins/docx_input.py b/src/calibre/ebooks/conversion/plugins/docx_input.py index 704ccc15d2..06d401c56d 100644 --- a/src/calibre/ebooks/conversion/plugins/docx_input.py +++ b/src/calibre/ebooks/conversion/plugins/docx_input.py @@ -14,6 +14,7 @@ class DOCXInput(InputFormatPlugin): author = 'Kovid Goyal' description = _('Convert DOCX files (.docx and .docm) to HTML') file_types = {'docx', 'docm'} + commit_name = 'docx_input' options = { OptionRecommendation(name='docx_no_cover', recommended_value=False, diff --git a/src/calibre/ebooks/conversion/plugins/docx_output.py b/src/calibre/ebooks/conversion/plugins/docx_output.py index 32fe3219ae..5daba84317 100644 --- a/src/calibre/ebooks/conversion/plugins/docx_output.py +++ b/src/calibre/ebooks/conversion/plugins/docx_output.py @@ -17,6 +17,7 @@ class DOCXOutput(OutputFormatPlugin): name = 'DOCX Output' author = 'Kovid Goyal' file_type = 'docx' + commit_name = 'docx_output' options = { OptionRecommendation(name='docx_page_size', recommended_value='letter', diff --git a/src/calibre/ebooks/conversion/plugins/epub_input.py b/src/calibre/ebooks/conversion/plugins/epub_input.py index 31e2237af9..0bce71054d 100644 --- a/src/calibre/ebooks/conversion/plugins/epub_input.py +++ b/src/calibre/ebooks/conversion/plugins/epub_input.py @@ -34,6 +34,7 @@ class EPUBInput(InputFormatPlugin): description = 'Convert EPUB files (.epub) to HTML' file_types = set(['epub']) output_encoding = None + commit_name = 'epub_input' recommendations = set([('page_breaks_before', '/', OptionRecommendation.MED)]) diff --git a/src/calibre/ebooks/conversion/plugins/epub_output.py b/src/calibre/ebooks/conversion/plugins/epub_output.py index 456807f5bc..25ad711fa1 100644 --- a/src/calibre/ebooks/conversion/plugins/epub_output.py +++ b/src/calibre/ebooks/conversion/plugins/epub_output.py @@ -48,6 +48,7 @@ class EPUBOutput(OutputFormatPlugin): name = 'EPUB Output' author = 'Kovid Goyal' file_type = 'epub' + commit_name = 'epub_output' options = set([ OptionRecommendation(name='extract_to', diff --git a/src/calibre/ebooks/conversion/plugins/fb2_input.py b/src/calibre/ebooks/conversion/plugins/fb2_input.py index a25ec472ac..b0a1813f77 100644 --- a/src/calibre/ebooks/conversion/plugins/fb2_input.py +++ b/src/calibre/ebooks/conversion/plugins/fb2_input.py @@ -19,6 +19,7 @@ class FB2Input(InputFormatPlugin): author = 'Anatoly Shipitsin' description = 'Convert FB2 and FBZ files to HTML' file_types = {'fb2', 'fbz'} + commit_name = 'fb2_input' recommendations = set([ ('level1_toc', '//h:h1', OptionRecommendation.MED), diff --git a/src/calibre/ebooks/conversion/plugins/fb2_output.py b/src/calibre/ebooks/conversion/plugins/fb2_output.py index 7f97ed5baf..ca38c8d608 100644 --- a/src/calibre/ebooks/conversion/plugins/fb2_output.py +++ b/src/calibre/ebooks/conversion/plugins/fb2_output.py @@ -14,6 +14,7 @@ class FB2Output(OutputFormatPlugin): name = 'FB2 Output' author = 'John Schember' file_type = 'fb2' + commit_name = 'fb2_output' FB2_GENRES = [ # Science Fiction & Fantasy diff --git a/src/calibre/ebooks/conversion/plugins/html_input.py b/src/calibre/ebooks/conversion/plugins/html_input.py index da30d823bc..2ebd7f6433 100644 --- a/src/calibre/ebooks/conversion/plugins/html_input.py +++ b/src/calibre/ebooks/conversion/plugins/html_input.py @@ -29,6 +29,7 @@ class HTMLInput(InputFormatPlugin): author = 'Kovid Goyal' description = 'Convert HTML and OPF files to an OEB' file_types = set(['opf', 'html', 'htm', 'xhtml', 'xhtm', 'shtm', 'shtml']) + commit_name = 'html_input' options = set([ OptionRecommendation(name='breadth_first', diff --git a/src/calibre/ebooks/conversion/plugins/html_output.py b/src/calibre/ebooks/conversion/plugins/html_output.py index 927acc6e0e..520d311309 100644 --- a/src/calibre/ebooks/conversion/plugins/html_output.py +++ b/src/calibre/ebooks/conversion/plugins/html_output.py @@ -20,6 +20,7 @@ class HTMLOutput(OutputFormatPlugin): name = 'HTML Output' author = 'Fabian Grassl' file_type = 'zip' + commit_name = 'html_output' options = set([ OptionRecommendation(name='template_css', diff --git a/src/calibre/ebooks/conversion/plugins/htmlz_input.py b/src/calibre/ebooks/conversion/plugins/htmlz_input.py index 9d0f09c1dd..4a0089264b 100644 --- a/src/calibre/ebooks/conversion/plugins/htmlz_input.py +++ b/src/calibre/ebooks/conversion/plugins/htmlz_input.py @@ -18,6 +18,7 @@ class HTMLZInput(InputFormatPlugin): author = 'John Schember' description = 'Convert HTML files to HTML' file_types = set(['htmlz']) + commit_name = 'htmlz_input' def convert(self, stream, options, file_ext, log, accelerators): diff --git a/src/calibre/ebooks/conversion/plugins/htmlz_output.py b/src/calibre/ebooks/conversion/plugins/htmlz_output.py index 3cfa1ed3ff..7a2f1a282f 100644 --- a/src/calibre/ebooks/conversion/plugins/htmlz_output.py +++ b/src/calibre/ebooks/conversion/plugins/htmlz_output.py @@ -20,6 +20,7 @@ class HTMLZOutput(OutputFormatPlugin): name = 'HTMLZ Output' author = 'John Schember' file_type = 'htmlz' + commit_name = 'htmlz_output' options = set([ OptionRecommendation(name='htmlz_css_type', recommended_value='class', diff --git a/src/calibre/ebooks/conversion/plugins/lit_input.py b/src/calibre/ebooks/conversion/plugins/lit_input.py index 1a4579e200..10fd65b77a 100644 --- a/src/calibre/ebooks/conversion/plugins/lit_input.py +++ b/src/calibre/ebooks/conversion/plugins/lit_input.py @@ -15,6 +15,7 @@ class LITInput(InputFormatPlugin): author = 'Marshall T. Vandegrift' description = 'Convert LIT files to HTML' file_types = set(['lit']) + commit_name = 'lit_input' def convert(self, stream, options, file_ext, log, accelerators): diff --git a/src/calibre/ebooks/conversion/plugins/lit_output.py b/src/calibre/ebooks/conversion/plugins/lit_output.py index 33fa1ddf7c..f6f7a8cba3 100644 --- a/src/calibre/ebooks/conversion/plugins/lit_output.py +++ b/src/calibre/ebooks/conversion/plugins/lit_output.py @@ -15,6 +15,7 @@ class LITOutput(OutputFormatPlugin): name = 'LIT Output' author = 'Marshall T. Vandegrift' file_type = 'lit' + commit_name = 'lit_output' def convert(self, oeb, output_path, input_plugin, opts, log): self.log, self.opts, self.oeb = log, opts, oeb @@ -35,5 +36,3 @@ class LITOutput(OutputFormatPlugin): rasterizer(oeb, opts) lit = LitWriter(self.opts) lit(oeb, output_path) - - diff --git a/src/calibre/ebooks/conversion/plugins/lrf_input.py b/src/calibre/ebooks/conversion/plugins/lrf_input.py index 0c183d4a34..8280e3aa21 100644 --- a/src/calibre/ebooks/conversion/plugins/lrf_input.py +++ b/src/calibre/ebooks/conversion/plugins/lrf_input.py @@ -16,6 +16,7 @@ class LRFInput(InputFormatPlugin): author = 'Kovid Goyal' description = 'Convert LRF files to HTML' file_types = set(['lrf']) + commit_name = 'lrf_input' def convert(self, stream, options, file_ext, log, accelerators): diff --git a/src/calibre/ebooks/conversion/plugins/lrf_output.py b/src/calibre/ebooks/conversion/plugins/lrf_output.py index fdcd0040d6..69f5401b48 100644 --- a/src/calibre/ebooks/conversion/plugins/lrf_output.py +++ b/src/calibre/ebooks/conversion/plugins/lrf_output.py @@ -90,6 +90,7 @@ class LRFOutput(OutputFormatPlugin): name = 'LRF Output' author = 'Kovid Goyal' file_type = 'lrf' + commit_name = 'lrf_output' options = set([ OptionRecommendation(name='enable_autorotation', recommended_value=False, diff --git a/src/calibre/ebooks/conversion/plugins/mobi_input.py b/src/calibre/ebooks/conversion/plugins/mobi_input.py index a0c91cd144..8623b83a65 100644 --- a/src/calibre/ebooks/conversion/plugins/mobi_input.py +++ b/src/calibre/ebooks/conversion/plugins/mobi_input.py @@ -14,6 +14,7 @@ class MOBIInput(InputFormatPlugin): author = 'Kovid Goyal' description = 'Convert MOBI files (.mobi, .prc, .azw) to HTML' file_types = set(['mobi', 'prc', 'azw', 'azw3', 'pobi']) + commit_name = 'mobi_input' def convert(self, stream, options, file_ext, log, accelerators): @@ -60,4 +61,3 @@ class MOBIInput(InputFormatPlugin): q.write(raw) accelerators['pagebreaks'] = '//h:div[@class="mbp_pagebreak"]' return mr.created_opf_path - diff --git a/src/calibre/ebooks/conversion/plugins/mobi_output.py b/src/calibre/ebooks/conversion/plugins/mobi_output.py index b9b55d4e44..e210801316 100644 --- a/src/calibre/ebooks/conversion/plugins/mobi_output.py +++ b/src/calibre/ebooks/conversion/plugins/mobi_output.py @@ -41,6 +41,7 @@ class MOBIOutput(OutputFormatPlugin): name = 'MOBI Output' author = 'Kovid Goyal' file_type = 'mobi' + commit_name = 'mobi_output' options = set([ OptionRecommendation(name='prefer_author_sort', @@ -271,6 +272,7 @@ class AZW3Output(OutputFormatPlugin): name = 'AZW3 Output' author = 'Kovid Goyal' file_type = 'azw3' + commit_name = 'azw3_output' options = set([ OptionRecommendation(name='prefer_author_sort', diff --git a/src/calibre/ebooks/conversion/plugins/odt_input.py b/src/calibre/ebooks/conversion/plugins/odt_input.py index 0da5226c57..295893207b 100644 --- a/src/calibre/ebooks/conversion/plugins/odt_input.py +++ b/src/calibre/ebooks/conversion/plugins/odt_input.py @@ -16,10 +16,9 @@ class ODTInput(InputFormatPlugin): author = 'Kovid Goyal' description = 'Convert ODT (OpenOffice) files to HTML' file_types = set(['odt']) + commit_name = 'odt_input' def convert(self, stream, options, file_ext, log, accelerators): from calibre.ebooks.odt.input import Extract return Extract()(stream, '.', log) - - diff --git a/src/calibre/ebooks/conversion/plugins/oeb_output.py b/src/calibre/ebooks/conversion/plugins/oeb_output.py index b7b50a0034..802f6f106a 100644 --- a/src/calibre/ebooks/conversion/plugins/oeb_output.py +++ b/src/calibre/ebooks/conversion/plugins/oeb_output.py @@ -16,6 +16,7 @@ class OEBOutput(OutputFormatPlugin): name = 'OEB Output' author = 'Kovid Goyal' file_type = 'oeb' + commit_name = 'oeb_output' recommendations = set([('pretty_print', True, OptionRecommendation.HIGH)]) @@ -119,4 +120,3 @@ class OEBOutput(OutputFormatPlugin): if clc: lang.text = clc # }}} - diff --git a/src/calibre/ebooks/conversion/plugins/pdb_input.py b/src/calibre/ebooks/conversion/plugins/pdb_input.py index ea4910a366..d3f16f7498 100644 --- a/src/calibre/ebooks/conversion/plugins/pdb_input.py +++ b/src/calibre/ebooks/conversion/plugins/pdb_input.py @@ -15,6 +15,7 @@ class PDBInput(InputFormatPlugin): author = 'John Schember' description = 'Convert PDB to HTML' file_types = set(['pdb', 'updb']) + commit_name = 'pdb_input' def convert(self, stream, options, file_ext, log, accelerators): diff --git a/src/calibre/ebooks/conversion/plugins/pdb_output.py b/src/calibre/ebooks/conversion/plugins/pdb_output.py index b277ab353d..64addc05cc 100644 --- a/src/calibre/ebooks/conversion/plugins/pdb_output.py +++ b/src/calibre/ebooks/conversion/plugins/pdb_output.py @@ -16,6 +16,7 @@ class PDBOutput(OutputFormatPlugin): name = 'PDB Output' author = 'John Schember' file_type = 'pdb' + commit_name = 'pdb_output' options = set([ OptionRecommendation(name='format', recommended_value='doc', @@ -60,4 +61,3 @@ class PDBOutput(OutputFormatPlugin): if close: out_stream.close() - diff --git a/src/calibre/ebooks/conversion/plugins/pdf_input.py b/src/calibre/ebooks/conversion/plugins/pdf_input.py index 3b4f352fb1..a4547c3f95 100644 --- a/src/calibre/ebooks/conversion/plugins/pdf_input.py +++ b/src/calibre/ebooks/conversion/plugins/pdf_input.py @@ -15,6 +15,7 @@ class PDFInput(InputFormatPlugin): author = 'Kovid Goyal and John Schember' description = 'Convert PDF files to HTML' file_types = set(['pdf']) + commit_name = 'pdf_input' options = set([ OptionRecommendation(name='no_images', recommended_value=False, diff --git a/src/calibre/ebooks/conversion/plugins/pdf_output.py b/src/calibre/ebooks/conversion/plugins/pdf_output.py index e06c9d4cba..cb0b88c7f3 100644 --- a/src/calibre/ebooks/conversion/plugins/pdf_output.py +++ b/src/calibre/ebooks/conversion/plugins/pdf_output.py @@ -50,6 +50,7 @@ class PDFOutput(OutputFormatPlugin): name = 'PDF Output' author = 'Kovid Goyal' file_type = 'pdf' + commit_name = 'pdf_output' options = set([ OptionRecommendation(name='use_profile_size', recommended_value=False, diff --git a/src/calibre/ebooks/conversion/plugins/pml_input.py b/src/calibre/ebooks/conversion/plugins/pml_input.py index 9c8e7a9a62..fbfba04a91 100644 --- a/src/calibre/ebooks/conversion/plugins/pml_input.py +++ b/src/calibre/ebooks/conversion/plugins/pml_input.py @@ -19,6 +19,7 @@ class PMLInput(InputFormatPlugin): description = 'Convert PML to OEB' # pmlz is a zip file containing pml files and png images. file_types = set(['pml', 'pmlz']) + commit_name = 'pml_input' def process_pml(self, pml_path, html_path, close_all=False): from calibre.ebooks.pml.pmlconverter import PML_HTMLizer diff --git a/src/calibre/ebooks/conversion/plugins/pml_output.py b/src/calibre/ebooks/conversion/plugins/pml_output.py index 939d1653dc..c82cc33f5c 100644 --- a/src/calibre/ebooks/conversion/plugins/pml_output.py +++ b/src/calibre/ebooks/conversion/plugins/pml_output.py @@ -16,6 +16,7 @@ class PMLOutput(OutputFormatPlugin): name = 'PML Output' author = 'John Schember' file_type = 'pmlz' + commit_name = 'pml_output' options = set([ OptionRecommendation(name='pml_output_encoding', recommended_value='cp1252', diff --git a/src/calibre/ebooks/conversion/plugins/rb_input.py b/src/calibre/ebooks/conversion/plugins/rb_input.py index eb61e062cb..badf60a257 100644 --- a/src/calibre/ebooks/conversion/plugins/rb_input.py +++ b/src/calibre/ebooks/conversion/plugins/rb_input.py @@ -15,6 +15,7 @@ class RBInput(InputFormatPlugin): author = 'John Schember' description = 'Convert RB files to HTML' file_types = set(['rb']) + commit_name = 'rb_input' def convert(self, stream, options, file_ext, log, accelerators): diff --git a/src/calibre/ebooks/conversion/plugins/rb_output.py b/src/calibre/ebooks/conversion/plugins/rb_output.py index 5e314a557f..07707c2c4a 100644 --- a/src/calibre/ebooks/conversion/plugins/rb_output.py +++ b/src/calibre/ebooks/conversion/plugins/rb_output.py @@ -14,6 +14,7 @@ class RBOutput(OutputFormatPlugin): name = 'RB Output' author = 'John Schember' file_type = 'rb' + commit_name = 'rb_output' options = set([ OptionRecommendation(name='inline_toc', diff --git a/src/calibre/ebooks/conversion/plugins/recipe_input.py b/src/calibre/ebooks/conversion/plugins/recipe_input.py index e16b8f7bee..697b315e11 100644 --- a/src/calibre/ebooks/conversion/plugins/recipe_input.py +++ b/src/calibre/ebooks/conversion/plugins/recipe_input.py @@ -23,6 +23,7 @@ class RecipeInput(InputFormatPlugin): author = 'Kovid Goyal' description = _('Download periodical content from the internet') file_types = set(['recipe', 'downloaded_recipe']) + commit_name = 'recipe_input' recommendations = set([ ('chapter', None, OptionRecommendation.HIGH), @@ -147,4 +148,3 @@ class RecipeInput(InputFormatPlugin): if isinstance(raw, unicode): raw = raw.encode('utf-8') zf.writestr('download.recipe', raw) - diff --git a/src/calibre/ebooks/conversion/plugins/rtf_input.py b/src/calibre/ebooks/conversion/plugins/rtf_input.py index 0996881f6a..f74470a688 100644 --- a/src/calibre/ebooks/conversion/plugins/rtf_input.py +++ b/src/calibre/ebooks/conversion/plugins/rtf_input.py @@ -44,6 +44,7 @@ class RTFInput(InputFormatPlugin): author = 'Kovid Goyal' description = 'Convert RTF files to HTML' file_types = set(['rtf']) + commit_name = 'rtf_input' options = { OptionRecommendation(name='ignore_wmf', recommended_value=False, @@ -317,4 +318,3 @@ class RTFInput(InputFormatPlugin): p.text = (p.text or '') + img.tail else: p[idx-1].tail = (p[idx-1].tail or '') + img.tail - diff --git a/src/calibre/ebooks/conversion/plugins/rtf_output.py b/src/calibre/ebooks/conversion/plugins/rtf_output.py index b350242271..0e897ffd33 100644 --- a/src/calibre/ebooks/conversion/plugins/rtf_output.py +++ b/src/calibre/ebooks/conversion/plugins/rtf_output.py @@ -14,6 +14,7 @@ class RTFOutput(OutputFormatPlugin): name = 'RTF Output' author = 'John Schember' file_type = 'rtf' + commit_name = 'rtf_output' def convert(self, oeb_book, output_path, input_plugin, opts, log): from calibre.ebooks.rtf.rtfml import RTFMLizer diff --git a/src/calibre/ebooks/conversion/plugins/snb_input.py b/src/calibre/ebooks/conversion/plugins/snb_input.py index 4fc4b6c95d..3e71247f24 100755 --- a/src/calibre/ebooks/conversion/plugins/snb_input.py +++ b/src/calibre/ebooks/conversion/plugins/snb_input.py @@ -23,6 +23,7 @@ class SNBInput(InputFormatPlugin): author = 'Li Fanxi' description = 'Convert SNB files to OEB' file_types = set(['snb']) + commit_name = 'snb_input' options = set([ ]) @@ -119,4 +120,3 @@ class SNBInput(InputFormatPlugin): item.html_input_href = f return oeb - diff --git a/src/calibre/ebooks/conversion/plugins/snb_output.py b/src/calibre/ebooks/conversion/plugins/snb_output.py index bed5d61acf..11f7164ff5 100644 --- a/src/calibre/ebooks/conversion/plugins/snb_output.py +++ b/src/calibre/ebooks/conversion/plugins/snb_output.py @@ -16,6 +16,7 @@ class SNBOutput(OutputFormatPlugin): name = 'SNB Output' author = 'Li Fanxi' file_type = 'snb' + commit_name = 'snb_output' options = set([ OptionRecommendation(name='snb_output_encoding', recommended_value='utf-8', diff --git a/src/calibre/ebooks/conversion/plugins/tcr_input.py b/src/calibre/ebooks/conversion/plugins/tcr_input.py index 13fc22b87b..c83c533742 100644 --- a/src/calibre/ebooks/conversion/plugins/tcr_input.py +++ b/src/calibre/ebooks/conversion/plugins/tcr_input.py @@ -15,6 +15,7 @@ class TCRInput(InputFormatPlugin): author = 'John Schember' description = 'Convert TCR files to HTML' file_types = set(['tcr']) + commit_name = 'tcr_input' def convert(self, stream, options, file_ext, log, accelerators): from calibre.ebooks.compression.tcr import decompress diff --git a/src/calibre/ebooks/conversion/plugins/tcr_output.py b/src/calibre/ebooks/conversion/plugins/tcr_output.py index fa4ba7b25d..e5df625dfc 100644 --- a/src/calibre/ebooks/conversion/plugins/tcr_output.py +++ b/src/calibre/ebooks/conversion/plugins/tcr_output.py @@ -15,6 +15,7 @@ class TCROutput(OutputFormatPlugin): name = 'TCR Output' author = 'John Schember' file_type = 'tcr' + commit_name = 'tcr_output' options = set([ OptionRecommendation(name='tcr_output_encoding', recommended_value='utf-8', diff --git a/src/calibre/ebooks/conversion/plugins/txt_input.py b/src/calibre/ebooks/conversion/plugins/txt_input.py index 9d5e3f0837..04508c5717 100644 --- a/src/calibre/ebooks/conversion/plugins/txt_input.py +++ b/src/calibre/ebooks/conversion/plugins/txt_input.py @@ -31,6 +31,7 @@ class TXTInput(InputFormatPlugin): author = 'John Schember' description = 'Convert TXT files to HTML' file_types = {'txt', 'txtz', 'text', 'md', 'textile', 'markdown'} + commit_name = 'txt_input' options = set([ OptionRecommendation(name='paragraph_type', recommended_value='auto', diff --git a/src/calibre/ebooks/conversion/plugins/txt_output.py b/src/calibre/ebooks/conversion/plugins/txt_output.py index cde5b7a49c..7702b50dba 100644 --- a/src/calibre/ebooks/conversion/plugins/txt_output.py +++ b/src/calibre/ebooks/conversion/plugins/txt_output.py @@ -20,6 +20,7 @@ class TXTOutput(OutputFormatPlugin): name = 'TXT Output' author = 'John Schember' file_type = 'txt' + commit_name = 'txt_output' options = set([ OptionRecommendation(name='newline', recommended_value='system',