Imported Upstream version 7.7.3upstream/7.7.3

1 files changed, 14 insertions, 9 deletions

diff --git a/nikola/plugins/command/auto/__init__.py b/nikola/plugins/command/auto/__init__.py
index 71f9624..e339c06 100644
--- a/nikola/plugins/command/auto/__init__.py
+++ b/nikola/plugins/command/auto/__init__.py
@@ -63,7 +63,7 @@ except ImportError:
 
 
 from nikola.plugin_categories import Command
-from nikola.utils import req_missing, get_logger, get_theme_path, STDERR_HANDLER
+from nikola.utils import dns_sd, req_missing, get_logger, get_theme_path, STDERR_HANDLER
 LRJS_PATH = os.path.join(os.path.dirname(__file__), 'livereload.js')
 error_signal = signal('error')
 refresh_signal = signal('refresh')
@@ -79,13 +79,14 @@ ERROR {}
 
 
 class CommandAuto(Command):
-
     """Automatic rebuilds for Nikola."""
 
     name = "auto"
     logger = None
     has_server = True
     doc_purpose = "builds and serves a site; automatically detects site changes, rebuilds, and optionally refreshes a browser"
+    dns_sd = None
+
     cmd_options = [
         {
             'name': 'port',
@@ -156,7 +157,7 @@ class CommandAuto(Command):
 
         # Do not duplicate entries -- otherwise, multiple rebuilds are triggered
         watched = set([
-            'templates/',
+            'templates/', 'plugins/',
         ] + [get_theme_path(name) for name in self.site.THEMES])
         for item in self.site.config['post_pages']:
             watched.add(os.path.dirname(item[0]))
@@ -208,7 +209,6 @@ class CommandAuto(Command):
         parent = self
 
         class Mixed(WebSocketWSGIApplication):
-
             """A class that supports WS and HTTP protocols on the same port."""
 
             def __call__(self, environ, start_response):
@@ -235,9 +235,12 @@ class CommandAuto(Command):
                 webbrowser.open('http://{0}:{1}'.format(host, port))
 
             try:
+                self.dns_sd = dns_sd(port, (options['ipv6'] or '::' in host))
                 ws.serve_forever()
             except KeyboardInterrupt:
                 self.logger.info("Server is shutting down.")
+                if self.dns_sd:
+                    self.dns_sd.Reset()
                 # This is a hack, but something is locking up in a futex
                 # and exit() doesn't work.
                 os.kill(os.getpid(), 15)
@@ -262,6 +265,8 @@ class CommandAuto(Command):
         fname = os.path.basename(event_path)
         if (fname.endswith('~') or
                 fname.startswith('.') or
+                '__pycache__' in event_path or
+                event_path.endswith(('.pyc', '.pyo', '.pyd')) or
                 os.path.isdir(event_path)):  # Skip on folders, these are usually duplicates
             return
         self.logger.info('REBUILDING SITE (from {0})'.format(event_path))
@@ -300,11 +305,14 @@ class CommandAuto(Command):
             mimetype = 'text/html'
 
         if p_uri.path == '/robots.txt':
-            start_response('200 OK', [('Content-type', 'text/plain')])
+            start_response('200 OK', [('Content-type', 'text/plain; charset=UTF-8')])
             return ['User-Agent: *\nDisallow: /\n'.encode('utf-8')]
         elif os.path.isfile(f_path):
             with open(f_path, 'rb') as fd:
-                start_response('200 OK', [('Content-type', mimetype)])
+                if mimetype.startswith('text/') or mimetype.endswith('+xml'):
+                    start_response('200 OK', [('Content-type', "{0}; charset=UTF-8".format(mimetype))])
+                else:
+                    start_response('200 OK', [('Content-type', mimetype)])
                 return [self.file_filter(mimetype, fd.read())]
         elif p_uri.path == '/livereload.js':
             with open(LRJS_PATH, 'rb') as fd:
@@ -337,7 +345,6 @@ pending = []
 
 
 class LRSocket(WebSocket):
-
     """Speak Livereload protocol."""
 
     def __init__(self, *a, **kw):
@@ -410,7 +417,6 @@ class LRSocket(WebSocket):
 
 
 class OurWatchHandler(FileSystemEventHandler):
-
     """A Nikola-specific handler for Watchdog."""
 
     def __init__(self, function):
@@ -424,7 +430,6 @@ class OurWatchHandler(FileSystemEventHandler):
 
 
 class ConfigWatchHandler(FileSystemEventHandler):
-
     """A Nikola-specific handler for Watchdog that handles the config file (as a workaround)."""
 
     def __init__(self, configuration_filename, function):