Merge branch 'master' into flowr-no-jquery

ralsina · web-flow · commit cc89a66efbef · 2017-05-19T17:04:46.000+02:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,7 @@ Features
 --------
 
 * Ported gallery image layout to base theme (Issue #2775)
+* Better error handling when posts can't be parsed (Issue #2771)
 * Use ``.theme`` files to store theme metadata (Issue #2758)
 * New ``add_header_permalinks`` filter, for Sphinx-style header links
   (Issue #2636)
diff --git a/nikola/__main__.py b/nikola/__main__.py
@@ -275,13 +275,17 @@ def load_tasks(self, cmd, opt_values, pos_args):
             }
         DOIT_CONFIG['default_tasks'] = ['render_site', 'post_render']
         DOIT_CONFIG.update(self.nikola._doit_config)
-        tasks = generate_tasks(
-            'render_site',
-            self.nikola.gen_tasks('render_site', "Task", 'Group of tasks to render the site.'))
-        latetasks = generate_tasks(
-            'post_render',
-            self.nikola.gen_tasks('post_render', "LateTask", 'Group of tasks to be executed after site is rendered.'))
-        signal('initialized').send(self.nikola)
+        try:
+            tasks = generate_tasks(
+                'render_site',
+                self.nikola.gen_tasks('render_site', "Task", 'Group of tasks to render the site.'))
+            latetasks = generate_tasks(
+                'post_render',
+                self.nikola.gen_tasks('post_render', "LateTask", 'Group of tasks to be executed after site is rendered.'))
+            signal('initialized').send(self.nikola)
+        except Exception:
+            LOGGER.error('Error loading tasks')
+            sys.exit(3)
         return tasks + latetasks, DOIT_CONFIG
 
 
@@ -363,7 +367,12 @@ def run(self, cmd_args):
                 LOGGER.error("This command needs to run inside an "
                              "existing Nikola site.")
                 return 3
-        return super(DoitNikola, self).run(cmd_args)
+        try:
+            return super(DoitNikola, self).run(cmd_args)
+        except Exception:
+            if self.nikola.debug:
+                raise
+            return 1
 
     @staticmethod
     def print_version():
diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -2125,7 +2125,11 @@ def scan_posts(self, really=False, ignore_quit=False, quiet=False):
         self.pages = []
 
         for p in sorted(self.plugin_manager.getPluginsOfCategory('PostScanner'), key=operator.attrgetter('name')):
-            timeline = p.plugin_object.scan()
+            try:
+                timeline = p.plugin_object.scan()
+            except Exception:
+                utils.LOGGER.error('Error reading timeline')
+                raise
             # FIXME: can there be conflicts here?
             self.timeline.extend(timeline)
 
diff --git a/nikola/post.py b/nikola/post.py
@@ -198,7 +198,12 @@ def __init__(
         try:
             self.date = to_datetime(self.meta[self.default_lang]['date'], tzinfo)
         except ValueError:
-            raise ValueError("Invalid date '{0}' in file {1}".format(self.meta[self.default_lang]['date'], source_path))
+            if not self.meta[self.default_lang]['date']:
+                msg = 'Missing date in file {}'.format(source_path)
+            else:
+                msg = "Invalid date '{0}' in file {1}".format(self.meta[self.default_lang]['date'], source_path)
+            LOGGER.error(msg)
+            raise ValueError(msg)
 
         if 'updated' not in default_metadata:
             default_metadata['updated'] = default_metadata.get('date', None)
@@ -976,7 +981,9 @@ def get_metadata_from_file(source_path, config=None, lang=None):
             meta_data = [x.strip() for x in meta_file.readlines()]
         return _get_metadata_from_file(meta_data)
     except (UnicodeDecodeError, UnicodeEncodeError):
-        raise ValueError('Error reading {0}: Nikola only supports UTF-8 files'.format(source_path))
+        msg = 'Error reading {0}: Nikola only supports UTF-8 files'.format(source_path)
+        LOGGER.error(msg)
+        raise ValueError(msg)
     except Exception:  # The file may not exist, for multilingual sites
         return {}
 
