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

Add support for gvariant annotations (#1258)

Browse Source
This commit is contained in:
Pascal Vizeli 2019-08-23 13:41:17 +02:00 committed by GitHub
parent 8abe33d48a
commit 387d2dcc2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hassio/utils/gdbus.py
View File

@ -21,8 +21,8 @@ _LOGGER: logging.Logger = logging.getLogger(__name__)
# Use to convert GVariant into json # Use to convert GVariant into json
RE_GVARIANT_TYPE: re.Match = re.compile( RE_GVARIANT_TYPE: re.Match = re.compile(
r"(?:boolean|byte|int16|uint16|int32|uint32|handle|int64|uint64|double|" r"\"[^\"\\]*(?:\\.[^\"\\]*)*\"|(boolean|byte|int16|uint16|int32|uint32|handle|int64|uint64|double|"
r"string|objectpath|signature) " r"string|objectpath|signature|@[asviumodf\{\}]+) "
) )
RE_GVARIANT_VARIANT: re.Match = re.compile(r"\"[^\"\\]*(?:\\.[^\"\\]*)*\"|(<|>)") RE_GVARIANT_VARIANT: re.Match = re.compile(r"\"[^\"\\]*(?:\\.[^\"\\]*)*\"|(<|>)")
RE_GVARIANT_STRING_ESC: re.Match = re.compile( RE_GVARIANT_STRING_ESC: re.Match = re.compile(
@ -107,11 +107,16 @@ class DBus:
@staticmethod @staticmethod
def parse_gvariant(raw: str) -> Any: def parse_gvariant(raw: str) -> Any:
"""Parse GVariant input to python.""" """Parse GVariant input to python."""
json_raw: str = RE_GVARIANT_TYPE.sub("", raw) # Process first string
json_raw = RE_GVARIANT_STRING_ESC.sub( json_raw = RE_GVARIANT_STRING_ESC.sub(
lambda x: x.group(0).replace('"', '\\"'), json_raw lambda x: x.group(0).replace('"', '\\"'), raw
) )
json_raw = RE_GVARIANT_STRING.sub(r'"\1"', json_raw) json_raw = RE_GVARIANT_STRING.sub(r'"\1"', json_raw)
# Remove complex type handling
json_raw: str = RE_GVARIANT_TYPE.sub(
lambda x: x.group(0) if not x.group(1) else "", json_raw
)
json_raw = RE_GVARIANT_VARIANT.sub( json_raw = RE_GVARIANT_VARIANT.sub(
lambda x: x.group(0) if not x.group(1) else "", json_raw lambda x: x.group(0) if not x.group(1) else "", json_raw
) )

10
tests/utils/test_gvariant_parser.py
View File

@ -300,3 +300,13 @@ def test_networkmanager_dns_properties():
], ],
} }
] ]
def test_networkmanager_dns_properties_empty():
"""Test NetworkManager DNS properties."""
raw = "({'Mode': <'default'>, 'RcManager': <'resolvconf'>, 'Configuration': <@aa{sv} []>},)"
# parse data
data = DBus.parse_gvariant(raw)
assert data == [{"Mode": "default", "RcManager": "resolvconf", "Configuration": []}]