kamp/python-broadlink
1
0
Fork 0
mirror of https://github.com/mjg59/python-broadlink.git synced 2024-11-22 15:10:12 +01:00
Code

Merge pull request #464 from felipediel/context-manager

Browse Source 
Timeout improvements
This commit is contained in:
Felipe Martins Diel 2021-01-11 00:19:38 -03:00 committed by GitHub
commit 4169b265d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
broadlink/device.py
View File

@ -70,13 +70,14 @@ def scan(
packet[0x20] = checksum & 0xFF
packet[0x21] = checksum >> 8
starttime = time.time()
start_time = time.time()
discovered = []
try:
while (time.time() - starttime) < timeout:
while (time.time() - start_time) < timeout:
time_left = timeout - (time.time() - start_time)
conn.settimeout(min(1, time_left))
conn.sendto(packet, (discover_ip_address, discover_ip_port))
conn.settimeout(1)
while True:
try:
@ -261,7 +262,7 @@ class device:
"""Return device type."""
return self.type
def send_packet(self, command: int, payload: bytes) -> bytes:
def send_packet(self, command: int, payload: bytes, retry_intvl: float = 1.0) -> bytes:
"""Send a packet to the device."""
self.count = ((self.count + 1) | 0x8000) & 0xFFFF
packet = bytearray(0x38)
@ -307,22 +308,22 @@ class device:
packet[0x20] = checksum & 0xFF
packet[0x21] = checksum >> 8
start_time = time.time()
with self.lock:
conn = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
conn.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as conn:
timeout = self.timeout
start_time = time.time()
while True:
try:
while True:
time_left = timeout - (time.time() - start_time)
conn.settimeout(min(retry_intvl, time_left))
conn.sendto(packet, self.host)
conn.settimeout(1)
resp, _ = conn.recvfrom(2048)
break
except socket.timeout:
if (time.time() - start_time) > self.timeout:
conn.close()
raise exception(-4000) # Network timeout.
conn.close()
try:
resp = conn.recvfrom(2048)[0]
break
except socket.timeout:
if (time.time() - start_time) > timeout:
raise exception(-4000) # Network timeout.
if len(resp) < 0x30:
raise exception(-4007) # Length error.

10
broadlink/remote.py
View File

@ -13,10 +13,10 @@ class rm(device):
device.__init__(self, *args, **kwargs)
self.type = "RM2"
def _send(self, command: int, data: bytes = b'') -> bytes:
def _send(self, command: int, data: bytes = b'', retry_intvl: float = 1.0) -> bytes:
"""Send a packet to the device."""
packet = struct.pack("<I", command) + data
resp = self.send_packet(0x6A, packet)
resp = self.send_packet(0x6A, packet, retry_intvl=retry_intvl)
check_error(resp[0x22:0x24])
payload = self.decrypt(resp[0x38:])
return payload[0x4:]
@ -27,7 +27,7 @@ class rm(device):
def send_data(self, data: bytes) -> None:
"""Send a code to the device."""
self._send(0x2, data)
self._send(0x2, data=data, retry_intvl=5)
def enter_learning(self) -> None:
"""Enter infrared learning mode."""
@ -71,10 +71,10 @@ class rm4(rm):
device.__init__(self, *args, **kwargs)
self.type = "RM4"
def _send(self, command: int, data: bytes = b'') -> bytes:
def _send(self, command: int, data: bytes = b'', retry_intvl: float = 1.0) -> bytes:
"""Send a packet to the device."""
packet = struct.pack("<HI", len(data) + 4, command) + data
resp = self.send_packet(0x6A, packet)
resp = self.send_packet(0x6A, packet, retry_intvl=retry_intvl)
check_error(resp[0x22:0x24])
payload = self.decrypt(resp[0x38:])
p_len = struct.unpack("<H", payload[:0x2])[0]