Skip to content

fix: allow parsing different adb wm size outputs #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PranavMurali wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: allow parsing different adb wm size outputs #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions scripts/and_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,20 @@ def get_device_size(self):
adb_command = f"adb -s {self.device} shell wm size"
result = execute_adb(adb_command)
if result != "ERROR":
return map(int, result.split(": ")[1].split("x"))
lines = result.strip().split('\n')
for line in lines:
if ':' in line and 'x' in line:
size_part = line.split(': ')[1]
if 'x' in size_part:
width, height = size_part.split('x')
return int(width.strip()), int(height.strip())
elif 'x' in line and line.count('x') == 1:
parts = line.strip().split('x')
if len(parts) == 2:
try:
return int(parts[0].strip()), int(parts[1].strip())
except ValueError:
continue
return 0, 0

def get_screenshot(self, prefix, save_dir):
Expand Down Expand Up @@ -175,6 +188,6 @@ def swipe(self, x, y, direction, dist="medium", quick=False):
def swipe_precise(self, start, end, duration=400):
start_x, start_y = start
end_x, end_y = end
adb_command = f"adb -s {self.device} shell input swipe {start_x} {start_x} {end_x} {end_y} {duration}"
adb_command = f"adb -s {self.device} shell input swipe {start_x} {start_y} {end_x} {end_y} {duration}"
ret = execute_adb(adb_command)
return ret