Code factorisation, and better error message when file not found.

patacrep/content/include.py

@@ -13,6 +13,7 @@ import logging
 
 from patacrep.content import process_content, ContentError
 from patacrep import encoding
+from patacrep import errors
 
 LOGGER = logging.getLogger(__name__)
 
@@ -26,8 +27,10 @@ def load_from_datadirs(path, config=None):
         if os.path.exists(filepath):
             return filepath
     # File not found
-    raise ContentError("include", "The file '{0}' was not found in the "
+    raise ContentError(
-                        "datadirs.".format(path))
+            "include",
+            errors.notfound(path, config.get("datadir", [])),
+            )
 
 #pylint: disable=unused-argument
 def parse(keyword, config, argument, contentlist):

patacrep/content/song.py

@@ -9,7 +9,7 @@ import logging
 import os
 
 from patacrep.content import Content, process_content, ContentError
-from patacrep import files
+from patacrep import files, errors
 from patacrep.songs import Song
 
 LOGGER = logging.getLogger(__name__)
@@ -86,9 +86,11 @@ def parse(keyword, argument, contentlist, config):
                 break
         if len(songlist) == before:
             # No songs were added
-            LOGGER.warning(
+            LOGGER.warning(errors.notfound(
-                    "Expression '{}' did not match any file".format(elem)
+                elem,
-                    )
+                [item.fullpath for item in config['_songdir']],
+                message='Ignoring "{name}": did not match any file in {paths}.',
+                ))
     return songlist
 
 

patacrep/content/tex.py

@@ -6,7 +6,7 @@
 import logging
 import os
 
-from patacrep import files
+from patacrep import files, errors
 from patacrep.content import Content
 
 LOGGER = logging.getLogger(__name__)
@@ -51,13 +51,8 @@ def parse(keyword, argument, contentlist, config):
                     ))
                 break
         if not checked_file:
-            LOGGER.warning(
+            LOGGER.warning("{} Compilation may fail later.".format(
-                ('Cannot find file "{}" in {}. Compilation may fail '
+                errors.notfound(filename, basefolders))
-                'later.').format(
-                    filename,
-                    ", ".join(
-                        ['"{}"'.format(folder) for folder in basefolders]
-                    ))
                 )
             continue
         filelist.append(LaTeX(checked_file))

patacrep/errors.py

@@ -84,3 +84,14 @@ class UnknownStep(SongbookError):
     def __str__(self):
         return """Compilation step "{step}" unknown.""".format(step=self.step)
 
+def notfound(filename, paths, message=None):
+    """Return a string saying that file was not found in paths."""
+    if message is None:
+        message = 'File "{name}" not found in directories {paths}.'
+    unique_paths = []
+    #pylint: disable=expression-not-assigned
+    [unique_paths.append(item) for item in paths if item not in unique_paths]
+    return message.format(
+            name=filename,
+            paths=", ".join(['"{}"'.format(item) for item in unique_paths]),
+            )

patacrep/templates.py

@@ -100,10 +100,18 @@ class TexRenderer(object):
         try:
             self.template = self.texenv.get_template(template)
         except TemplateNotFound as exception:
+            # Only works if all loaders are FileSystemLoader().
+            paths = [
+                    item
+                    for loader in self.texenv.loader.loaders
+                    for item in loader.searchpath
+                    ]
             raise errors.TemplateError(
                     exception,
-                    """Template "{template}" not found.""".format(
+                    errors.notfound(
-                        template=exception.name
+                        exception.name,
+                        paths,
+                        message='Template "{name}" not found in {paths}.'
                         ),
                     )