nixo/tuhi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ble: use properties instead of variables

Browse Source 
Replace variables (objpath, interface, uuid) with properties.

Signed-off-by: Daniel Martin <consume.noise@gmail.com>
This commit is contained in:
Daniel Martin 2019-06-06 12:22:50 +02:00 committed by Peter Hutterer
parent 7f9e58e587
commit c719ecf2e2
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tuhi/ble.py
View File

@ -35,17 +35,26 @@ class BlueZCharacteristic(GObject.Object):
:param obj: the org.bluez.GattCharacteristic1 DBus proxy object :param obj: the org.bluez.GattCharacteristic1 DBus proxy object
''' '''
self.obj = obj self.obj = obj
self.objpath = obj.get_object_path()
self.interface = obj.get_interface(ORG_BLUEZ_GATTCHARACTERISTIC1)
assert(self.interface is not None)
self.uuid = self.interface.get_cached_property('UUID').unpack() assert(self.interface is not None)
assert(self.uuid is not None) assert(self.uuid is not None)
self._property_callbacks = {} self._property_callbacks = {}
self.interface.connect('g-properties-changed', self.interface.connect('g-properties-changed',
self._on_properties_changed) self._on_properties_changed)
@GObject.Property
def interface(self):
return self.obj.get_interface(ORG_BLUEZ_GATTCHARACTERISTIC1)
@GObject.Property
def objpath(self):
return self.obj.get_object_path()
@GObject.Property
def uuid(self):
return self.interface.get_cached_property('UUID').unpack()
def connect_property(self, propname, callback): def connect_property(self, propname, callback):
''' '''
Connect the property with the given name to the callback function Connect the property with the given name to the callback function
@ -104,10 +113,9 @@ class BlueZDevice(GObject.Object):
:param obj: The org.bluez.Device1 DBus proxy object :param obj: The org.bluez.Device1 DBus proxy object
''' '''
GObject.Object.__init__(self) GObject.Object.__init__(self)
self.objpath = obj.get_object_path()
self.obj = obj self.obj = obj
self.om = om self.om = om
self.interface = obj.get_interface(ORG_BLUEZ_DEVICE1)
assert(self.interface is not None) assert(self.interface is not None)
logger.debug(f'Device {self.objpath} - {self.address} - {self.name}') logger.debug(f'Device {self.objpath} - {self.address} - {self.name}')
@ -118,6 +126,14 @@ class BlueZDevice(GObject.Object):
if self.connected: if self.connected:
self.emit('connected') self.emit('connected')
@GObject.Property
def objpath(self):
return self.obj.get_object_path()
@GObject.Property
def interface(self):
return self.obj.get_interface(ORG_BLUEZ_DEVICE1)
@GObject.Property @GObject.Property
def name(self): def name(self):
try: try: