fix uniq check and strengthen

Author: antheas

src/hhd/controller/physical/evdev.py

@@ -199,10 +199,13 @@ def list_evs(filter_valid: bool = False, fn: str = "/proc/bus/input/devices"):
                     # we reverse it to little endian
                     out["byte"][head.lower()] = bytes(reversed(arr))
                 case "P":
-                    out["phys"] = line[len('P: Phys="') : -1]
+                    out["phys"] = line[len('P: Phys=') : ]
                 case "S":
                     if "Sysfs" in line:
-                        out["sysfs"] = line[len('S: Sysfs="') : -1]
+                        out["sysfs"] = line[len('S: Sysfs=') : ]
+                case "U":
+                    if "Uniq" in line:
+                        out["uniq"] = line[len('U: Uniq=') :]
                 case "H":
                     if len(line) < len("H: Handlers=") + 1:
                         continue

src/hhd/plugins/overlay/controllers.py

@@ -257,7 +257,7 @@ def find_devices(
             # Allow bluetooth controllers that contain uhid and phys, while
             # blocking hhd devices that contain uhid and a special mac address
             "uhid" in dev.get("sysfs", "")
-            and "35:53:" in dev.get("uniq", "")
+            and dev.get("uniq", "").startswith("35:53:")
         ):
             continue
 
@@ -610,7 +610,11 @@ def process_events(emit, dev, evs, allow_select=True):
             and ev.code in CONTROLLER_WAKE_BUTTON
         ):
             process_ctrl(
-                emit, dev["state_ctrl"], CONTROLLER_WAKE_BUTTON[ev.code], ev.value, allow_select=allow_select
+                emit,
+                dev["state_ctrl"],
+                CONTROLLER_WAKE_BUTTON[ev.code],
+                ev.value,
+                allow_select=allow_select,
             )
 
         if (