Merge pull request #4 from klaascuvelier/improvements

Improvements

CommandOnSave.py

@@ -1,20 +1,47 @@
+import os
 import sublime
 import sublime_plugin
 import subprocess
 
 
-class CommandOnSave(sublime_plugin.EventListener):
-    def on_post_save(self, view):
+_STATUS_KEY = 'CommandOnSave'
 
+class CommandOnSave(sublime_plugin.EventListener):
+    def on_post_save_async(self, view):
         settings = sublime.load_settings('CommandOnSave.sublime-settings').get('commands')
+        if settings is None:
+            return
+
         file = view.file_name()
+        before_stat = None
+
+        view.erase_status(_STATUS_KEY)
+        for path, commands in settings.items():
+            if file.startswith(path):
+                for command in commands:
+                    # record the mtime so we can check if we need to reload the file
+                    if before_stat is None:
+                        before_stat = os.stat(file)
+
+                    command = re.sub(
+                        r"\b_file_\b",
+                        file,
+                        command
+                    )
+
+                    process = subprocess.Popen(command,
+                        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+                    output = process.stdout.read()
+                    code = process.wait()
+                    if code != 0:
+                        view.set_status(_STATUS_KEY, 'ERROR: Command failed: %s' % (
+                            ' '.join(command)))
+                        print('CommandOnSave %s failed code %d; output: %s' % (
+                            ' '.join(command), code, output))
+                        # attempt to execute any other commands
 
-        if not settings == None:
-            for path in settings.keys():
-                commands = settings.get(path)
-                if file.startswith(path) and len(commands) > 0:
-                    print("Command on Save:")
-                    for command in commands:
-                        p = subprocess.Popen([command], shell=True, stdout=subprocess.PIPE)
-                        out, err = p.communicate()
-                        print (out.decode('utf-8'))
+        if before_stat is not None and not view.is_dirty():
+            after_stat = os.stat(file)
+            if before_stat.st_mtime != after_stat.st_mtime:
+                # it seems like the file changed: reload the view
+                view.run_command('revert')

README.md

@@ -17,6 +17,10 @@ Usage
 =====
 This plugin reads commands from the settings file. The commands settings-key is an associative array of paths and their commands. Everytime a file is saved, all commands for every matched path-key is executed.
 
+The path of the file that is being save can get injected into your command with the `_file_` placeholder.
+
+If your command updates the content of the save file, the file will be reloaded in Sublime afterwards (thanks to @evanj).
+
 For more info, see the examples