bugfix

Author: codematrixer

.github/workflows/release.yml

@@ -23,6 +23,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install setuptools wheel twine poetry
+        poetry lock --no-update
         poetry install
 
     - name: Get the version from the tag

hmdriver2/_xpath.py

@@ -19,7 +19,7 @@ def __call__(self, xpath: str) -> '_XMLElement':
 
         hierarchy: Dict = self._d.dump_hierarchy()
         if not hierarchy:
-            raise XmlElementNotFoundError(f"xpath: {xpath} not found")
+            raise RuntimeError("hierarchy is empty")
 
         xml = _XPath._json2xml(hierarchy)
         result = xml.xpath(xpath)

hmdriver2/driver.py

@@ -174,7 +174,7 @@ def set_display_rotation(self, rotation: DisplayRotation):
         Sets the display rotation to the specified orientation.
 
         Args:
-            rotation (DisplayRotation): The desired display rotation. This should be an instance of the DisplayRotation enum.
+            rotation (DisplayRotation): display rotation.
         """
         api = "Driver.setDisplayRotation"
         self._invoke(api, args=[rotation.value])
@@ -300,7 +300,8 @@ def swipe(self, x1, y1, x2, y2, speed=2000):
             y1 (float): The start Y coordinate as a percentage or absolute value.
             x2 (float): The end X coordinate as a percentage or absolute value.
             y2 (float): The end Y coordinate as a percentage or absolute value.
-            speed (int, optional): The swipe speed in pixels per second. Default is 2000. Range: 200-40000. If not within the range, set to default value of 2000.
+            speed (int, optional): The swipe speed in pixels per second. Default is 2000. Range: 200-40000,
+            If not within the range, set to default value of 2000.
         """
 
         point1 = self._to_abs_pos(x1, y1)

hmdriver2/hdc.py

@@ -29,7 +29,7 @@ def _execute_command(cmdargs: Union[str, List[str]]) -> CommandResult:
         error = error.decode('utf-8')
         exit_code = process.returncode
 
-        if output.lower().__contains__('error:'):
+        if 'error:' in output.lower() or '[fail]:' in output.lower():
             return CommandResult("", output, -1)
 
         return CommandResult(output, error, exit_code)
@@ -111,7 +111,8 @@ def uninstall(self, bundlename: str):
         return result
 
     def install(self, apkpath: str):
-        result = _execute_command(f"hdc -t {self.serial} install '{apkpath}'")
+        quoted_path = shlex.quote(apkpath)
+        result = _execute_command(f"hdc -t {self.serial} install {quoted_path}")
         if result.exit_code != 0:
             raise HdcError("HDC install error", result.error)
         return result
@@ -254,7 +255,7 @@ def dump_hierarchy(self) -> Dict:
             self.recv_file(_tmp_path, path)
 
             try:
-                with open(path, 'r') as file:
+                with open(path, 'r', encoding='utf8') as file:
                     data = json.load(file)
             except Exception as e:
                 logger.error(f"Error loading JSON file: {e}")