getnikola · Dec 10, 2016 · Dec 10, 2016 · Dec 10, 2016
Showing with 33 additions and 9 deletions.

+8 −1 nikola/nikola.py

+4 −0 nikola/plugin_categories.py

+8 −0 nikola/plugins/task/indexes.py

+13 −8 nikola/plugins/task/taxonomies.py
diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -356,7 +356,7 @@
 TAXONOMY_COMPATIBILITY_PLUGIN_NAME_MAP = {
     "render_archive": ["classify_archive"],
     "render_authors": ["classify_authors"],
-    "render_indexes": ["classify_indexes", "classify_page_index", "classify_sections"],
+    "render_indexes": ["classify_page_index", "classify_sections"],  # "classify_indexes" removed from list (see #2591 and special-case logic below)
     "render_tags": ["classify_categories", "render_tag_cloud", "classify_tags"],
 }
 
@@ -823,12 +823,19 @@ def __init__(self, **config):
                     utils.LOGGER.warn('You are currently disabling "{}", but not the following new taxonomy plugins: {}'.format(old_plugin_name, ', '.join(missing_plugins)))
                     utils.LOGGER.warn('Please also disable these new plugins or remove "{}" from the DISABLED_PLUGINS list.'.format(old_plugin_name))
                     self.config['DISABLED_PLUGINS'].extend(missing_plugins)
+        # Special-case logic for "render_indexes" to fix #2591
+        if 'render_indexes' in self.config['DISABLED_PLUGINS']:
+            if 'generate_rss' in self.config['DISABLED_PLUGINS'] or self.config['GENERATE_RSS'] is False:
+                self.config['DISABLED_PLUGINS'].append('classify_indexes')
+            else:
+                self.config['DISABLE_INDEXES_PLUGIN_INDEX_AND_ATOM_FEED'] = True
 
         # Disable RSS.  For a successful disable, we must have both the option
         # false and the plugin disabled through the official means.
         if 'generate_rss' in self.config['DISABLED_PLUGINS'] and self.config['GENERATE_RSS'] is True:
             utils.LOGGER.warn('Please use GENERATE_RSS to disable RSS feed generation, instead of mentioning generate_rss in DISABLED_PLUGINS.')
             self.config['GENERATE_RSS'] = False
+            self.config['DISABLE_INDEXES_PLUGIN_RSS_FEED'] = True
 
         # PRETTY_URLS defaults to enabling STRIP_INDEXES unless explicitly disabled
         if self.config.get('PRETTY_URLS') and 'STRIP_INDEXES' not in config:

diff --git a/nikola/plugin_categories.py b/nikola/plugin_categories.py
@@ -752,6 +752,10 @@ def should_generate_classification_page(self, classification, post_list, lang):
         """Only generates list of posts for classification if this function returns True."""
         return True
 
+    def should_generate_rss_for_classification_page(self, classification, post_list, lang):
+        """Only generates RSS feed for list of posts for classification if this function returns True."""
+        return self.should_generate_classification_page(classification, post_list, lang)
+
     def postprocess_posts_per_classification(self, posts_per_classification_per_language, flat_hierarchy_per_lang=None, hierarchy_lookup_per_lang=None):
         """Rearrange, modify or otherwise use the list of posts per classification and per language.
 

diff --git a/nikola/plugins/task/indexes.py b/nikola/plugins/task/indexes.py
@@ -91,3 +91,11 @@ def provide_context_and_uptodate(self, classification, lang, node=None):
         }
         kw.update(context)
         return context, kw
+
+    def should_generate_classification_page(self, classification, post_list, lang):
+        """Only generates list of posts for classification if this function returns True."""
+        return not self.site.config.get("DISABLE_INDEXES_PLUGIN_INDEX_AND_ATOM_FEED", False)
+
+    def should_generate_rss_for_classification_page(self, classification, post_list, lang):
+        """Only generates RSS feed for list of posts for classification if this function returns True."""
+        return not self.site.config.get("DISABLE_INDEXES_PLUGIN_RSS_FEED", False)
diff --git a/nikola/plugins/task/taxonomies.py b/nikola/plugins/task/taxonomies.py
@@ -322,7 +322,9 @@ def _generate_classification_page(self, taxonomy, classification, post_list, lan
         if len(filtered_posts) == 0 and taxonomy.omit_empty_classifications:
             return
         # Should we create this list?
-        if not taxonomy.should_generate_classification_page(classification, filtered_posts, lang):
+        generate_list = taxonomy.should_generate_classification_page(classification, filtered_posts, lang)
+        generate_rss = taxonomy.should_generate_rss_for_classification_page(classification, filtered_posts, lang)
+        if not generate_list and not generate_rss:
             return
         # Get data
         node = None
@@ -353,16 +355,19 @@ def _generate_classification_page(self, taxonomy, classification, post_list, lan
             # Are there subclassifications?
             if len(node.children) > 0:
                 # Yes: create list with subclassifications instead of list of posts
-                yield self._generate_subclassification_page(taxonomy, node, context, kw, lang)
+                if generate_list:
+                    yield self._generate_subclassification_page(taxonomy, node, context, kw, lang)
                 return
         # Generate RSS feed
-        if kw["generate_rss"] and not taxonomy.always_disable_rss:
-            yield self._generate_classification_page_as_rss(taxonomy, classification, filtered_posts, context['title'], context.get("description"), kw, lang)
+        if generate_rss:
+            if kw["generate_rss"] and not taxonomy.always_disable_rss:
+                yield self._generate_classification_page_as_rss(taxonomy, classification, filtered_posts, context['title'], context.get("description"), kw, lang)
         # Render HTML
-        if taxonomy.show_list_as_index:
-            yield self._generate_classification_page_as_index(taxonomy, classification, filtered_posts, context, kw, lang)
-        else:
-            yield self._generate_classification_page_as_list(taxonomy, classification, filtered_posts, context, kw, lang)
+        if generate_list:
+            if taxonomy.show_list_as_index:
+                yield self._generate_classification_page_as_index(taxonomy, classification, filtered_posts, context, kw, lang)
+            else:
+                yield self._generate_classification_page_as_list(taxonomy, classification, filtered_posts, context, kw, lang)
 
     def gen_tasks(self):
         """Render the tag pages and feeds."""