Merge pull request #119 from pur1fying/patch-repair-scan-port

fix: wrongly scans default port
pur1fying · Jul 19, 2024 · b57f0c4 · b57f0c4
2 parents 6b0db7d + ecb2599
commit b57f0c4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/device_operation/__main__.py b/device_operation/__main__.py
@@ -1,3 +1,3 @@
 from .stop_simulator import stop_simulator_classic
 from . import *
-start_simulator_classic('mumu','1')
+print(autosearch())
diff --git a/device_operation/auto_scan_simulator.py b/device_operation/auto_scan_simulator.py
@@ -53,12 +53,13 @@ def auto_scan_simulators():
 def auto_search_adb_address():
     # 正则表达式匹配模板
     regex_patterns = {
-        'MEmu.exe': r'.*MEmu.exe MEmu_(\w+)',
-        'HD-Player.exe': r'.*HD-Player.exe --instance (\w+)',
-        'dnplayer.exe': r'.*dnplayer.exe index=(\w+)',
-        'MuMuPlayer.exe': r'.*MuMuPlayer.exe -v (\w+)'
+    'MEmu.exe': r'.*MEmu.exe\s+MEmu_(\w+)',
+    'HD-Player.exe': r'.*HD-Player.exe\s+--instance\s+(\w+)',
+    'dnplayer.exe': r'.*dnplayer.exe\s+index=(\w+)',
+    'MuMuPlayer.exe': r'.*MuMuPlayer.exe\s+-v\s+(\w+)'
     }
 
+
     adb_addresses = []
     process_list = auto_scan_simulators()
 
@@ -80,16 +81,16 @@ def bst_read_install_key(region):
                 cmdline_no_quotes = cmdline.replace('"', '')
                 for simulator, pattern in regex_patterns.items():
                     cmdline = cmdline.replace('"', '')
-                    match = re.search(pattern, cmdline)
+                    match = re.search(pattern, cmdline_no_quotes)
                     if match:
                         multi_instance = match.group(1)
                         if process == 'bluestacks_nxt':
-                            bst_cn_path = bst_read_install_key('cn')
+                            bst_cn_path = bst_read_install_key('_cn')
                             bst_path = bst_read_install_key('')
                             player_path = process_native_api("get_exe_path_name", "HD-Player.exe")
 
                             if bst_cn_path == player_path:
-                                adb_address = f"""127.0.0.1:{get_bluestacks_nxt_adb_port_id(multi_instance, "cn")}"""
+                                adb_address = f"""127.0.0.1:{get_bluestacks_nxt_adb_port_id(multi_instance, "_cn")}"""
                                 adb_addresses.append(adb_address)
                                 break
                             elif bst_path == player_path:

diff --git a/device_operation/bluestacks_module.py b/device_operation/bluestacks_module.py
@@ -87,7 +87,7 @@ def bst_read_registry_key(region):
         except FileNotFoundError:
             return None
 
-    bst_cn_path = bst_read_registry_key('cn')
+    bst_cn_path = bst_read_registry_key('_cn')
     bst_path = bst_read_registry_key('')
     try:
         pid = int(pid)