X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=dbuscron%2Fcommand.py;h=43b0824d55c4c2b755b34b3291c8910b7c9e5955;hb=3199277f113e3c9238f3d4d48b03df7e3ca43d55;hp=3713c17f794c214fe6fdda0e393c9abd95dfda82;hpb=f3a4f10008cfdd94f18d243a46b826d952dc8026;p=dbuscron

diff --git a/dbuscron/command.py b/dbuscron/command.py
index 3713c17..43b0824 100644
--- a/dbuscron/command.py
+++ b/dbuscron/command.py
@@ -1,6 +1,9 @@
+# encoding: utf-8
 
 import os
 from dbuscron.bus import get_dbus_message_type, dbus_to_str
+from dbuscron.logger import Logger
+log = Logger(__name__)
 
 class Command(object):
     def __init__(self, cmd):
@@ -11,24 +14,42 @@ class Command(object):
         else:
             self.__args = cmd.split(' ')
             self.__file = self.__args[0]
+            if len(self.__args) == 1 \
+                and self.__file.startswith('!'):
+                self.__file = self.__file.lstrip('!')
+                self.__auto_args = True
+            else:
+                self.__auto_args = False
 
     def __call__(self, bus, message, environ):
-        args_list = message.get_args_list()
+        args_list = map(dbus_to_str, message.get_args_list())
         env = dict()
         env.update(environ)
-        dbus_env = dict(
-                (('DBUS_ARG%d' % i, dbus_to_str(a)) for i, a in enumerate(args_list)),
-                DBUS_ARGN   = str(len(args_list)),
-                DBUS_SENDER = str(message.get_sender()),
-                DBUS_DEST   = str(message.get_destination()),
-                DBUS_IFACE  = str(message.get_interface()),
-                DBUS_PATH   = str(message.get_path()),
-                DBUS_MEMBER = str(message.get_member()),
-                DBUS_BUS    = bus.__class__.__name__.lower()[0:-3],
-                DBUS_TYPE   = get_dbus_message_type(message)
-                )
-        env.update(dbus_env)
-        result = os.spawnvpe(os.P_WAIT, self.__file, self.__args, env)
+        try:
+            dbus_env = dict(
+                    (('DBUS_ARG%d' % i, a) for i, a in enumerate(args_list)),
+                    DBUS_ARGN   = str(len(args_list)),
+                    DBUS_SENDER = str(message.get_sender()),
+                    DBUS_DEST   = str(message.get_destination()),
+                    DBUS_IFACE  = str(message.get_interface()),
+                    DBUS_PATH   = str(message.get_path()),
+                    DBUS_MEMBER = str(message.get_member()),
+                    DBUS_BUS    = bus.__class__.__name__.lower()[0:-3],
+                    DBUS_TYPE   = get_dbus_message_type(message)
+                    )
+            env.update(dbus_env)
+        except Exception, e:
+            log.error('environ exception', e)
+            raise e
+
+        if self.__auto_args:
+            args_list.insert(0, self.__file)
+        else:
+            args_list = self.__args
+
+        result = os.spawnvpe(os.P_WAIT, self.__file, args_list, env)
+        if result != 0:
+            log.warn('command returned non-zero status', self.__file, args_list, dbus_env, result)
         return result
 
     @property
@@ -45,6 +66,10 @@ class Commands(object):
     __commands = {}
     __environ = {}
 
+    def __iter__(self):
+        for m, c in self.__commands.iteritems():
+            yield m, c
+
     def _get_environ(self):
         return self.__environ
 
@@ -58,9 +83,13 @@ class Commands(object):
     def handler(self, bus, message):
         for rule, command in self.__commands.iteritems():
             if rule.match(bus, message):
+                log('rule matched', rule, command)
                 command(bus, message, self.__environ)
                 return
 
     def add(self, matcher, command):
         self.__commands[matcher] = command
 
+    def clear(self):
+        self.__commands = {}
+