add app_version && optimize list_apps(Lazy loading, default: third-party apps)

Author: lixf6

hmdriver2/driver.py

@@ -117,8 +117,11 @@ def install_app(self, apk_path: str):
     def uninstall_app(self, package_name: str):
         self.hdc.uninstall(package_name)
 
-    def list_apps(self) -> List:
-        return self.hdc.list_apps()
+    def list_apps(self, include_system_apps: bool = False) -> List:
+        return self.hdc.list_apps(include_system_apps)
+
+    def app_version(self, bundle_name) -> Dict:
+        return self.hdc.app_version(bundle_name)
 
     def has_app(self, package_name: str) -> bool:
         return self.hdc.has_app(package_name)
@@ -484,3 +487,4 @@ def xpath(self):
         """
         from ._xpath import _XPath
         return _XPath(self)
+

hmdriver2/hdc.py

@@ -6,7 +6,7 @@
 import re
 import os
 import subprocess
-from typing import Union, List, Dict, Tuple
+from typing import Union, List, Dict, Tuple, Optional
 
 from . import logger
 from .utils import FreePort
@@ -139,13 +139,65 @@ def install(self, apkpath: str):
             raise HdcError("HDC install error", result.error)
         return result
 
-    def list_apps(self) -> List[str]:
-        result = self.shell("bm dump -a")
+    def list_apps(self, include_system_apps: bool = False) -> List[str]:
+        """
+        List installed applications on the device. (Lazy loading, default: third-party apps)
+
+        Args:
+            include_system_apps (bool): If True, include system apps in the list.
+                                        If False, only list third-party apps.
+
+        Returns:
+            List[str]: A list of application package names.
+
+        Note:
+        - When include_system_apps is False, the list typically contains around 50 third-party apps.
+        - When include_system_apps is True, the list typically contains around 200 apps in total.
+        """
+        # Construct the shell command based on the include_system_apps flag
+        if include_system_apps:
+            command = "bm dump -a"
+        else:
+            command = "bm dump -a | grep -v 'com.huawei'"
+
+        # Execute the shell command
+        result = self.shell(command)
         raw = result.output.split('\n')
-        # Use regular expressions to filter out strings starting with 'ID:' and empty strings
-        # raw origin data: ['ID: 100:', 'cn.wps.mobileoffice.hap', '']
+
+        # Filter out strings starting with 'ID:' and empty strings
         return [item.strip() for item in raw if item.strip() and not re.match(r'^ID:', item.strip())]
 
+    def app_version(self, bundlename: str) -> Dict[str, Optional[str]]:
+        """
+        Get the version information of an app installed on the device.
+
+        Args:
+            bundlename (str): The bundle name of the app.
+
+        Returns:
+            dict: A dictionary containing the version information:
+                  - "versionName": The version name of the app.
+                  - "versionCode": The version code of the app.
+        """
+        result = _execute_command(f"{self.hdc_prefix} -t {self.serial} shell bm dump -n {bundlename} | grep '\"versionCode\":\\|versionName\"'")
+
+        matches = re.findall(r'"versionCode":\s*(\d+),\s*"versionName":\s*"([^"]*)"', result.output)
+        if not matches:
+            return dict(
+                version_name='',
+                version_code=''
+            )
+
+        # Select the last match
+        version_code, version_name = matches[-1]
+        version_code = int(version_code) if version_code.isdigit() else None
+        version_name = version_name if version_name != "" else None
+
+        return dict(
+            version_name=version_name,
+            version_code=version_code
+        )
+
     def has_app(self, package_name: str) -> bool:
         data = self.shell("bm dump -a").output
         return True if package_name in data else False

tests/test_driver.py

@@ -51,14 +51,40 @@ def test_uninstall_app(d):
 
 
 def test_list_apps(d):
+    apps = d.list_apps()
     # Assert that no item in the list starts with "ID:"
-    assert not any(item.startswith("ID:") for item in d.list_apps())
+    assert not any(item.startswith("ID:") for item in apps)
 
     # Assert that no empty strings are in the list
-    assert "" not in d.list_apps()
+    assert "" not in apps
 
     # Assert that "com.samples.test.uitest" is in the list
-    assert "com.samples.test.uitest" in d.list_apps()
+    assert "com.sogou.input" in apps
+    # assert "com.samples.test.uitest" in apps
+
+    # Test all apps (include system apps)
+    all_apps = d.list_apps(include_system_apps=True)
+
+    # Assert that "com.huawei.systemmanager" is in the list (system app)
+    assert "com.huawei.hmos.settings" in all_apps, "'com.huawei.hmos.settings' is not in the full apps list."
+
+    # Assert that "com.sogou.input" is also in the list
+    assert "com.sogou.input" in all_apps, "'com.sogou.input' is not in the full apps list."
+
+    # Assert that the total number of apps is greater than the number of third-party apps
+    assert len(all_apps) > len(apps), "Full apps list is not larger than third-party apps list."
+
+
+def test_app_version(d):
+    version_info = d.app_version('com.sogou.input')
+
+    # Assert that version_name and version_code exist in the returned dictionary
+    assert 'version_name' in version_info, "version_name is missing in the returned dictionary."
+    assert 'version_code' in version_info, "version_code is missing in the returned dictionary."
+
+    # Assert specific values
+    assert version_info['version_name'] == "1.0.4", "version_name does not match expected value."
+    assert version_info['version_code'] == 5, "version_code does not match expected value."
 
 
 def test_has_app(d):