X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=smart_home%2Fdevice.py;h=06187d7a6578e2eaedb5d86e6173977d62b6288d;hb=94c8a54eadbf8552fa4d33dc349616d125e1a638;hp=04b0bfee8abee690ab857692b15e928abf3bae03;hpb=05a26ae305adfc47f38b8534ec8f35640df3955e;p=python_utils.git diff --git a/smart_home/device.py b/smart_home/device.py index 04b0bfe..06187d7 100644 --- a/smart_home/device.py +++ b/smart_home/device.py @@ -8,17 +8,17 @@ import arper class Device(object): def __init__( - self, - name: str, - mac: str, - keywords: Optional[List[str]], + self, + name: str, + mac: str, + keywords: Optional[str] = "", ): self.name = name self.mac = mac self.keywords = keywords self.arper = arper.Arper() if keywords is not None: - self.kws = keywords.split() + self.kws: List[str] = keywords.split(' ') else: self.kws = [] @@ -28,9 +28,20 @@ class Device(object): def get_mac(self) -> str: return self.mac - def get_ip(self) -> str: + def get_ip(self) -> Optional[str]: return self.arper.get_ip_by_mac(self.mac) + def has_static_ip(self) -> bool: + for kw in self.kws: + m = re.search(r'static:([\d\.]+)', kw) + if m is not None: + ip = m.group(1) + assert self.get_ip() == ip + return True + return False + + # Add command -> URL logic here. + def get_keywords(self) -> Optional[List[str]]: return self.kws