pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hw_drivers: Traceback in scanner type detection

Browse Source 
`device_name` and `scanner_name` were defined outside of the scope of
the function where they were used in.
We move them and try to simplify the logic a bit.

closes odoo/odoo#56454

X-original-commit: e59e311578aa0b4539ef27580462a2c2e1dce970
Signed-off-by: Quentin Lejeune (qle) <qle@odoo.com>
Signed-off-by: Antoine Prieëls <aprieels@users.noreply.github.com>
This commit is contained in:
Antoine Prieels
2020-08-24 17:41:05 +00:00
parent 91a3b9084d
commit 451a6dace3
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hw_drivers/iot_handlers/drivers/KeyboardUSBDriver.py
+7 -13
View File
@@ -56,11 +56,7 @@ class KeyboardUSBDriver(Driver):
if (self.dev.idVendor == device.info.vendor) and (self.dev.idProduct == device.info.product):
self.input_device = device
device_name = self._device_name.lower()
is_scanner = self.load_is_scanner()
scanner_name = ['barcode', 'scanner', 'reader']
self._set_device_type('scanner') if is_scanner.get('is_scanner') else self._set_device_type()
self._set_device_type('scanner') if self._is_scanner() else self._set_device_type()
@classmethod
def supported(cls, device):
@@ -228,20 +224,18 @@ class KeyboardUSBDriver(Driver):
layout = {'layout': 'us'}
self._change_keyboard_layout(layout)
def load_is_scanner(self):
def _is_scanner(self):
"""Read the device type from the saved filed and set it as current type.
If no file or no device type is found we use 'us' by default.
If no file or no device type is found we try to detect it automatically.
"""
check_scanner = False
if any(x in device_name for x in scanner_name) or self.dev.interface_protocol == '0':
check_scanner = True
device_name = self._device_name.lower()
scanner_name = ['barcode', 'scanner', 'reader']
is_scanner = any(x in device_name for x in scanner_name) or self.dev.interface_protocol == '0'
file_path = Path.home() / 'odoo-keyboard-is-scanner.conf'
if file_path.exists():
data = json.loads(file_path.read_text())
is_scanner = data.get(self.device_identifier, {'is_scanner': check_scanner})
else:
is_scanner = {'is_scanner': check_scanner}
is_scanner = data.get(self.device_identifier, {}).get('is_scanner', is_scanner)
return is_scanner
def _keyboard_input(self, scancode):