sync dortania

Author: pyquick

oclp_r/detections/device_probe.py

@@ -7,7 +7,7 @@
 import subprocess
 import plistlib
 import hashlib
-
+import re 
 from pathlib import Path
 from dataclasses import dataclass, field
 from typing import Any, ClassVar, Optional, Type, Union
@@ -214,8 +214,26 @@ def populate_pci_path(self, original_entry: ioreg.io_registry_entry_t):
                 # Virtual PCI devices provide a botched IOService path (us.electronic.kext.vusb)
                 # We only care about physical devices, so skip them
                 try:
-                    location = [hex(int(i, 16)) for i in ioreg.io_name_t_to_str(ioreg.IORegistryEntryGetLocationInPlane(entry, "IOService".encode(), None)[1]).split(",") + ["0"]]
-                    paths.append(f"Pci({location[0]},{location[1]})")
+                    # Extract location string and handle possible non-numeric prefixes
+                    location_str = ioreg.io_name_t_to_str(ioreg.IORegistryEntryGetLocationInPlane(entry, "IOService".encode(), None)[1])
+                    location_parts = location_str.split(",")
+                    location_hex = []
+                    
+                    for i in location_parts + ["0"]:
+                        i_clean = i.strip()
+                        # Try to extract numeric part from end of string
+                        match = re.search(r'(\d+)$', i_clean)
+                        if match:
+                            # Use the numeric part found
+                            location_hex.append(hex(int(match.group(1))))
+                        elif i_clean and i_clean.isdigit():
+                            # Already a plain number
+                            location_hex.append(hex(int(i_clean)))
+                        else:
+                            # Cannot parse, use default 0
+                            location_hex.append("0x0")
+                    
+                    paths.append(f"Pci({location_hex[0]},{location_hex[1]})")
                 except ValueError:
                     break
             elif ioreg.IOObjectConformsTo(entry, "IOACPIPlatformDevice".encode()):

oclp_r/wx_gui/gui_kdk_dl.py oclp_r/wx_gui/gui_KDK_download.pyoclp_r/wx_gui/gui_kdk_dl.py renamed to oclp_r/wx_gui/gui_KDK_download.py

@@ -12,6 +12,8 @@
 import threading
 import webbrowser
 
+from . import gui_KDK_download, gui_metallib_download
+
 from .. import constants
 
 from ..support import (
@@ -30,8 +32,6 @@
     gui_settings,
     gui_sys_patch_display,
     gui_update,
-    gui_kdk_dl,
-    gui_ml_dl,
 )
 
 
@@ -353,14 +353,14 @@ def on_create_macos_installer(self, event: wx.Event = None):
             screen_location=self.GetPosition()
         )
     def on_download_kdk(self, event: wx.Event = None):
-        gui_kdk_dl.KDKDownloadFrame(
+        gui_KDK_download.KDKDownloadFrame(
             parent=self,
             title=self.title,
             global_constants=self.constants,
             screen_location=self.GetPosition()
         )
     def on_download_ml(self, event: wx.Event = None):
-        gui_ml_dl.MetallibDownloadFrame(
+        gui_metallib_download.MetallibDownloadFrame(
             parent=self,
             title=self.title,
             global_constants=self.constants,