qrpa 1.0.92__tar.gz → 1.0.93__tar.gz

{qrpa-1.0.92 → qrpa-1.0.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.0.92
+Version: 1.0.93
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>

{qrpa-1.0.92 → qrpa-1.0.93}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qrpa"
-version = "1.0.92"
+version = "1.0.93"
 description = "qsir's rpa library"
 authors = [{ name = "QSir", email = "1171725650@qq.com" }]
 readme = "README.md"

{qrpa-1.0.92 → qrpa-1.0.93}/qrpa/fun_excel.py

@@ -759,49 +759,24 @@ def download_images_concurrently(image_urls, platform='shein', img_save_dir=None
         results = list(executor.map(lambda url: download_img_v2(url, platform, img_save_path=img_save_dir), image_urls))
     return results
 
-def get_chromium_executable():
-    """
-    返回 Chromium 可执行文件路径，兼容 PyInstaller 打包后的 exe
-    """
-    # PyInstaller 临时目录
-    if getattr(sys, 'frozen', False):
-        base_path = Path(sys._MEIPASS)
-    else:
-        base_path = Path(__file__).parent
-
-    # 尝试查找打包后的浏览器文件
-    possible_path = base_path / "playwright" / "driver" / "package" / "chromium_headless_shell-1169" / "chrome-win" / "headless_shell.exe"
-    if possible_path.exists():
-        return str(possible_path)
-
-    # fallback: 系统 Playwright 安装目录
-    local_appdata = Path(os.environ.get("LOCALAPPDATA", ""))
-    fallback_path = local_appdata / "ms-playwright" / "chromium" / "chrome-win" / "chrome.exe"
-    if fallback_path.exists():
-        return str(fallback_path)
-
-    raise FileNotFoundError("Chromium 可执行文件未找到，请先执行 'playwright install' 下载浏览器。")
-
 def download_img_by_chrome(image_url, save_name):
-    chromium_path = get_chromium_executable()
-
-    if not chromium_path:
-        log("❌ Chromium 浏览器未找到，跳过下载:", image_url, save_name)
+    try:
+        with sync_playwright() as p:
+            browser = p.chromium.launch(headless=True, executable_path=chromium_path)  # 运行时可以看到浏览器
+            context = browser.new_context()
+            page = context.new_page()
+            # 直接通过Playwright下载图片
+            response = page.request.get(image_url)
+            with open(save_name, 'wb') as f:
+                f.write(response.body())  # 将下载的内容保存为文件
+            log(f"图片已通过chrome下载并保存为:{save_name}")
+            # 关闭浏览器
+            browser.close()
+            return save_name
+    except:
+        send_exception()
         return None
 
-    with sync_playwright() as p:
-        browser = p.chromium.launch(headless=True, executable_path=chromium_path)  # 运行时可以看到浏览器
-        context = browser.new_context()
-        page = context.new_page()
-        # 直接通过Playwright下载图片
-        response = page.request.get(image_url)
-        with open(save_name, 'wb') as f:
-            f.write(response.body())  # 将下载的内容保存为文件
-        log(f"图片已通过chrome下载并保存为:{save_name}")
-        # 关闭浏览器
-        browser.close()
-    return save_name
-
 def download_img_v2(image_url, platform='shein', img_save_path=None):
     image_url = add_https(image_url)
     if image_url is None or 'http' not in image_url:

{qrpa-1.0.92 → qrpa-1.0.93}/qrpa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.0.92
+Version: 1.0.93
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>