jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-17 22:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes (#457)

Browse Source 
* Update gdbus.py

* Update gdbus.py

* Update gdbus.py

* Update gdbus.py

* Update gdbus.py

* Update gdbus.py

* Update gdbus.py

* Update gdbus.py

* Update gdbus.py

* Update gdbus.py
This commit is contained in:
Pascal Vizeli 2018-05-03 23:22:48 +02:00 committed by GitHub
parent 7c6bf96f6f
commit 0b15f88da3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hassio/utils/gdbus.py
View File

@ -54,7 +54,7 @@ class DBus:
)) ))
# Ask data # Ask data
_LOGGER.info("Introspect %s no %s", self.bus_name, self.object_path) _LOGGER.info("Introspect %s on %s", self.bus_name, self.object_path)
data = await self._send(command) data = await self._send(command)
# Parse XML # Parse XML
@ -65,9 +65,10 @@ class DBus:
raise DBusParseError() from None raise DBusParseError() from None
# Read available methods # Read available methods
for interface in xml.findall("/node/interface"): _LOGGER.debug("data: %s", data)
for interface in xml.findall("./interface"):
interface_name = interface.get('name') interface_name = interface.get('name')
for method in interface.findall("/method"): for method in interface.findall("./method"):
method_name = method.get('name') method_name = method.get('name')
self.methods.add(f"{interface_name}.{method_name}") self.methods.add(f"{interface_name}.{method_name}")
@ -79,6 +80,10 @@ class DBus:
raw = RE_GVARIANT_VARIANT.sub(r"\1", raw) raw = RE_GVARIANT_VARIANT.sub(r"\1", raw)
raw = RE_GVARIANT_STRING.sub(r'"\1"', raw) raw = RE_GVARIANT_STRING.sub(r'"\1"', raw)
# No data
if raw.startswith("()"):
return {}
try: try:
return json.loads(raw) return json.loads(raw)
except json.JSONDecodeError as err: except json.JSONDecodeError as err:
@ -112,6 +117,7 @@ class DBus:
async def _send(self, command): async def _send(self, command):
"""Send command over dbus.""" """Send command over dbus."""
# Run command # Run command
_LOGGER.debug("Send dbus command: %s", command)
try: try:
proc = await asyncio.create_subprocess_exec( proc = await asyncio.create_subprocess_exec(
*command, *command,
@ -135,7 +141,7 @@ class DBus:
def __getattr__(self, name): def __getattr__(self, name):
"""Mapping to dbus method.""" """Mapping to dbus method."""
return getattr(DBusCallWrapper(self, self.object_path), name) return getattr(DBusCallWrapper(self, self.bus_name), name)
class DBusCallWrapper: class DBusCallWrapper:
@ -163,6 +169,6 @@ class DBusCallWrapper:
Return a coroutine Return a coroutine
""" """
return self.dbus.call_dbus(self.interface, *args) return self.dbus.call_dbus(interface, *args)
return _method_wrapper return _method_wrapper