Support compound file extensions. Fix #2780

RELEASE.md

@@ -0,0 +1,3 @@
+Release type: minor
+
+Support matching compound file extensions for custom readers; e.g., `.md.html`

pelican/generators.py

@@ -7,6 +7,7 @@
 from functools import partial
 from itertools import chain, groupby
 from operator import attrgetter
+from pathlib import Path
 
 from jinja2 import (BaseLoader, ChoiceLoader, Environment, FileSystemLoader,
  PrefixLoader, TemplateNotFound)
@@ -123,7 +124,7 @@ def _include_path(self, path, extensions=None):
  if any(fnmatch.fnmatch(basename, ignore) for ignore in ignores):
  return False
 
- ext = os.path.splitext(basename)[1][1:]
+ ext = ''.join(Path(basename).suffixes)[1:]
  if extensions is False or ext in extensions:
  return True
 

pelican/tests/test_generators.py

@@ -41,6 +41,17 @@ def test_include_path(self):
  ignored_file = os.path.join(CUR_DIR, 'content', 'ignored1.rst')
  self.assertFalse(include_path(ignored_file))
 
+ def test_include_path_handles_compound_extensions(self):
+ """
+ Test that Generator._include_path properly handles
+ compound extensions such as .md.html
+ """
+ filename = os.path.join(CUR_DIR, 'content', 'article.md.html')
+ include_path = self.generator._include_path
+ self.assertTrue(include_path(filename, extensions=('md.html',)))
+ self.assertFalse(include_path(filename, extensions=('md',)))
+ self.assertFalse(include_path(filename, extensions=('html',)))
+
  def test_get_files_exclude(self):
  """Test that Generator.get_files() properly excludes directories.
  """