changelog format fix

[dbuscron] / dbuscron / bus.py

diff --git a/dbuscron/bus.py b/dbuscron/bus.py
index 468abc0..0514618 100644 (file)
--- a/dbuscron/bus.py
+++ b/dbuscron/bus.py
@@ -1,21 +1,31 @@
+from __future__ import with_statement
 
-import dbus
+import dbus, os
+from fnmatch import fnmatch
 
 from dbuscron.logger import Logger
 log = Logger(__name__)
 
 def dbus_to_str(value):
-    log('converting', value, 'of type', type(value))
-    if isinstance(value, dbus.Byte):
-        return str(int(value))
-    elif isinstance(value, dbus.ByteArray):
-        return ','.join(str(ord(v)) for v in value)
-    elif isinstance(value, dbus.Array):
-        return ','.join(dbus_to_str(v) for v in value)
-    elif isinstance(value, dbus.Dictionary):
-        return ','.join('%s:%s' % (k, dbus_to_str(v)) for k, v in value.iteritems())
-    else:
-        return str(value)
+    try:
+        if value is None:
+            return ''
+        elif 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
 
 def get_dbus_message_type(message):
     result = message.__class__.__name__[0:-7]
@@ -28,15 +38,35 @@ class DbusBus(object):
     __system_bus = None
     __session_bus = None
 
-    def __new__(cls):
+    def __new__(cls, *args, **kw):
         if not cls.__bus:
             cls.__bus = super(DbusBus, cls).__new__(cls)
         return cls.__bus
 
-    def __init__(self):
+    def __init__(self, session_bus_address=None):
+        if session_bus_address:
+            self.set_session_bus_address(session_bus_address)
+        else:
+            self.get_session_bus_address()
+
         from dbus.mainloop.glib import DBusGMainLoop
         DBusGMainLoop(set_as_default=True)
 
+    def set_session_bus_address(self, value):
+        os.environ['DBUS_SESSION_BUS_ADDRESS'] = str(value)
+
+    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
+
+    session_bus_address = property(get_session_bus_address, set_session_bus_address)
+
     @property
     def system(self):
         if not self.__system_bus:
@@ -80,8 +110,8 @@ class DbusRule(object):
         if rule:
             self._bus.remove_match_string(rule)
 
-    #def __del__(self):
-    #    self.unregister()
+    def __del__(self):
+       self.unregister()
 
     def __str__(self):
         rule = []
@@ -97,7 +127,6 @@ class DbusRule(object):
         return ','.join(rule)
 
     def match(self, bus, message):
-
         if self._bus not in (None, bus):
             return False
 
@@ -126,8 +155,10 @@ class DbusRule(object):
             for i, arg in enumerate(args_):
                 if i >= len(self._args):
                     break
-                if self._args[i] not in (None, str(arg)):
-                    return False
+                a = dbus_to_str(arg)
+                if self._args[i] not in (None, a):
+                    if not fnmatch(a, self._args[i]):
+                        return False
 
         return True