root
/
XiaoMi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #80 from XiaoMi/dev

Browse Source 
fix: fix get homeinfo error
main
Li Shuzhen 11 months ago committed by GitHub
parent 687bc88df7 0863fc4ef0
commit 507018d4be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File

27
custom_components/xiaomi_home/miot/miot_cloud.py
Unescape Escape View File

@ -474,6 +474,7 @@ class MIoTHttpClient:
'dids': room.get('dids', []) 'dids': room.get('dids', [])
} }
for room in home.get('roomlist', []) for room in home.get('roomlist', [])
if 'id' in room
}, },
'group_id': calc_group_id( 'group_id': calc_group_id(
uid=home['uid'], home_id=home['id']), uid=home['uid'], home_id=home['id']),
@ -493,7 +494,10 @@ class MIoTHttpClient:
home_infos['homelist'][home_id]['dids'].extend(info['dids']) home_infos['homelist'][home_id]['dids'].extend(info['dids'])
for room_id, info in info['room_info'].items(): for room_id, info in info['room_info'].items():
home_infos['homelist'][home_id]['room_info'].setdefault( home_infos['homelist'][home_id]['room_info'].setdefault(
room_id, {'dids': []}) room_id, {
'room_id': room_id,
'room_name': '',
'dids': []})
home_infos['homelist'][home_id]['room_info'][ home_infos['homelist'][home_id]['room_info'][
room_id]['dids'].extend(info['dids']) room_id]['dids'].extend(info['dids'])
@ -605,30 +609,33 @@ class MIoTHttpClient:
device_type, None) or {}).items(): device_type, None) or {}).items():
if isinstance(home_ids, list) and home_id not in home_ids: if isinstance(home_ids, list) and home_id not in home_ids:
continue continue
home_name: str = home_info['home_name']
group_id: str = home_info['group_id']
homes[device_type].setdefault( homes[device_type].setdefault(
home_id, { home_id, {
'home_name': home_info['home_name'], 'home_name': home_name,
'uid': home_info['uid'], 'uid': home_info['uid'],
'group_id': home_info['group_id'], 'group_id': group_id,
'room_info': {} 'room_info': {}
}) })
devices.update({did: { devices.update({did: {
'home_id': home_id, 'home_id': home_id,
'home_name': home_info['home_name'], 'home_name': home_name,
'room_id': home_id, 'room_id': home_id,
'room_name': home_info['home_name'], 'room_name': home_name,
'group_id': home_info['group_id'] 'group_id': group_id
} for did in home_info.get('dids', [])}) } for did in home_info.get('dids', [])})
for room_id, room_info in home_info.get('room_info').items(): for room_id, room_info in home_info.get('room_info').items():
room_name: str = room_info.get('room_name', '')
homes[device_type][home_id]['room_info'][ homes[device_type][home_id]['room_info'][
room_id] = room_info['room_name'] room_id] = room_name
devices.update({ devices.update({
did: { did: {
'home_id': home_id, 'home_id': home_id,
'home_name': home_info['home_name'], 'home_name': home_name,
'room_id': room_id, 'room_id': room_id,
'room_name': room_info['room_name'], 'room_name': room_name,
'group_id': home_info['group_id'] 'group_id': group_id
} for did in room_info.get('dids', [])}) } for did in room_info.get('dids', [])})
dids = sorted(list(devices.keys())) dids = sorted(list(devices.keys()))
results: dict[str, dict] = await self.get_devices_with_dids_async( results: dict[str, dict] = await self.get_devices_with_dids_async(

Write Preview
Loading…
Cancel
Save