Skip to content

Add support to ignore selected gateways #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
syssi merged 12 commits into from
May 17, 2018
Merged

Add support to ignore selected gateways #72

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a626330
support new device model;support new LAN protocol 2.0
Mar 30, 2018
45c1931
format code style
Mar 30, 2018
72702c4
optimization code
Mar 30, 2018
67d53b3
optimization code
Mar 30, 2018
cddb8ac
sync code
May 13, 2018
b0a79a3
fix error: The problem of crash when getting the key when there is no…
May 13, 2018
cd46611
support disabled gateway
May 13, 2018
c1988b8
support disabled gateway
May 13, 2018
2cef039
format code style
May 13, 2018
1b2165a
format code style
May 13, 2018
f6fdc61
format code style
May 13, 2018
81a9cb0
rename the setting from "disabled" to "disable"
May 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions xiaomi_gateway/__init__.py
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class XiaomiGatewayDiscovery(object):
GATEWAY_DISCOVERY_PORT = 4321
SOCKET_BUFSIZE = 1024

disabled_gateways = []
gateways = defaultdict(list)

def __init__(self, callback_func, gateways_config, interface):
Expand Down Expand Up @@ -50,19 +51,24 @@ def discover_gateways(self):
host = gateway.get('host')
port = gateway.get('port')
sid = gateway.get('sid')
key = gateway.get('key')
Copy link
Copy Markdown
Collaborator

@syssi syssi May 14, 2018

Choose a reason for hiding this comment

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

I wouldn't move this line in this case. It's None if no key is available.

Copy link
Copy Markdown
Contributor Author

@kerwin612 kerwin612 May 14, 2018

Choose a reason for hiding this comment

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

Yes, I removed it just to pass the lint check, because there are too many local variables and this variable is only used in one place. So I'll call it directly on the method argument.


if not (host and port and sid):
continue

try:
ip_address = socket.gethostbyname(host)
if gateway.get('disable'):
_LOGGER.info(
'Xiaomi Gateway %s is disabled by configuration', sid)
self.disabled_gateways.append(ip_address)
continue
_LOGGER.info(
'Xiaomi Gateway %s configured at IP %s:%s',
sid, ip_address, port)

self.gateways[ip_address] = XiaomiGateway(
ip_address, port, sid, key, self._socket, gateway.get('proto'))
ip_address, port, sid,
gateway.get('key'), self._socket, gateway.get('proto'))
except OSError as error:
_LOGGER.error(
"Could not resolve %s: %s", host, error)
Expand All @@ -73,7 +79,7 @@ def discover_gateways(self):

while True:
data, (ip_add, _) = _socket.recvfrom(1024)
if len(data) is None:
if len(data) is None or ip_add in self.gateways:
continue

resp = json.loads(data.decode())
Expand All @@ -85,23 +91,25 @@ def discover_gateways(self):
_LOGGER.error("Response must be gateway model")
continue

if ip_add in self.gateways:
continue

disabled = False
gateway_key = None
for gateway in self._gateways_config:
sid = gateway['sid']
key = gateway['key']
sid = gateway.get('sid')
if sid is None or sid == resp["sid"]:
gateway_key = key
gateway_key = gateway.get('key')
if sid and sid == resp['sid'] and gateway.get('disable'):
disabled = True

sid = resp["sid"]
port = resp["port"]

_LOGGER.info('Xiaomi Gateway %s found at IP %s', sid, ip_add)

self.gateways[ip_add] = XiaomiGateway(ip_add, port, sid, gateway_key, self._socket,
resp["proto_version"] if "proto_version" in resp else None)
if disabled:
_LOGGER.info("Xiaomi Gateway %s is disabled by configuration",
sid)
self.disabled_gateways.append(ip_add)
else:
_LOGGER.info('Xiaomi Gateway %s found at IP %s', sid, ip_add)
self.gateways[ip_add] = XiaomiGateway(
ip_add, resp["port"], sid, gateway_key, self._socket,
resp["proto_version"] if "proto_version" in resp else None)

except socket.timeout:
_LOGGER.info("Gateway discovery finished in 5 seconds")
Expand Down Expand Up @@ -165,7 +173,8 @@ def _listen_to_msg(self):
data = json.loads(data.decode("ascii"))
gateway = self.gateways.get(ip_add)
if gateway is None:
_LOGGER.error('Unknown gateway ip %s', ip_add)
if ip_add not in self.disabled_gateways:
_LOGGER.error('Unknown gateway ip %s', ip_add)
continue

cmd = data['cmd']
Expand Down Expand Up @@ -423,7 +432,7 @@ def _get_value(resp, data_key=None):
if data_key in param:
return param[data_key]
return None
return data[data_key]
return data.get(data_key)


def _list2map(data):
Expand Down