Skip to content

Commit

Permalink
🏡 add filter devices via home (#862)
Browse files Browse the repository at this point in the history
  • Loading branch information
al-one committed Nov 8, 2022
1 parent 0f54488 commit 32e1020
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 7 deletions.
6 changes: 5 additions & 1 deletion custom_components/xiaomi_miot/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,20 @@ async def get_cloud_filter_schema(hass, user_input, errors, schema=None, via_did
else:
grp = {}
vls = {}
fls = ['did'] if via_did else ['model', 'ssid', 'bssid']
fls = ['did'] if via_did else ['model', 'home_id', 'ssid', 'bssid']
for d in dvs:
for f in fls:
v = d.get(f)
if not grp:
_LOGGER.warning('get_cloud_filter_schema: %s', d)
if v is None:
continue
grp.setdefault(v, 0)
grp[v] += 1
vls.setdefault(f, {})
des = '<empty>' if v == '' else v
if f == 'home_id':
des = d.get('home_name') or des
if f in ['did']:
if MiotCloud.is_hide(d):
continue
Expand Down
2 changes: 1 addition & 1 deletion custom_components/xiaomi_miot/core/xiaomi_cloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ async def async_get_devices_by_key(self, key, renew=False, filters=None):
dat = {}
if filters is None:
filters = {}
fls = ['ssid', 'bssid', 'model', 'did']
fls = ['ssid', 'bssid', 'home_id', 'model', 'did']
dvs = await self.async_get_devices(renew=renew) or []
for d in dvs:
if not isinstance(d, dict):
Expand Down
6 changes: 5 additions & 1 deletion custom_components/xiaomi_miot/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"captcha": "Captcha",
"server_country": "Server location of MiCloud",
"conn_mode": "Connection mode for device",
"filter_models": "Filter devices via model/WiFi (Advanced)"
"filter_models": "Filter devices via model/home/WiFi (Advanced)"
}
},
"cloud_filter": {
Expand All @@ -34,6 +34,8 @@
"data": {
"filter_model": "Filter Device Model",
"model_list": "Device Model List",
"filter_home_id": "Filter Home",
"home_id_list": "Home List",
"filter_ssid": "Filter WiFi SSID",
"ssid_list": "WiFi SSID List",
"filter_bssid": "Filter WiFi BSSID",
Expand Down Expand Up @@ -151,6 +153,8 @@
"data": {
"filter_model": "Filter Device Model",
"model_list": "Device Model List",
"filter_home_id": "Filter Home",
"home_id_list": "Home List",
"filter_ssid": "Filter WiFi SSID",
"ssid_list": "WiFi SSID List",
"filter_bssid": "Filter WiFi BSSID",
Expand Down
2 changes: 1 addition & 1 deletion custom_components/xiaomi_miot/translations/it_IT.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"captcha": "Captcha",
"server_country": "Posizione server MiCloud",
"conn_mode": "Modalità di connessione del dispostivo",
"filter_models": "Filtra dispositivi per modello/WiFi (Avanzato)"
"filter_models": "Filtra dispositivi per modello/famiglia/WiFi (Avanzato)"
}
},
"cloud_filter": {
Expand Down
2 changes: 1 addition & 1 deletion custom_components/xiaomi_miot/translations/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"password": "Senha",
"server_country": "Região da MiCloud",
"conn_mode": "Modo de conexão com o dispositivo",
"filter_models": "Filtro de dispositivo via model/WiFi"
"filter_models": "Filtro de dispositivo via model/home/WiFi (Advanced)"
}
},
"cloud_filter": {
Expand Down
2 changes: 1 addition & 1 deletion custom_components/xiaomi_miot/translations/ru_RU.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"captcha": "Captcha",
"server_country": "Регион сервера MiCloud",
"conn_mode": "Режим подключения устройства",
"filter_models": "Фильтровать устройства по модели/WiFi (Продвинутые настр.)"
"filter_models": "Фильтровать устройства по модели/семья/WiFi (Продвинутые настр.)"
}
},
"cloud_filter": {
Expand Down
6 changes: 5 additions & 1 deletion custom_components/xiaomi_miot/translations/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"captcha": "验证码",
"server_country": "小米服务器",
"conn_mode": "设备连接模式",
"filter_models": "通过型号/WiFi筛选设备 (高级模式,新手勿选)"
"filter_models": "通过型号/家庭/WiFi筛选设备 (高级模式,新手勿选)"
}
},
"cloud_filter": {
Expand All @@ -34,6 +34,8 @@
"data": {
"filter_model": "筛选设备型号",
"model_list": "设备型号列表",
"filter_home_id": "筛选家庭",
"home_id_list": "家庭列表",
"filter_ssid": "筛选 WiFi SSID",
"ssid_list": "WiFi SSID 列表",
"filter_bssid": "筛选 WiFi BSSID",
Expand Down Expand Up @@ -98,6 +100,8 @@
"data": {
"filter_model": "筛选设备型号",
"model_list": "设备型号列表",
"filter_home_id": "筛选家庭",
"home_id_list": "家庭列表",
"filter_ssid": "筛选 WiFi SSID",
"ssid_list": "WiFi SSID 列表",
"filter_bssid": "筛选 WiFi BSSID",
Expand Down

1 comment on commit 32e1020

@al-one
Copy link
Owner Author

@al-one al-one commented on 32e1020 Dec 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please # to comment.