Archives/input-remapper
2
0
Fork 0
mirror of https://github.com/sezanzeb/input-remapper synced 2024-11-04 12:00:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved error handling

Browse Source
This commit is contained in:
sezanzeb 2020-11-22 21:02:44 +01:00
parent fe35f9c807
commit f84557cc80
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
keymapper/injector.py
View File

@ -64,7 +64,7 @@ def _grab(path):
logger.debug('Failed attemt to grab %s %d', path, attempts) logger.debug('Failed attemt to grab %s %d', path, attempts)
if attempts >= 4: if attempts >= 4:
logger.error('Cannot grab %s', path) logger.error('Cannot grab %s, it is possibly in use', path)
return None return None
# it might take a little time until the device is free if # it might take a little time until the device is free if
@ -124,7 +124,12 @@ def _start_injecting_worker(path, pipe, mapping):
loop = asyncio.new_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
device = _grab(path) try:
device = _grab(path)
except Exception as e:
logger.error(e)
pipe.send(FAILED)
return
if device is None: if device is None:
pipe.send(FAILED) pipe.send(FAILED)
@ -151,10 +156,6 @@ def _start_injecting_worker(path, pipe, mapping):
for event in device.read_loop(): for event in device.read_loop():
if event.type != evdev.ecodes.EV_KEY: if event.type != evdev.ecodes.EV_KEY:
logger.spam(
'got type:%s code:%s value:%s, forward',
event.type, event.code, event.value
)
keymapper_device.write(event.type, event.code, event.value) keymapper_device.write(event.type, event.code, event.value)
# this already includes SYN events, so need to syn here again # this already includes SYN events, so need to syn here again
continue continue
@ -259,7 +260,7 @@ class KeycodeInjector:
# wait for the process to notify creation of the new injection # wait for the process to notify creation of the new injection
# device, to keep the logs in order. # device, to keep the logs in order.
status = pipe[0].recv() status = pipe[0].recv()
if status != FAILED: if status == DEVICE_CREATED:
self.processes.append(worker) self.processes.append(worker)
else: else:
worker.join() worker.join()