Enhance KDK matching logic for version compatibility

Refactor logic to find closest KDK version, including checks for beta versions and build compatibility.

Author: pyquick

oclp_r/support/kdk_handler.py

@@ -226,10 +226,17 @@ def _get_latest_kdk(self, host_build: str = None, host_version: str = None) -> N
                     count_kdks.sort(key=lambda x: x["build"], reverse=True)
                     closest = None
                     for kdk in count_kdks:
-                        if kdk["build"][-1]>="a" and kdk["build"][-1]<="z":
-                            logging.info(self.trans["This is macOS beta's KDK"])
-                        if kdk["build"][2] <= host_build[2]:
-                            closest = kdk
+                        # Need same version (example: 26.3==26.3 -> 26D==26D)
+                        if kdk["build"][0:3] == host_build[0:3]:
+                            # We need to check beta versions
+                            if kdk["build"][-1]>="a" and kdk["build"][-1]<="z":
+                                # example: 25D5087f -> macOS 26.3 Beta
+                                # earlier than 25D125
+                                logging.info(self.trans["This is macOS beta's KDK"])
+                                closest=kdk
+                                break
+                        elif kdk["build"][0:2] == host_build[0:2] and ord(kdk["build"][2])-1==ord(host_build[2]):
+                            closest=kdk
                             break
                     if closest is None:
                         closest = count_kdks[-1]
@@ -702,4 +709,4 @@ def _create_backup(self, kdk_path: Path, kdk_info_plist: Path) -> None:
         result = subprocess_wrapper.run_as_root(generate_copy_arguments(kdk_path, kdk_dst_path), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         if result.returncode != 0:
             logging.info(self.trans["Failed to create KDK backup:"])
-            subprocess_wrapper.log(result)
+            subprocess_wrapper.log(result)