add command copy-assets, update find_jar_apk function (#1125)

Author: codeskyblue

README.md

@@ -1219,6 +1219,10 @@ To specify a device, pass `--serial`, e.g., `python -m uiautomator2 --serial bff
     uiautomator2 --serial <YOUR_DEVICE_SERIAL> screenshot screenshot.jpg
     ```
 
+- `copy-assets`: Copy assets/ to current directory
+
+    Used for pyinstaller、nuitka
+
 - `current`: Get current package name and activity
 
     ```bash

uiautomator2/__main__.py

@@ -6,11 +6,14 @@
 import argparse
 import json
 import logging
+import pathlib
+import shutil
 import sys
 
 import adbutils
 
 import uiautomator2 as u2
+from uiautomator2.utils import with_package_resource
 from uiautomator2.version import __version__
 from uiautomator2 import enable_pretty_logging
 
@@ -49,6 +52,18 @@ def cmd_purge(args):
     logger.info("com.github.uiautomator uninstalled, all done !!!")
 
 
+def cmd_copy_assets(args):
+    target_dir = pathlib.Path("assets")
+    target_dir.mkdir(exist_ok=True)
+    with with_package_resource("assets/u2.jar") as jar_path:
+        target_path = target_dir / "u2.jar"
+        shutil.copy2(jar_path, target_path)
+        print("Copied u2.jar to", target_path)
+    with with_package_resource("assets/app-uiautomator.apk") as apk_path:
+        target_path = target_dir / "app-uiautomator.apk"
+        shutil.copy2(apk_path, target_path)
+        print("Copied app-uiautomator.apk to", target_path)
+        
 def cmd_screenshot(args):
     d = u2.connect(args.serial)
     d.screenshot().save(args.filename)
@@ -154,6 +169,11 @@ def cmd_console(args):
             ),
         ],
     ),
+    dict(
+        action=cmd_copy_assets,
+        command="copy-assets",
+        help="copy uiautomator2 assets to current directory",
+    ),
     dict(
         action=cmd_screenshot,
         command="screenshot",

uiautomator2/utils.py

@@ -6,6 +6,7 @@
 import inspect
 import pathlib
 import shlex
+import sys
 import threading
 import typing
 import warnings
@@ -35,9 +36,22 @@ def with_package_resource(filename: str) -> typing.Generator[pathlib.Path, None,
         from importlib_resources import as_file, files
     anchor = files("uiautomator2") / filename
     with as_file(anchor) as f:
-        if not f.exists():
-            raise FileNotFoundError(f"Resource {filename} not found in uiautomator2 package.")
-        yield f
+        if f.exists():
+            yield f
+            return
+    
+    # check if binary folder contains
+    binary_path = pathlib.Path(sys.argv[0])
+    if (binary_path / filename).exists():
+        yield binary_path / filename
+        return
+    
+    # check if running program directory contains
+    if (pathlib.Path.cwd() / filename).exists():
+        yield pathlib.Path.cwd() / filename
+        return
+    
+    raise FileNotFoundError(f"Resource {filename} not found in uiautomator2 package.")
 
 
 def check_alive(fn):