diff --git a/lib/dependencies.py b/lib/dependencies.py index 5bfebaf21d821543be94ccd05a3de75b9babd416..e3daa1a41fa7cb88e8d90a88ee7ff97c117030a7 100644 --- a/lib/dependencies.py +++ b/lib/dependencies.py @@ -39,7 +39,7 @@ def check_connected_hardware(): """ Output connected and supported rf hardware. """ - devices = Hardware().get_connected_supported_devices() + devices = Hardware.get_connected_supported_devices() if len(devices) == 0: print(" * no rf hardware connected") else: diff --git a/lib/gui/gui.py b/lib/gui/gui.py index 9a1ecb2f03f9be499dcdd01d8c337a0fdd09e1b9..db2bfb510bebde61026a8c6450ede7e7302568ca 100644 --- a/lib/gui/gui.py +++ b/lib/gui/gui.py @@ -141,7 +141,7 @@ class SuGui(QtWidgets.QMainWindow): currentText()).group() device_key = '' - for key, value in Hardware().SUPPORTED_HARDWARE.items(): + for key, value in Hardware.SUPPORTED_HARDWARE.items(): if value == device_id: device_key = key @@ -161,7 +161,7 @@ class SuGui(QtWidgets.QMainWindow): QtWidgets.QMessageBox.about(self, "Dumpfile path missing…", \ "Please add dump file path.") return False - elif len(Hardware().get_connected_supported_devices()) == 0: + elif len(Hardware.get_connected_supported_devices()) == 0: QtWidgets.QMessageBox.about(self, "No supported RF hardware "\ "connected…", \ "Please connect RF hardware.") diff --git a/lib/hardware.py b/lib/hardware.py index 1f62bb380bbb28dc4945e7be0df5736c9ece5597..0311e51cf66c09bcf0111f2112b0ed1e2355c6b3 100644 --- a/lib/hardware.py +++ b/lib/hardware.py @@ -20,7 +20,8 @@ class Hardware(object): "rtlsdr": "0bda:2838" # Realtek Semiconductor Corp. RTL2838 DVB-T } - def get_usb_devices(self): + @staticmethod + def get_usb_devices(): """ Parse lsusb output and return a list of dictionaries. """ @@ -29,22 +30,23 @@ class Hardware(object): lsusb_output = subprocess.check_output("lsusb", shell=True) for line in lsusb_output.split("\n"): if re.match("^Bus", line): - device = self.parse_lsusb_line(line) + device = Hardware.parse_lsusb_line(line) devices.append(device) else: continue return devices - def get_connected_supported_devices(self): + @staticmethod + def get_connected_supported_devices(): """ Get all connected devices """ - devices = self.get_usb_devices() + devices = Hardware.get_usb_devices() connected_devices = [] for device in devices: - if self.supported_device(self, device): + if Hardware.supported_device(device): connected_devices.append(device) else: continue @@ -67,8 +69,8 @@ class Hardware(object): return device @staticmethod - def supported_device(self, device): + def supported_device(device): """ Check if a given device is supported. """ - return device['id'] in self.SUPPORTED_HARDWARE.values() + return device['id'] in Hardware.SUPPORTED_HARDWARE.values() diff --git a/tests/lib/test_hardware.py b/tests/lib/test_hardware.py index f8fcdb5f22af9cb056b9a785091205749e471270..b3319670d223e449bd567d00392f03996616db8a 100644 --- a/tests/lib/test_hardware.py +++ b/tests/lib/test_hardware.py @@ -19,9 +19,9 @@ class TestHardware: def test_supported_device(self): not_supported_device = {"id": "ffff:ffff"} supported_device = {"id": "0bda:2838"} - assert Hardware.supported_device(Hardware(), not_supported_device) \ + assert Hardware.supported_device(not_supported_device) \ == False - assert Hardware.supported_device(Hardware(), supported_device) \ + assert Hardware.supported_device(supported_device) \ == True def test_supported_hardware(self):