mdbq 4.0.74__tar.gz → 4.0.76__tar.gz

{mdbq-4.0.74 → mdbq-4.0.76}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mdbq
-Version: 4.0.74
+Version: 4.0.76
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

mdbq-4.0.76/mdbq/__version__.py

@@ -0,0 +1 @@
+VERSION = '4.0.76'

{mdbq-4.0.74 → mdbq-4.0.76}/mdbq/selenium/get_driver.py

@@ -2,7 +2,11 @@
 import os
 import platform
 import getpass
-from selenium import webdriver
+from selenium import webdriver as selenium_webdriver
+try:
+    from seleniumwire import webdriver as wire_webdriver
+except ImportError:
+    wire_webdriver = None
 from selenium.webdriver.chrome.service import Service
 import re
 import socket
@@ -24,7 +28,7 @@ class GetDriver:
     Selenium ChromeDriver 管理器，支持多平台、代理、无头模式、下载目录、User-Agent等高级配置。
     支持上下文管理器（with语法），自动资源清理。
     """
-    def __init__(self, url=None, headless=False, proxy=None, user_agent=None, download_dir=None, chrome_path=None, chromedriver_path=None, maximize_window=True):
+    def __init__(self, url=None, headless=False, proxy=None, user_agent=None, download_dir=None, chrome_path=None, chromedriver_path=None, maximize_window=True, is_selenium_wire=False):
         """
         初始化GetDriver
         :param url: 允许的安全站点（用于insecure origin as secure）
@@ -52,6 +56,7 @@ class GetDriver:
             import random
             self.user_agent = user_agents[random.randint(0, len(user_agents) - 1)]
         self.maximize_window = maximize_window
+        self.is_selenium_wire = is_selenium_wire
 
     def check_proxy(self):
         """
@@ -109,7 +114,8 @@ class GetDriver:
                     if version_match:
                         return version_match.group(1)
         except Exception as e:
-            print(f"获取Chrome版本失败: {e}")
+            pass
+            # print(f"获取Chrome版本失败: {e}")
         return None
 
     def _get_chromedriver_version(self, chromedriver_path):
@@ -133,7 +139,8 @@ class GetDriver:
                 if version_match:
                     return version_match.group(1)
         except Exception as e:
-            print(f"获取Chromedriver版本失败: {e}")
+            pass
+            # print(f"获取Chromedriver版本失败: {e}")
         return None
 
     def _check_version_compatibility(self, chrome_path, chromedriver_path):
@@ -145,11 +152,11 @@ class GetDriver:
         """
         chrome_version = self._get_chrome_version(chrome_path)
         chromedriver_version = self._get_chromedriver_version(chromedriver_path)
-        print(f"Chrome版本: {chrome_version}, Chromedriver版本: {chromedriver_version}")
+        # print(f"Chrome版本: {chrome_version}, Chromedriver版本: {chromedriver_version}")
         
         # 如果无法获取版本信息，返回True允许尝试启动
         if not chrome_version or not chromedriver_version:
-            print(f"警告: 无法获取版本信息 - Chrome: {chrome_version}, Chromedriver: {chromedriver_version}")
+            #(f"警告: 无法获取版本信息 - Chrome: {chrome_version}, Chromedriver: {chromedriver_version}")
             return True, chrome_version, chromedriver_version
         
         # 提取主版本号进行比较
@@ -171,7 +178,10 @@ class GetDriver:
         try:
             option.binary_location = chrome_path
             service = Service(chromedriver_path)
-            driver = webdriver.Chrome(service=service, options=option)
+            if self.is_selenium_wire and wire_webdriver:
+                driver = wire_webdriver.Chrome(service=service, options=option)
+            else:
+                driver = selenium_webdriver.Chrome(service=service, options=option)
             if self.maximize_window:
                 driver.maximize_window()
             
@@ -206,7 +216,8 @@ class GetDriver:
             
             return driver
         except Exception as e:
-            print(f"创建Chrome WebDriver失败: {e}")
+            pass
+            # print(f"创建Chrome WebDriver失败: {e}")
             return None
 
     def getdriver(self):
@@ -219,7 +230,10 @@ class GetDriver:
         if not self.check_proxy():
             raise GetDriverException(f"代理不可用或格式错误: {self.proxy}")
         
-        option = webdriver.ChromeOptions()  # 浏览器启动选项
+        if self.is_selenium_wire and wire_webdriver:
+            option = wire_webdriver.ChromeOptions()  # 浏览器启动选项
+        else:
+            option = selenium_webdriver.ChromeOptions()  # 浏览器启动选项
         if self.headless:
             option.add_argument("--headless")  # 设置无界面模式
         option.add_argument("--window-size=1920,1080")
@@ -350,11 +364,11 @@ class GetDriver:
                             self.driver = driver
                             return driver
                     else:
-                        print(f"版本不兼容: Chrome {chrome_version}, Chromedriver {chromedriver_version}")
+                        # print(f"版本不兼容: Chrome {chrome_version}, Chromedriver {chromedriver_version}")
                         # 即使版本不兼容也尝试启动，有时可能仍然可以工作
                         driver = self._try_create_driver(chrome_path, chromedriver_path, option, temp_dir)
                         if driver:
-                            print("警告: 版本不兼容, 建议更新Chromedriver")
+                            # print("警告: 版本不兼容, 建议更新Chromedriver")
                             self.temp_dirs.append(temp_dir)
                             self.driver = driver
                             return driver

{mdbq-4.0.74 → mdbq-4.0.76}/mdbq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mdbq
-Version: 4.0.74
+Version: 4.0.76
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

mdbq-4.0.74/mdbq/__version__.py

@@ -1 +0,0 @@
-VERSION = '4.0.74'