From 7f1371ec00b0df75c1a355ae6419044515175cbb Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Tue, 22 Mar 2022 19:13:04 +0100 Subject: [PATCH] SNIClient: provide example full connect command when required and some pep8 (#330) --- SNIClient.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/SNIClient.py b/SNIClient.py index 46a13d8b..369e6e0d 100644 --- a/SNIClient.py +++ b/SNIClient.py @@ -657,24 +657,24 @@ async def snes_connect(ctx: Context, address, deviceIndex=-1): try: devices = await get_snes_devices(ctx) - numDevices = len(devices) + device_count = len(devices) - if numDevices == 1: + if device_count == 1: device = devices[0] elif ctx.snes_reconnect_address: if ctx.snes_attached_device[1] in devices: device = ctx.snes_attached_device[1] else: device = devices[ctx.snes_attached_device[0]] - elif numDevices > 1: + elif device_count > 1: if deviceIndex == -1: - snes_logger.info( - "Found " + str(numDevices) + " SNES devices; connect to one with /snes
:") + snes_logger.info(f"Found {device_count} SNES devices. " + f"Connect to one with /snes
. For example /snes {address} 1") for idx, availableDevice in enumerate(devices): snes_logger.info(str(idx + 1) + ": " + availableDevice) - elif (deviceIndex < 0) or (deviceIndex - 1) > numDevices: + elif (deviceIndex < 0) or (deviceIndex - 1) > device_count: snes_logger.warning("SNES device number out of range") else: @@ -696,8 +696,6 @@ async def snes_connect(ctx: Context, address, deviceIndex=-1): ctx.snes_attached_device = (devices.index(device), device) ctx.snes_reconnect_address = address recv_task = asyncio.create_task(snes_recv_loop(ctx)) - SNES_RECONNECT_DELAY = ctx.starting_reconnect_delay - snes_logger.info(f"Attached to {device}") except Exception as e: if recv_task is not None: @@ -716,6 +714,10 @@ async def snes_connect(ctx: Context, address, deviceIndex=-1): asyncio.create_task(snes_autoreconnect(ctx)) SNES_RECONNECT_DELAY *= 2 + else: + SNES_RECONNECT_DELAY = ctx.starting_reconnect_delay + snes_logger.info(f"Attached to {device}") + async def snes_disconnect(ctx: Context): if ctx.snes_socket: