Merge pull request #44 from sir-sigurd/fix-watchdog-import

refactoring: moved code for watch mode to separate function

Author: Andrey Fedoseev

static_precompiler/management/commands/compilestatic.py

@@ -1,6 +1,5 @@
 import os
 import sys
-import time
 
 from django.contrib.staticfiles.finders import get_finders
 from django.core.files.storage import FileSystemStorage
@@ -10,13 +9,6 @@
 from static_precompiler.settings import STATIC_ROOT
 from static_precompiler.utils import get_compilers
 
-try:
-    from watchdog.events import FileSystemEventHandler
-    from watchdog.observers import Observer
-    WATCHDOG_AVAILABLE = True
-except ImportError:
-    WATCHDOG_AVAILABLE = False
-
 
 def get_scanned_dirs():
     dirs = set([STATIC_ROOT])
@@ -28,35 +20,6 @@ def get_scanned_dirs():
     return sorted(dirs)
 
 
-if WATCHDOG_AVAILABLE:
-    class EventHandler(FileSystemEventHandler):
-
-        def __init__(self, scanned_dir, verbosity, compilers):
-            self.scanned_dir = scanned_dir
-            self.verbosity = verbosity
-            self.compilers = compilers
-            super(EventHandler, self).__init__()
-
-        def on_any_event(self, e):
-            if e.is_directory or e.event_type not in ("created", "modified"):
-                return
-            path = e.src_path[len(self.scanned_dir):]
-            if path.startswith("/"):
-                path = path[1:]
-            for compiler in self.compilers:
-                if compiler.is_supported(path):
-                    if self.verbosity > 1:
-                        if e.event_type == "created":
-                            print("Created: '{0}'".format(path))
-                        else:
-                            print("Modified: '{0}'".format(path))
-                    try:
-                        compiler.handle_changed_file(path)
-                    except (StaticCompilationError, ValueError) as e:
-                        print(e)
-                    break
-
-
 class Command(NoArgsCommand):
 
     help = "Compile static files."
@@ -104,26 +67,5 @@ def handle_noargs(self, **options):
                                 break
 
         if options["watch"]:
-            if not WATCHDOG_AVAILABLE:
-                sys.exit("You should install watchdog in order to use --watch.")
-
-            print("Watching directories:")
-            for scanned_dir in scanned_dirs:
-                print(scanned_dir)
-            print("\nPress Control+C to exit.\n")
-
-            observer = Observer()
-
-            for scanned_dir in scanned_dirs:
-                handler = EventHandler(scanned_dir, verbosity, compilers)
-                observer.schedule(handler, path=scanned_dir, recursive=True)
-
-            observer.start()
-
-            try:
-                while True:
-                    time.sleep(1)
-            except KeyboardInterrupt:
-                observer.stop()
-
-            observer.join()
+            from static_precompiler.watch import watch_dirs
+            watch_dirs(scanned_dirs, verbosity)

static_precompiler/watch.py

@@ -0,0 +1,56 @@
+import time
+
+from watchdog.events import FileSystemEventHandler
+from watchdog.observers import Observer
+
+from static_precompiler.exceptions import StaticCompilationError
+from static_precompiler.utils import get_compilers
+
+
+class EventHandler(FileSystemEventHandler):
+
+    def __init__(self, scanned_dir, verbosity, compilers):
+        self.scanned_dir = scanned_dir
+        self.verbosity = verbosity
+        self.compilers = compilers
+        super(EventHandler, self).__init__()
+
+    def on_any_event(self, e):
+        if e.is_directory or e.event_type not in ("created", "modified"):
+            return
+        path = e.src_path[len(self.scanned_dir):]
+        if path.startswith("/"):
+            path = path[1:]
+        for compiler in self.compilers:
+            if compiler.is_supported(path):
+                if self.verbosity > 1:
+                    print("Modified: '{0}'".format(path))
+                try:
+                    compiler.handle_changed_file(path)
+                except (StaticCompilationError, ValueError) as e:
+                    print(e)
+                break
+
+
+def watch_dirs(scanned_dirs, verbosity):
+    print("Watching directories:")
+    for scanned_dir in scanned_dirs:
+        print(scanned_dir)
+    print("\nPress Control+C to exit.\n")
+
+    compilers = get_compilers().values()
+    observer = Observer()
+
+    for scanned_dir in scanned_dirs:
+        handler = EventHandler(scanned_dir, verbosity, compilers)
+        observer.schedule(handler, path=scanned_dir, recursive=True)
+
+    observer.start()
+
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        observer.stop()
+
+    observer.join()