X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=dbuscron%2Fbus.py;h=7d7f5b85b3b54b6891acfd8e1ad600abe374ab98;hb=689661aeb4d7b906c58de6890c960e2091305f53;hp=c766860815635bc4cb625d56fa05960594092b6c;hpb=515eddaea04c7f2b351126b6a4af49faf1948d23;p=dbuscron

diff --git a/dbuscron/bus.py b/dbuscron/bus.py
index c766860..7d7f5b8 100644
--- a/dbuscron/bus.py
+++ b/dbuscron/bus.py
@@ -1,5 +1,29 @@
+from __future__ import with_statement
+
+import dbus, os
+
+from dbuscron.logger import Logger
+log = Logger(__name__)
+
+def dbus_to_str(value):
+    try:
+        if isinstance(value, dbus.Byte):
+            result = str(int(value))
+        elif isinstance(value, dbus.ByteArray):
+            result = ','.join(str(ord(v)) for v in value)
+        elif isinstance(value, dbus.Array):
+            result = ','.join(dbus_to_str(v) for v in value)
+        elif isinstance(value, dbus.Dictionary):
+            result = ','.join('%s:%s' % (k, dbus_to_str(v)) for k, v in value.iteritems())
+        elif isinstance(value, dbus.String):
+            result = value.encode('utf-8')
+        else:
+            result = str(value)
+        return result
+    except Exception, e:
+        log.error('convert exception', e)
+        raise e
 
-import dbus
 
 def get_dbus_message_type(message):
     result = message.__class__.__name__[0:-7]
@@ -18,9 +42,20 @@ class DbusBus(object):
         return cls.__bus
 
     def __init__(self):
+        self.get_session_bus_address()
         from dbus.mainloop.glib import DBusGMainLoop
         DBusGMainLoop(set_as_default=True)
 
+    def get_session_bus_address(self):
+        try:
+            return os.environ['DBUS_SESSION_BUS_ADDRESS']
+        except KeyError:
+            with open('/tmp/session_bus_address.user', 'rb') as f:
+                session_bus_address = f.readline().strip().split('=', 1).pop().strip("'\"")
+                os.environ['DBUS_SESSION_BUS_ADDRESS'] = session_bus_address
+                log('session bus address aquired', session_bus_address)
+                return session_bus_address
+
     @property
     def system(self):
         if not self.__system_bus:
@@ -57,7 +92,15 @@ class DbusRule(object):
     def register(self):
         rule = str(self)
         if rule:
-            self._bus.add_match_string(str(self))
+            self._bus.add_match_string(rule)
+
+    def unregister(self):
+        rule = str(self)
+        if rule:
+            self._bus.remove_match_string(rule)
+
+    def __del__(self):
+       self.unregister()
 
     def __str__(self):
         rule = []
@@ -102,7 +145,7 @@ class DbusRule(object):
             for i, arg in enumerate(args_):
                 if i >= len(self._args):
                     break
-                if self._args[i] not in (None, arg):
+                if self._args[i] not in (None, str(arg)):
                     return False
 
         return True