Merge pull request #367 from ametaireau/reload-for-settings

Also reload when the settings file changes.

pelican/__init__.py

@@ -11,7 +11,7 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
         StaticGenerator, PdfGenerator, LessCSSGenerator)
 from pelican.log import init
 from pelican.settings import read_settings, _DEFAULT_CONFIG
-from pelican.utils import clean_output_dir, files_changed
+from pelican.utils import clean_output_dir, files_changed, file_changed
 from pelican.writers import Writer
 
 __major__ = 3
@@ -155,7 +155,7 @@ class Pelican(object):
         generators = [StaticGenerator, ArticlesGenerator, PagesGenerator]
         if self.settings['PDF_GENERATOR']:
             generators.append(PdfGenerator)
-        if self.settings['LESS_GENERATOR']: # can be True or PATH to lessc
+        if self.settings['LESS_GENERATOR']:  # can be True or PATH to lessc
             generators.append(LessCSSGenerator)
         return generators
 
@@ -213,11 +213,7 @@ def parse_arguments():
     return parser.parse_args()
 
 
-def main():
-    args = parse_arguments()
-    init(args.verbosity)
-    # Split the markup languages only if some have been given. Otherwise,
-    # populate the variable with None.
+def get_instance(args):
     markup = [a.strip().lower() for a in args.markup.split(',')]\
               if args.markup else None
 
@@ -229,9 +225,18 @@ def main():
         module = __import__(module)
         cls = getattr(module, cls_name)
 
+    return cls(settings, args.path, args.theme, args.output, markup,
+               args.delete_outputdir)
+
+
+def main():
+    args = parse_arguments()
+    init(args.verbosity)
+    # Split the markup languages only if some have been given. Otherwise,
+    # populate the variable with None.
+    pelican = get_instance(args)
+
     try:
-        pelican = cls(settings, args.path, args.theme, args.output, markup,
-                args.delete_outputdir)
         if args.autoreload:
             while True:
                 try:
@@ -243,6 +248,14 @@ def main():
                     if files_changed(pelican.path, pelican.markup) or \
                             files_changed(pelican.theme, ['']):
                         pelican.run()
+
+                    # reload also if settings.py changed
+                    if file_changed(args.settings):
+                        logger.info('%s changed, re-generating' %
+                                    args.settings)
+                        pelican = get_instance(args)
+                        pelican.run()
+
                     time.sleep(.5)  # sleep to avoid cpu load
                 except KeyboardInterrupt:
                     break

pelican/utils.py

@@ -4,6 +4,7 @@ import re
 import pytz
 import shutil
 import logging
+from collections import defaultdict
 
 from codecs import open as _open
 from datetime import datetime
@@ -221,9 +222,9 @@ def files_changed(path, extensions):
         """Return the last time files have been modified"""
         for root, dirs, files in os.walk(path):
             dirs[:] = [x for x in dirs if x[0] != '.']
-            for file in files:
-                if any(file.endswith(ext) for ext in extensions):
-                    yield os.stat(os.path.join(root, file)).st_mtime
+            for f in files:
+                if any(f.endswith(ext) for ext in extensions):
+                    yield os.stat(os.path.join(root, f)).st_mtime
 
     global LAST_MTIME
     mtime = max(file_times(path))
@@ -233,6 +234,21 @@ def files_changed(path, extensions):
     return False
 
 
+FILENAMES_MTIMES = defaultdict(int)
+
+
+def file_changed(filename):
+    mtime = os.stat(filename).st_mtime
+    if FILENAMES_MTIMES[filename] == 0:
+        FILENAMES_MTIMES[filename] = mtime
+        return False
+    else:
+        if mtime > FILENAMES_MTIMES[filename]:
+            FILENAMES_MTIMES[filename] = mtime
+            return True
+        return False
+
+
 def set_date_tzinfo(d, tz_name=None):
     """ Date without tzinfo shoudbe utc.
     This function set the right tz to date that aren't utc and don't have