Clearer structure

.vscode/launch.json

@@ -8,7 +8,7 @@
             "name": "Run main program",
             "type": "python",
             "request": "launch",
-            "program": "ddgo-converter.py",
+            "program": "ddgo-converter/ddgo-converter.py",
             "console": "integratedTerminal",
             "justMyCode": true
         }

ddgo-converter/gamepads/emulated.py

@@ -0,0 +1,12 @@
+from enum import Enum
+from hashlib import sha1
+
+class EmulatedGamepad:
+    
+    class GamepadType(Enum):
+        DGOC44U = 0
+        PS1 = 1
+
+    def __init__(self):
+        super().__init__()
+        self.type

ddgo-converter/gamepads/physical.py

@@ -0,0 +1,35 @@
+from enum import Enum
+from hashlib import sha1
+
+class PhysicalGamepad:
+
+    class GamepadType(Enum):
+        UNKNOWN = 0
+        CLASSIC = 1
+        NSWITCH = 2
+
+    def __init__(self, vid, pid, name):
+        super().__init__()
+        self.vid = vid
+        self.pid = pid
+        self.name = name
+        self.id = self._get_gamepad_id()
+        self.hash = self._get_gamepad_hash()
+        self.type = self.get_gamepad_type()
+        self.config = []
+
+    def _get_gamepad_id(self):
+        vid = format(self.vid, "x").zfill(4)
+        pid = format(self.pid, "x").zfill(4)
+        id = str(vid + ":" + pid)
+        return id
+
+    def _get_gamepad_hash(self):
+        hash = sha1(str(self.id + ":" + self.name).encode('utf-8')).hexdigest()
+        return hash
+
+    def get_gamepad_type(self):
+        match self.vid, self.pid:
+            case 0x0f0d, 0x00c1:
+                return self.GamepadType.NSWITCH
+        return self.GamepadType.UNKNOWN

ddgo-converter/gui/main.py

@@ -2,7 +2,7 @@ import sys
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QMainWindow, QTableWidgetItem, QHeaderView
 from gui.main_ui import Ui_MainWindow
-from handlers.gamepad import Gamepad
+from gamepads.physical import PhysicalGamepad
 from models.gamepad import GamepadModel
 
 class MainWindow(QMainWindow):
@@ -32,7 +32,7 @@ class MainWindow(QMainWindow):
     def controller_list_selection_changed(self):
         enabled = False
         rows = self._gui.tableView_physicalControllerList.selectionModel().selectedRows()
-        if rows and self.gamepad_model.gamepads[rows[0].row()].type != Gamepad.GamepadType.UNKNOWN:
+        if rows and self.gamepad_model.gamepads[rows[0].row()].type != PhysicalGamepad.GamepadType.UNKNOWN:
             enabled = True
         self._gui.pushButton_emulatedControllerStart.setEnabled(enabled)
 

ddgo-converter/handlers/gamepad.py

@@ -1,49 +1,7 @@
 from enum import Enum
 from evdev import InputDevice, list_devices, ecodes as e, UInput, AbsInfo
-from hashlib import sha1
-
-class Gamepad:
-
-    class GamepadType(Enum):
-        UNKNOWN = 0
-        CLASSIC = 1
-        NSWITCH = 2
-
-    def __init__(self, vid, pid, name):
-        super().__init__()
-        self.vid = vid
-        self.pid = pid
-        self.name = name
-        self.id = self._get_gamepad_id()
-        self.hash = self._get_gamepad_hash()
-        self.type = self._get_gamepad_type()
-        self.config = []
-
-    def _get_gamepad_id(self):
-        vid = format(self.vid, "x").zfill(4)
-        pid = format(self.pid, "x").zfill(4)
-        id = str(vid + ":" + pid)
-        return id
-
-    def _get_gamepad_hash(self):
-        hash = sha1(str(self.id + ":" + self.name).encode('utf-8')).hexdigest()
-        return hash
-
-    def get_gamepad_type(self):
-        match self.vid, self.pid:
-            case 0x0f0d, 0x00c1:
-                return self.GamepadType.NSWITCH
-        return self.GamepadType.UNKNOWN
-
-class EmulatedGamepad:
-    
-    class GamepadType(Enum):
-        DGOC44U = 0
-        PS1 = 1
-
-    def __init__(self, type):
-        super().__init__()
-        self.type = type
+from gamepads.physical import PhysicalGamepad
+from gamepads.emulated import EmulatedGamepad
 
 class GamepadHandler:
     def __init__(self):
@@ -53,10 +11,10 @@ class GamepadHandler:
         gamepads = []
         devices = [InputDevice(path) for path in list_devices()]
         for device in devices:
-            gamepads.append(Gamepad(device.info.vendor, device.info.product, device.name))
+            gamepads.append(PhysicalGamepad(device.info.vendor, device.info.product, device.name))
         return gamepads
     
-    def start_gamepad_emulator(gamepad: Gamepad, emulated_gamepad: EmulatedGamepad):
+    def start_gamepad_emulator(gamepad, emulated_gamepad):
         realtype = gamepad.type
         emutype = emulated_gamepad.type
         print(str(realtype)+str(emutype))
@@ -209,4 +167,4 @@ for event in mascon_switch.read_loop():
                 ui.write(e.EV_ABS, e.ABS_X, 0x79)
                 ui.write(e.EV_ABS, e.ABS_Y, 0x00)
                 ui.syn()
- """
+ """

ddgo-converter/models/gamepad.py

@@ -1,5 +1,5 @@
 from PyQt5.QtCore import Qt, QVariant, QAbstractTableModel
-from handlers.gamepad import Gamepad
+from gamepads.physical import PhysicalGamepad
 
 headers = ["ID", "Name", "Status"]
 
@@ -16,7 +16,7 @@ class GamepadModel(QAbstractTableModel):
                 case 1:
                     return self.gamepads[index.row()].name
                 case 2:
-                    if self.gamepads[index.row()].type == Gamepad.GamepadType.UNKNOWN:
+                    if self.gamepads[index.row()].type == PhysicalGamepad.GamepadType.UNKNOWN:
                         return "Not configured"
                     else:
                         return "Configured"

requirements.txt

@@ -0,0 +1,3 @@
+evdev
+hashlib
+PyQt5