monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SNIClient: provide example full connect command when required and some pep8 (#330)

This commit is contained in:
Fabian Dill 2022-03-22 19:13:04 +01:00 committed by GitHub
parent cb3db8ae16
commit 7f1371ec00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SNIClient.py
View File

@ -657,24 +657,24 @@ async def snes_connect(ctx: Context, address, deviceIndex=-1):
try: try:
devices = await get_snes_devices(ctx) devices = await get_snes_devices(ctx)
numDevices = len(devices) device_count = len(devices)
if numDevices == 1: if device_count == 1:
device = devices[0] device = devices[0]
elif ctx.snes_reconnect_address: elif ctx.snes_reconnect_address:
if ctx.snes_attached_device[1] in devices: if ctx.snes_attached_device[1] in devices:
device = ctx.snes_attached_device[1] device = ctx.snes_attached_device[1]
else: else:
device = devices[ctx.snes_attached_device[0]] device = devices[ctx.snes_attached_device[0]]
elif numDevices > 1: elif device_count > 1:
if deviceIndex == -1: if deviceIndex == -1:
snes_logger.info( snes_logger.info(f"Found {device_count} SNES devices. "
"Found " + str(numDevices) + " SNES devices; connect to one with /snes <address> <device number>:") f"Connect to one with /snes <address> <device number>. For example /snes {address} 1")
for idx, availableDevice in enumerate(devices): for idx, availableDevice in enumerate(devices):
snes_logger.info(str(idx + 1) + ": " + availableDevice) 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") snes_logger.warning("SNES device number out of range")
else: else:
@ -696,8 +696,6 @@ async def snes_connect(ctx: Context, address, deviceIndex=-1):
ctx.snes_attached_device = (devices.index(device), device) ctx.snes_attached_device = (devices.index(device), device)
ctx.snes_reconnect_address = address ctx.snes_reconnect_address = address
recv_task = asyncio.create_task(snes_recv_loop(ctx)) 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: except Exception as e:
if recv_task is not None: 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)) asyncio.create_task(snes_autoreconnect(ctx))
SNES_RECONNECT_DELAY *= 2 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): async def snes_disconnect(ctx: Context):
if ctx.snes_socket: if ctx.snes_socket: