damon-devtools 0.3.0__tar.gz → 0.4.0__tar.gz

{damon_devtools-0.3.0 → damon_devtools-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: damon-devtools
-Version: 0.3.0
+Version: 0.4.0
 Summary: Developer CLI tools — portkill, removebg, apkpull
 Author: damon
 License: MIT

{damon_devtools-0.3.0 → damon_devtools-0.4.0}/damon_devtools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: damon-devtools
-Version: 0.3.0
+Version: 0.4.0
 Summary: Developer CLI tools — portkill, removebg, apkpull
 Author: damon
 License: MIT

{damon_devtools-0.3.0 → damon_devtools-0.4.0}/devtools/tools/apkpull/core.py

@@ -17,6 +17,15 @@ AAPT2_REMOTE_URL = "https://github.com/JonForShort/android-tools/raw/refs/heads/
 # Device-side aapt2 path
 AAPT2_DEVICE_PATH = "/data/local/tmp/aapt2"
 
+# Apktool download URL and local path
+APKTOOL_VERSION = "2.12.1"
+APKTOOL_REMOTE_URL = f"https://github.com/iBotPeaches/Apktool/releases/download/v{APKTOOL_VERSION}/apktool_{APKTOOL_VERSION}.jar"
+APKTOOL_LOCAL_DIR = os.path.join(
+    os.path.dirname(os.path.dirname(os.path.dirname(__file__))),
+    "deps", "apktool"
+)
+APKTOOL_JAR = os.path.join(APKTOOL_LOCAL_DIR, f"apktool_{APKTOOL_VERSION}.jar")
+
 # App name cache
 LABEL_CACHE_FILE = os.path.expanduser("~/.devtools/cache/apkpull/label_cache.json")
 
@@ -215,19 +224,25 @@ def scan_packages() -> list[str]:
     return pkgs
 
 def get_apk_path(pkg: str) -> str | None:
-    """执行 pm path，返回 APK 物理路径"""
+    """执行 pm path，返回 APK 物理路径（仅返回第一个）"""
+    paths = get_apk_paths(pkg)
+    return paths[0] if paths else None
+
+def get_apk_paths(pkg: str) -> list[str]:
+    """执行 pm path，返回所有 APK 物理路径（split APK 会返回多个）"""
     serial = get_device_serial()
     try:
         result = subprocess.run(
             adb_cmd(["shell", "pm", "path", pkg], serial),
             capture_output=True, text=True, encoding="utf-8", errors="replace", check=True
         )
+        paths = []
         for line in result.stdout.strip().split("\n"):
             if line.startswith("package:"):
-                return line[8:].strip()
-        return None
+                paths.append(line[8:].strip())
+        return paths
     except (subprocess.CalledProcessError, FileNotFoundError):
-        return None
+        return []
 
 def get_app_name_pm_dump(pkg: str) -> str:
     """通过设备端 pm dump 提取 application label（失败时回退包名）"""
@@ -300,4 +315,146 @@ def pull_apk(apk_path: str, dest_path: str) -> bool:
         )
         return True
     except (subprocess.CalledProcessError, FileNotFoundError):
-        return False
+        return False
+
+def download_apktool() -> str | None:
+    """Download apktool jar and return local path, or None on failure."""
+    if os.path.isfile(APKTOOL_JAR):
+        return APKTOOL_JAR
+    try:
+        os.makedirs(APKTOOL_LOCAL_DIR, exist_ok=True)
+        print(f"正在下载 apktool {APKTOOL_VERSION}...")
+        urllib.request.urlretrieve(APKTOOL_REMOTE_URL, APKTOOL_JAR)
+        return APKTOOL_JAR
+    except Exception as e:
+        print(f"apktool 下载失败: {e}")
+        return None
+
+def ensure_apktool() -> str | None:
+    """Ensure apktool is available, download if missing, and initialize framework."""
+    # Check if apktool.jar exists locally
+    if not os.path.isfile(APKTOOL_JAR):
+        if not download_apktool():
+            return None
+
+    # Initialize apktool framework (one-time setup)
+    # --force ensures the framework is updated to support newer Android SDK attributes
+    try:
+        subprocess.run(
+            ["java", "-jar", APKTOOL_JAR, "empty-framework-dir"],
+            capture_output=True, text=True, encoding="utf-8", errors="replace", timeout=60
+        )
+    except Exception:
+        pass  # Non-fatal, continue even if cf fails
+
+    return APKTOOL_JAR
+
+def merge_split_apks(apk_paths: list[str], output_apk: str, java_path: str | None = None) -> bool:
+    """
+    Merge multiple split APKs into a single APK using apktool.
+    apk_paths: list of local APK file paths (first is treated as base)
+    output_apk: path to write the merged APK
+    Returns True on success.
+    """
+    import shutil
+
+    java = java_path or "java"
+    apktool_jar = ensure_apktool()
+    if not apktool_jar:
+        print("错误: apktool 不可用")
+        return False
+
+    # Check java
+    try:
+        subprocess.run([java, "-version"], capture_output=True, check=True)
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        print("错误: 未找到 Java，请确保已安装 JDK 并加入 PATH")
+        return False
+
+    base_apk = apk_paths[0]
+    split_apks = apk_paths[1:]
+
+    # Create temp working directory
+    work_dir = tempfile.mkdtemp(prefix="apkmerge_")
+    base_dir = os.path.join(work_dir, "base")
+    decoded_dir = base_dir  # apktool will create this
+
+    try:
+        # Decode base APK
+        print(f"正在解码基础 APK...")
+        result = subprocess.run(
+            [java, "-jar", apktool_jar, "d", base_apk, "-o", base_dir, "-f"],
+            capture_output=True, text=True, encoding="utf-8", errors="replace"
+        )
+        if result.returncode != 0:
+            print(f"apktool 解码失败: {result.stderr}")
+            return False
+
+        # Decode and merge each split APK
+        for split_apk in split_apks:
+            print(f"正在解码分片 APK: {os.path.basename(split_apk)}")
+            split_dir = tempfile.mkdtemp(prefix="split_")
+            result = subprocess.run(
+                [java, "-jar", apktool_jar, "d", split_apk, "-o", split_dir, "-f"],
+                capture_output=True, text=True, encoding="utf-8", errors="replace"
+            )
+            if result.returncode != 0:
+                print(f"apktool 解码分片失败: {result.stderr}")
+                return False
+
+            # Copy dex files from split to base (apktool names them classes.dex, classes2.dex, etc.)
+            split_root = split_dir
+            for fname in os.listdir(split_root):
+                if fname.endswith(".dex"):
+                    src = os.path.join(split_root, fname)
+                    dst = os.path.join(base_dir, fname)
+                    # If already exists (from another split), rename (classes3.dex, etc.)
+                    if os.path.exists(dst):
+                        base_name = fname.rsplit(".", 1)[0]
+                        ext = fname.rsplit(".", 1)[1]
+                        counter = 2
+                        while os.path.exists(dst):
+                            dst = os.path.join(base_dir, f"{base_name}{counter}.{ext}")
+                            counter += 1
+                    shutil.copy2(src, dst)
+                    print(f"  合并: {fname} -> {os.path.basename(dst)}")
+
+            # Copy lib directories if present (architecture-specific libs)
+            for lib_name in ["lib", "assets"]:
+                split_lib = os.path.join(split_dir, lib_name)
+                if os.path.isdir(split_lib):
+                    base_lib = os.path.join(base_dir, lib_name)
+                    if not os.path.isdir(base_lib):
+                        shutil.copytree(split_lib, base_lib)
+                    else:
+                        # Merge contents
+                        for item in os.listdir(split_lib):
+                            src_item = os.path.join(split_lib, item)
+                            dst_item = os.path.join(base_lib, item)
+                            if os.path.isdir(src_item):
+                                if not os.path.exists(dst_item):
+                                    shutil.copytree(src_item, dst_item)
+                            else:
+                                if not os.path.exists(dst_item):
+                                    shutil.copy2(src_item, dst_item)
+            shutil.rmtree(split_dir)
+
+        # Build merged APK
+        print("正在构建合并 APK...")
+        result = subprocess.run(
+            [java, "-jar", apktool_jar, "b", base_dir, "-o", output_apk],
+            capture_output=True, text=True, encoding="utf-8", errors="replace"
+        )
+        if result.returncode != 0:
+            print(f"apktool 构建失败: {result.stderr}")
+            return False
+
+        print(f"合并完成: {output_apk}")
+        return True
+
+    except Exception as e:
+        print(f"合并过程出错: {e}")
+        return False
+    finally:
+        # Cleanup
+        shutil.rmtree(work_dir, ignore_errors=True)

{damon_devtools-0.3.0 → damon_devtools-0.4.0}/devtools/tools/apkpull/ui.py

@@ -158,21 +158,50 @@ def run(args: list[str] | None = None):
             continue
 
         # Pull APKs
-        from devtools.tools.apkpull.core import get_apk_path, pull_apk, sanitize_filename
+        from devtools.tools.apkpull.core import get_apk_paths, pull_apk, merge_split_apks, sanitize_filename
         succeeded: list[str] = []
         failed: list[tuple] = []
 
         for p in selected:
-            apk_path = get_apk_path(p.pkg)
-            if not apk_path:
+            apk_paths = get_apk_paths(p.pkg)
+            if not apk_paths:
                 failed.append((p.label, "未找到 APK 路径"))
                 continue
             file_base = p.label if p.label and p.label != p.pkg else p.pkg
             dest_apk = os.path.join(parsed.dest_dir, f"{sanitize_filename(file_base)}.apk")
-            if pull_apk(apk_path, dest_apk):
-                succeeded.append(p.label)
+
+            if len(apk_paths) == 1:
+                # Single APK - direct pull
+                if pull_apk(apk_paths[0], dest_apk):
+                    succeeded.append(p.label)
+                else:
+                    failed.append((p.label, "拉取失败"))
             else:
-                failed.append((p.label, "拉取失败"))
+                # Split APK - pull all then merge
+                print(f"\n检测到 split APK (共 {len(apk_paths)} 个分片)，正在拉取并合并...")
+                tmp_apks: list[str] = []
+                tmp_dir = os.path.join(parsed.dest_dir, f".tmp_{sanitize_filename(file_base)}")
+                try:
+                    os.makedirs(tmp_dir, exist_ok=True)
+                    all_ok = True
+                    for i, apk_path in enumerate(apk_paths):
+                        tmp_file = os.path.join(tmp_dir, f"split_{i}.apk")
+                        if not pull_apk(apk_path, tmp_file):
+                            failed.append((p.label, f"拉取分片 {i+1} 失败"))
+                            all_ok = False
+                            break
+                        tmp_apks.append(tmp_file)
+
+                    if all_ok:
+                        if merge_split_apks(tmp_apks, dest_apk):
+                            succeeded.append(p.label)
+                        else:
+                            failed.append((p.label, "合并 APK 失败"))
+                finally:
+                    # Cleanup temp files
+                    import shutil
+                    if os.path.isdir(tmp_dir):
+                        shutil.rmtree(tmp_dir, ignore_errors=True)
 
         print()
         if succeeded:

{damon_devtools-0.3.0 → damon_devtools-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "damon-devtools"
-version = "0.3.0"
+version = "0.4.0"
 description = "Developer CLI tools — portkill, removebg, apkpull"
 readme = "README.md"
 requires-python = ">=3.10"