YoursFunny/ArisuAutoSweeper
1
0
Fork 0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2026-10-24 15:22:05 +00:00
Code Releases Wiki Activity

fix: try nc command on android first

Browse Source
This commit is contained in:
YoursFunny
2026-07-06 22:40:30 +08:00
parent 3f38ac3827
commit 05c30a2e75
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/device/connection.py
+9 -2
View File
@@ -383,10 +383,11 @@ class Connection(ConnectionAttr):
Returns: Returns:
list[str]: ['nc'] or ['busybox', 'nc'] list[str]: ['nc'] or ['busybox', 'nc']
""" """
if self.is_emulator:
sdk = self.sdk_ver sdk = self.sdk_ver
logger.info(f'sdk_ver: {sdk}') logger.info(f'sdk_ver: {sdk}')
if sdk >= 28: if sdk >= 28:
# Android 9 emulators does not have `nc`, try `busybox nc` # LD Player 9 does not have `nc`, try `busybox nc`
# BlueStacks Pie (Android 9) has `nc` but cannot send data, try `busybox nc` first # BlueStacks Pie (Android 9) has `nc` but cannot send data, try `busybox nc` first
trial = [ trial = [
['busybox', 'nc'], ['busybox', 'nc'],
@@ -397,10 +398,16 @@ class Connection(ConnectionAttr):
['nc'], ['nc'],
['busybox', 'nc'], ['busybox', 'nc'],
] ]
else:
trial = [
['nc'],
['busybox', 'nc'],
]
for command in trial: for command in trial:
# About 3ms # About 3ms
result = self.adb_shell(command)
# Result should be command help if success # Result should be command help if success
# nc: bad argument count (see "nc --help")
result = self.adb_shell(command)
# `/system/bin/sh: nc: not found` # `/system/bin/sh: nc: not found`
if 'not found' in result: if 'not found' in result:
continue continue