From d972dd27b0110f881ca0468ba5799c1696ff2b58 Mon Sep 17 00:00:00 2001 From: GRiker Date: Thu, 13 Sep 2012 13:35:15 -0600 Subject: [PATCH] Fixed regression referencing output_device --- src/calibre/library/catalogs/epub_mobi.py | 10 +++------- src/calibre/library/catalogs/epub_mobi_builder.py | 3 +++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/calibre/library/catalogs/epub_mobi.py b/src/calibre/library/catalogs/epub_mobi.py index 0d1e26bce6..6225612cc8 100644 --- a/src/calibre/library/catalogs/epub_mobi.py +++ b/src/calibre/library/catalogs/epub_mobi.py @@ -9,7 +9,6 @@ __docformat__ = 'restructuredtext en' import os, shutil from collections import namedtuple -from copy import deepcopy from calibre import strftime from calibre.customize import CatalogPlugin @@ -329,9 +328,6 @@ class EPUB_MOBI(CatalogPlugin): # Launch the Catalog builder catalog = CatalogBuilder(db, opts, self, report_progress=notification) - # Save the output profile for the plumber - output_profile = deepcopy(catalog.output_profile) - if opts.verbose: log.info(" Begin catalog source generation") @@ -350,8 +346,6 @@ class EPUB_MOBI(CatalogPlugin): recommendations.append(('remove_fake_margins', False, OptionRecommendation.HIGH)) recommendations.append(('comments', '', OptionRecommendation.HIGH)) - recommendations.append(('output_profile', output_profile, - OptionRecommendation.HIGH)) """ >>> Use to debug generated catalog code before pipeline conversion <<< @@ -366,7 +360,9 @@ class EPUB_MOBI(CatalogPlugin): recommendations.append(('debug_pipeline', dp, OptionRecommendation.HIGH)) - if opts.output_profile and opts.output_profile.startswith("kindle"): + if opts.fmt == 'mobi' and opts.output_profile and opts.output_profile.startswith("kindle"): + recommendations.append(('output_profile', opts.output_profile, + OptionRecommendation.HIGH)) recommendations.append(('no_inline_toc', True, OptionRecommendation.HIGH)) recommendations.append(('book_producer',opts.output_profile, diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py index d38bbd1b27..0caaad333e 100644 --- a/src/calibre/library/catalogs/epub_mobi_builder.py +++ b/src/calibre/library/catalogs/epub_mobi_builder.py @@ -103,6 +103,9 @@ class CatalogBuilder(object): self.cache_dir = os.path.join(config_dir, 'caches', 'catalog') self.catalog_path = PersistentTemporaryDirectory("_epub_mobi_catalog", prefix='') self.excluded_tags = self.get_excluded_tags() + self.generate_for_kindle_azw3 = True if (_opts.fmt == 'azw3' and + _opts.output_profile and + _opts.output_profile.startswith("kindle")) else False self.generate_for_kindle_mobi = True if (_opts.fmt == 'mobi' and _opts.output_profile and _opts.output_profile.startswith("kindle")) else False