Merge pull request #4 from thawk/master

[etc/taskwarrior.git] / on-modify-pirate

diff --git a/on-modify-pirate b/on-modify-pirate
index 018b2eff3bec99da2bdff8d3e555a3dbdd787437..b7b49865432718dc50c1b02a3cc8a274a3bb7259 100755 (executable)
--- a/on-modify-pirate
+++ b/on-modify-pirate
@@ -1,16 +1,17 @@
-#!/usr/bin/python
+#!/usr/bin/env python

 
 import glob
 import imp
 import os
 
 
 import glob
 import imp
 import os
 

-from tasklib.task import TaskWarrior, Task
+from tasklib import TaskWarrior, Task

 
 
 def find_hooks(file_prefix):
     # Find all files in subdirectories whose names start with <file_prefix>
     file_pattern = os.path.dirname(__file__) + '/*/' + file_prefix + "*.py"
     module_paths = [f for f in glob.glob(file_pattern) if os.path.isfile(f)]
 
 
 def find_hooks(file_prefix):
     # Find all files in subdirectories whose names start with <file_prefix>
     file_pattern = os.path.dirname(__file__) + '/*/' + file_prefix + "*.py"
     module_paths = [f for f in glob.glob(file_pattern) if os.path.isfile(f)]

+    module_paths.sort()

 
     # Gather all hooks in these files
     hooks = []
 
     # Gather all hooks in these files
     hooks = []


@@ -20,6 +21,7 @@ def find_hooks(file_prefix):
         module_dir = os.path.dirname(module_path)
         module_filename = os.path.basename(module_path)
         module_name = 'pirate_{0}_{1}'.format(module_dir, module_filename)
         module_dir = os.path.dirname(module_path)
         module_filename = os.path.basename(module_path)
         module_name = 'pirate_{0}_{1}'.format(module_dir, module_filename)

+        module_name = module_name.replace('.', '_')

         module = imp.load_source(module_name, module_path)
 
         # Find all hook methods available
         module = imp.load_source(module_name, module_path)
 
         # Find all hook methods available


@@ -38,4 +40,4 @@ task = Task.from_input()
 for hook in find_hooks('pirate_mod'):
     hook(task)
 
 for hook in find_hooks('pirate_mod'):
     hook(task)
 

-print task.export_data()
+print(task.export_data())