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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: damon-devtools
-Version: 0.4.0
+Version: 0.6.0
 Summary: Developer CLI tools — portkill, removebg, apkpull
 Author: damon
 License: MIT
@@ -8,6 +8,9 @@ Keywords: cli,devtools,android,apk,adb
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: psutil>=5.9
+Requires-Dist: markdownify
+Requires-Dist: beautifulsoup4
+Requires-Dist: requests
 
 # devtools
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: damon-devtools
-Version: 0.4.0
+Version: 0.6.0
 Summary: Developer CLI tools — portkill, removebg, apkpull
 Author: damon
 License: MIT
@@ -8,6 +8,9 @@ Keywords: cli,devtools,android,apk,adb
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: psutil>=5.9
+Requires-Dist: markdownify
+Requires-Dist: beautifulsoup4
+Requires-Dist: requests
 
 # devtools
 

{damon_devtools-0.4.0 → damon_devtools-0.6.0}/damon_devtools.egg-info/SOURCES.txt

@@ -24,4 +24,8 @@ devtools/tools/portkill/ui.py
 devtools/tools/removebg/__init__.py
 devtools/tools/removebg/__main__.py
 devtools/tools/removebg/cli.py
-devtools/tools/removebg/core.py
+devtools/tools/removebg/core.py
+devtools/tools/url2md/__init__.py
+devtools/tools/url2md/__main__.py
+devtools/tools/url2md/cli.py
+devtools/tools/url2md/core.py

damon_devtools-0.6.0/damon_devtools.egg-info/requires.txt

@@ -0,0 +1,4 @@
+psutil>=5.9
+markdownify
+beautifulsoup4
+requests

{damon_devtools-0.4.0 → damon_devtools-0.6.0}/devtools/tools/__init__.py

@@ -1,29 +1,35 @@
-"""Tools registry for devtools"""
-from devtools.types import Tool
-
-TOOLS = [
-    Tool(
-        name="portkill",
-        category="进程/端口",
-        description="按端口杀 Node.js 进程",
-        module="devtools.tools.portkill",
-    ),
-    Tool(
-        name="removebg",
-        category="图像处理",
-        description="批量删除图片背景",
-        module="devtools.tools.removebg",
-    ),
-    Tool(
-        name="apkpull",
-        category="设备管理",
-        description="提取手机 APK 文件",
-        module="devtools.tools.apkpull",
-    ),
-]
-
-def get_tool(name: str):
-    for tool in TOOLS:
-        if tool.name == name:
-            return tool
-    return None
+"""Tools registry for devtools"""
+from devtools.types import Tool
+
+TOOLS = [
+    Tool(
+        name="portkill",
+        category="进程/端口",
+        description="按端口杀 Node.js 进程",
+        module="devtools.tools.portkill",
+    ),
+    Tool(
+        name="removebg",
+        category="图像处理",
+        description="批量删除图片背景",
+        module="devtools.tools.removebg",
+    ),
+    Tool(
+        name="url2md",
+        category="网页工具",
+        description="将网页链接转换为 Markdown 文件",
+        module="devtools.tools.url2md",
+    ),
+    Tool(
+        name="apkpull",
+        category="设备管理",
+        description="提取手机 APK 文件",
+        module="devtools.tools.apkpull",
+    ),
+]
+
+def get_tool(name: str):
+    for tool in TOOLS:
+        if tool.name == name:
+            return tool
+    return None

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

@@ -58,6 +58,49 @@ def get_label_cache() -> dict[str, str]:
         _label_cache = load_label_cache()
     return _label_cache
 
+# Selected device serial (set by user via CLI or interactive selection)
+selected_device: str | None = None
+
+def set_selected_device(serial: str | None) -> None:
+    """设置当前选中的设备"""
+    global selected_device
+    selected_device = serial
+
+def get_connected_devices() -> list[tuple[str, str, str]]:
+    """返回 [(serial, brand, model), ...]，仅返回 state=device 的设备"""
+    try:
+        result = subprocess.run(
+            ["adb", "devices"], capture_output=True, text=True, encoding="utf-8", errors="replace", check=True
+        )
+        devices: list[tuple[str, str, str]] = []
+        for line in result.stdout.strip().split("\n")[1:]:
+            if line.strip() and not line.startswith("*"):
+                parts = line.split()
+                if len(parts) >= 2 and parts[1] == "device":
+                    serial = parts[0]
+                    brand, model = get_device_info(serial)
+                    devices.append((serial, brand, model))
+        return devices
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        return []
+
+def get_device_info(serial: str) -> tuple[str, str]:
+    """获取指定设备的 (品牌, 型号)"""
+    try:
+        brand_result = subprocess.run(
+            ["adb", "-s", serial, "shell", "getprop", "ro.product.brand"],
+            capture_output=True, text=True, encoding="utf-8", errors="replace", check=True
+        )
+        model_result = subprocess.run(
+            ["adb", "-s", serial, "shell", "getprop", "ro.product.model"],
+            capture_output=True, text=True, encoding="utf-8", errors="replace", check=True
+        )
+        brand = brand_result.stdout.strip() or "Unknown"
+        model = model_result.stdout.strip() or "Unknown"
+        return brand, model
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        return "Unknown", "Unknown"
+
 def check_adb() -> bool:
     """检查 ADB 是否可用"""
     try:
@@ -67,7 +110,9 @@ def check_adb() -> bool:
         return False
 
 def get_device_serial() -> str | None:
-    """获取第一个已连接的设备序列号，多设备时返回第一个"""
+    """获取设备 serial：有选中设备时返回之，否则返回第一个已连接设备"""
+    if selected_device:
+        return selected_device
     try:
         result = subprocess.run(["adb", "devices"], capture_output=True, text=True, encoding="utf-8", errors="replace", check=True)
         lines = result.stdout.strip().split("\n")

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

@@ -113,9 +113,59 @@ def run(args: list[str] | None = None):
     parser = argparse.ArgumentParser(prog="apkpull", description="Pull APK from Android device")
     parser.add_argument("dest_dir", nargs="?", default=os.getcwd(), help="目标目录 (默认当前目录)")
     parser.add_argument("-s", "--search", metavar="KEYWORD", help="模糊搜索应用名/包名并退出")
+    parser.add_argument("-n", "--no-merge", action="store_true", help="不合并 split APK，直接导出所有分片")
+    parser.add_argument("-d", "--device", metavar="SERIAL", help="指定设备序列号，跳过设备选择")
 
     parsed = parser.parse_args(args)
 
+    # Device selection
+    from devtools.tools.apkpull.core import get_connected_devices, set_selected_device, check_adb
+
+    if not check_adb():
+        print("错误: 未找到 adb 命令，请确保 Android SDK platform-tools 已安装并加入 PATH")
+        return
+
+    devices = get_connected_devices()
+    if not devices:
+        print("错误: 未检测到设备，请确保手机已通过 USB 连接并开启了 USB 调试模式")
+        return
+
+    if parsed.device:
+        # CLI指定的设备
+        serials = [d[0] for d in devices]
+        if parsed.device not in serials:
+            print(f"错误: 指定设备 {parsed.device} 未找到或未连接")
+            return
+        serial = parsed.device
+        _, brand, model = devices[serials.index(serial)]
+        set_selected_device(serial)
+        print(f"已选择: {brand} {model} ({serial})")
+    elif len(devices) == 1:
+        # 单设备，自动使用
+        serial, brand, model = devices[0]
+        set_selected_device(serial)
+        print(f"已连接: {brand} {model} ({serial})")
+    else:
+        # 多设备，交互选择
+        print()
+        print("已检测到多个设备：")
+        for i, (s, brand, model) in enumerate(devices):
+            print(f"  {i + 1}. {s}  {brand}  {model}")
+        while True:
+            try:
+                default = "1"
+                user_input = input(f"\n请选择目标设备 [{default}]: ").strip() or default
+                idx = int(user_input) - 1
+                if 0 <= idx < len(devices):
+                    break
+                print("无效序号，请重试")
+            except (ValueError, EOFError, KeyboardInterrupt):
+                print("\n取消")
+                return
+        serial, brand, model = devices[idx]
+        set_selected_device(serial)
+        print(f"已选择: {brand} {model} ({serial})")
+
     packages = scan_packages_with_labels()
     if not packages:
         return
@@ -177,31 +227,46 @@ def run(args: list[str] | None = None):
                 else:
                     failed.append((p.label, "拉取失败"))
             else:
-                # 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
+                # Split APK
+                if parsed.no_merge:
+                    # No merge - export each split APK directly
+                    print(f"\n检测到 split APK (共 {len(apk_paths)} 个分片)，正在导出所有分片（不合并）...")
                     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)
+                        if i == 0:
+                            out_path = dest_apk  # base APK: app.apk
                         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)
+                            out_path = os.path.join(parsed.dest_dir, f"{sanitize_filename(file_base)}-split-{i}.apk")
+                        if pull_apk(apk_path, out_path):
+                            print(f"  已导出: {os.path.basename(out_path)}")
+                        else:
+                            failed.append((p.label, f"导出分片 {i+1} 失败"))
+                    succeeded.append(p.label)
+                else:
+                    # Merge - pull all to temp dir, merge, then cleanup
+                    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.6.0/devtools/tools/url2md/__main__.py

@@ -0,0 +1,5 @@
+import sys
+from devtools.tools.url2md.cli import run
+
+if __name__ == "__main__":
+    run(sys.argv[1:])

damon_devtools-0.6.0/devtools/tools/url2md/cli.py

@@ -0,0 +1,111 @@
+"""CLI entry point for url2md."""
+import argparse
+import re
+import sys
+from pathlib import Path
+
+from devtools.tools.url2md.core import fetch_and_convert
+
+INVALID_FILENAME_CHARS = re.escape(r'/\:*?"<>|')
+
+
+def run(args: list[str] | None = None):
+    if args is None:
+        args = sys.argv[1:]
+
+    parser = argparse.ArgumentParser(
+        prog="python -m devtools url2md",
+        description="Convert URLs to markdown files",
+    )
+    parser.add_argument(
+        "-o", "--output",
+        type=Path,
+        default=None,
+        metavar="DIR",
+        help="Output directory (default: current directory)",
+    )
+    parser.add_argument(
+        "urls",
+        nargs="+",
+        metavar="URL-OR-FILE",
+        help="URL or file containing URLs (one per line)",
+    )
+
+    ns = parser.parse_args(args)
+
+    # Resolve all URLs
+    all_urls: list[str] = []
+    for item in ns.urls:
+        path = Path(item)
+        if path.exists() and path.is_file():
+            lines = path.read_text(encoding="utf-8").splitlines()
+            for line in lines:
+                line = line.strip()
+                if line:
+                    all_urls.append(line)
+        else:
+            all_urls.append(item)
+
+    if not all_urls:
+        print("No URLs to process.", file=sys.stderr)
+        sys.exit(1)
+
+    # Create output dir if specified
+    output_dir = ns.output or Path(".")
+    if output_dir != Path("."):
+        output_dir.mkdir(parents=True, exist_ok=True)
+
+    succeeded: list[str] = []
+    failed: list[tuple[str, str]] = []
+
+    print(f"Processing {len(all_urls)} URL(s)...")
+
+    for url in all_urls:
+        try:
+            result = fetch_and_convert(url)
+            filename = _sanitize_filename(result["title"]) or _url_to_fallback_title(url)
+            if not filename.endswith(".md"):
+                filename += ".md"
+
+            date_line = ""
+            if result["date"]:
+                date_line = f"\nPublished: {result['date']}"
+
+            content = (
+                f"# {result['title']}\n\n"
+                f"{result['body_md']}\n\n"
+                f"---\n\n"
+                f"Source: [{result['source_url']}]({result['source_url']}){date_line}\n"
+            )
+
+            out_path = output_dir / filename
+            out_path.write_text(content, encoding="utf-8")
+            succeeded.append(url)
+            print(f"  OK: {url} -> {out_path.name}")
+
+        except Exception as e:
+            failed.append((url, str(e)))
+            print(f"  FAIL: {url} — {e}", file=sys.stderr)
+
+    # Summary
+    total = len(succeeded) + len(failed)
+    print(f"\nProcessed {total} URL(s): {len(succeeded)} succeeded, {len(failed)} failed")
+
+    if failed:
+        print("\nFailed URLs:")
+        for url, err in failed:
+            print(f"  {url}: {err}")
+        sys.exit(1)
+
+
+def _sanitize_filename(title: str) -> str:
+    # Replace any char that's invalid in Windows/Unix filenames
+    return re.sub(r'[/\\:*?"<>|]', "_", title).strip()
+
+
+def _url_to_fallback_title(url: str) -> str:
+    from urllib.parse import urlparse
+    parsed = urlparse(url)
+    path = parsed.path.strip("/").replace("/", "_")
+    host = parsed.netloc.replace(":", "_")
+    return f"{host}_{path}" if path else host

damon_devtools-0.6.0/devtools/tools/url2md/core.py

@@ -0,0 +1,92 @@
+"""Core logic for fetching and converting URLs to markdown."""
+import re
+from datetime import datetime
+from typing import Optional
+
+import requests
+requests.packages.urllib3.disable_warnings()
+from bs4 import BeautifulSoup
+from markdownify import markdownify
+
+
+def fetch_and_convert(url: str) -> dict:
+    """
+    Fetch a URL and convert it to markdown.
+
+    Returns:
+        dict with keys: title, body_md, source_url, date, url
+        date is None if not found.
+    """
+    response = requests.get(url, timeout=15, verify=False)
+    response.raise_for_status()
+    response.encoding = response.apparent_encoding or "utf-8"
+
+    soup = BeautifulSoup(response.text, "html.parser")
+
+    title = _extract_title(soup)
+    body_md = _extract_body(soup)
+    date = _extract_date(soup)
+
+    return {
+        "title": title,
+        "body_md": body_md,
+        "source_url": url,
+        "date": date,
+        "url": url,
+    }
+
+
+def _extract_title(soup: BeautifulSoup) -> str:
+    # Try <title> tag first
+    title_tag = soup.find("title")
+    if title_tag and title_tag.get_text(strip=True):
+        return title_tag.get_text(strip=True)
+
+    # Fallback: first <h1>
+    h1 = soup.find("h1")
+    if h1 and h1.get_text(strip=True):
+        return h1.get_text(strip=True)
+
+    return ""
+
+
+def _extract_body(soup: BeautifulSoup) -> str:
+    # markdownify converts the whole document, which is fine for v1
+    return markdownify(str(soup))
+
+
+def _extract_date(soup: BeautifulSoup) -> Optional[str]:
+    # Try <time> element with datetime attribute
+    time_tag = soup.find("time")
+    if time_tag and time_tag.get("datetime"):
+        try:
+            dt = datetime.fromisoformat(time_tag["datetime"].strip())
+            return dt.strftime("%Y-%m-%d")
+        except ValueError:
+            pass
+
+    # Try meta tags
+    for meta_name in ("datePublished", "pubdate", "article:published_time"):
+        meta = soup.find("meta", attrs={"property": meta_name}) or soup.find("meta", attrs={"name": meta_name})
+        if meta and meta.get("content"):
+            return _parse_date(meta["content"])
+
+    # Try first paragraph with a date pattern
+    first_p = soup.find("p")
+    if first_p:
+        text = first_p.get_text()
+        date_match = re.search(r"(\d{4}[-/]\d{2}[-/]\d{2})", text)
+        if date_match:
+            return _parse_date(date_match.group(1))
+
+    return None
+
+
+def _parse_date(date_str: str) -> Optional[str]:
+    """Try to parse a date string into YYYY-MM-DD."""
+    for fmt in ("%Y-%m-%d", "%Y/%m/%d", "%d-%m-%Y", "%d/%m/%Y"):
+        try:
+            return datetime.strptime(date_str.strip(), fmt).strftime("%Y-%m-%d")
+        except ValueError:
+            pass
+    return None

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

@@ -1,24 +1,24 @@
-[project]
-name = "damon-devtools"
-version = "0.4.0"
-description = "Developer CLI tools — portkill, removebg, apkpull"
-readme = "README.md"
-requires-python = ">=3.10"
-dependencies = ["psutil>=5.9"]
-license = {text = "MIT"}
-authors = [
-    {name = "damon"},
-]
-keywords = ["cli", "devtools", "android", "apk", "adb"]
-
-[project.scripts]
-devtools = "devtools.__main__:main"
-
-[tool.setuptools.packages.find]
-where = ["."]
-include = ["devtools*"]
-exclude = ["dotfiles*", "tests*", "build*", "dist*"]
-
-[build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
+[project]
+name = "damon-devtools"
+version = "0.6.0"
+description = "Developer CLI tools — portkill, removebg, apkpull"
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = ["psutil>=5.9", "markdownify", "beautifulsoup4", "requests"]
+license = {text = "MIT"}
+authors = [
+    {name = "damon"},
+]
+keywords = ["cli", "devtools", "android", "apk", "adb"]
+
+[project.scripts]
+devtools = "devtools.__main__:main"
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["devtools*"]
+exclude = ["dotfiles*", "tests*", "build*", "dist*"]
+
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"

damon_devtools-0.4.0/damon_devtools.egg-info/requires.txt

@@ -1 +0,0 @@
-psutil>=5.9