Merge pull request #1242 from doronz88/bugfix/accessibility-list-items

Bugfix/accessibility list items

pymobiledevice3/cli/developer.py

@@ -860,33 +860,14 @@ def accessibility_notifications(service_provider: LockdownClient):
 
 @accessibility.command('list-items', cls=Command)
 def accessibility_list_items(service_provider: LockdownClient):
-    """List items available in the currently shown menu."""
+    """List elements available in the currently shown menu."""
 
-    service = AccessibilityAudit(service_provider)
-    iterator = service.iter_events()
-
-    # every focus change is expected publish a "hostInspectorCurrentElementChanged:"
-    service.move_focus_next()
-
-    first_item = None
-    items = []
-
-    for event in iterator:
-        if event.name != 'hostInspectorCurrentElementChanged:':
-            # ignore any other events
-            continue
-
-        # each such event should contain exactly one element that became in focus
-        current_item = event.data[0]
-
-        if first_item is None:
-            first_item = current_item
-        elif first_item.caption == current_item.caption:
-            return  # Break if we encounter the first item again (loop)
+    elements = []
+    with AccessibilityAudit(service_provider) as service:
+        for element in service.iter_elements():
+            elements.append(element.to_dict())
+    print_json(elements)
 
-        items.append(current_item.to_dict())
-        print_json(items)
-        service.move_focus_next()
 
 @developer.group('condition')
 def condition():

pymobiledevice3/services/accessibilityaudit.py

@@ -2,6 +2,7 @@
 import typing
 from dataclasses import dataclass
 from enum import Enum, IntEnum
+from typing import Generator
 
 from packaging.version import Version
 
@@ -413,3 +414,27 @@ def set_setting(self, name: str, value: typing.Any) -> None:
         self.broadcast.deviceUpdateAccessibilitySetting_withValue_(
             MessageAux().append_obj(setting).append_obj({'ObjectType': 'passthrough', 'Value': value}),
             expects_reply=False)
+
+    def iter_elements(self) -> Generator[AXAuditInspectorFocus_v1, None, None]:
+        iterator = self.iter_events()
+
+        # every focus change is expected publish a "hostInspectorCurrentElementChanged:"
+        self.move_focus_next()
+
+        first_item = None
+
+        for event in iterator:
+            if event.name != 'hostInspectorCurrentElementChanged:':
+                # ignore any other events
+                continue
+
+            # each such event should contain exactly one element that became in focus
+            current_item = event.data[0]
+
+            if first_item is None:
+                first_item = current_item
+            elif first_item.caption == current_item.caption:
+                break  # Break if we encounter the first item again (loop)
+
+            yield current_item
+            self.move_focus_next()