mdbq 4.0.73__py3-none-any.whl → 4.0.74__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.73'
+VERSION = '4.0.74'

mdbq/selenium/get_driver.py

@@ -10,7 +10,6 @@ import tempfile
 import shutil
 import uuid
 import subprocess
-import json
 
 dir_path = os.path.expanduser("~")
 
@@ -81,19 +80,7 @@ class GetDriver:
         """
         try:
             if platform.system().lower() == 'windows':
-                # Windows下尝试多种方式获取版本
-                # 方法1: 尝试--version参数
-                try:
-                    result = subprocess.run([chrome_path, '--version'], 
-                                          capture_output=True, text=True, timeout=10, shell=True)
-                    if result.returncode == 0:
-                        version_match = re.search(r'Chrome\s+(\d+\.\d+\.\d+\.\d+)', result.stdout)
-                        if version_match:
-                            return version_match.group(1)
-                except:
-                    pass
-                
-                # 方法2: 尝试从注册表获取版本
+                # 方法1: 尝试从注册表获取版本
                 try:
                     import winreg
                     key_path = r"SOFTWARE\Google\Chrome\BLBeacon"
@@ -102,8 +89,7 @@ class GetDriver:
                         return version
                 except:
                     pass
-                
-                # 方法3: 尝试从文件属性获取版本
+                # 方法2: 尝试从文件属性获取版本
                 try:
                     result = subprocess.run(['wmic', 'datafile', 'where', f'name="{chrome_path.replace("/", "\\")}"', 'get', 'version', '/value'], 
                                           capture_output=True, text=True, timeout=10, shell=True)
@@ -113,18 +99,6 @@ class GetDriver:
                             return version_match.group(1)
                 except:
                     pass
-                
-                # 方法4: 尝试直接启动Chrome获取版本信息
-                try:
-                    result = subprocess.run([chrome_path, '--headless', '--disable-gpu', '--dump-dom', 'about:version'], 
-                                          capture_output=True, text=True, timeout=15, shell=True)
-                    if result.returncode == 0:
-                        version_match = re.search(r'Chrome/(\d+\.\d+\.\d+\.\d+)', result.stdout)
-                        if version_match:
-                            return version_match.group(1)
-                except:
-                    pass
-                    
             else:
                 # macOS和Linux下使用--version参数
                 result = subprocess.run([chrome_path, '--version'], 
@@ -171,6 +145,7 @@ 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}")
         
         # 如果无法获取版本信息，返回True允许尝试启动
         if not chrome_version or not chromedriver_version:
@@ -379,7 +354,7 @@ class GetDriver:
                         # 即使版本不兼容也尝试启动，有时可能仍然可以工作
                         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.73.dist-info → mdbq-4.0.74.dist-info}/METADATA

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

{mdbq-4.0.73.dist-info → mdbq-4.0.74.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=v9CxLcSDpoYTepVqra_1iaKkOd7scJSGR8ITdcM5Nr4,18
+mdbq/__version__.py,sha256=sLMir067HXuscYQD-lsKrpsQvHVsk5wFHYhvamChAqM,18
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=kPe3wsQNaB1slfX-Z7VMqzZoMoqPfc7ylYXZDBeFzzI,24945
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -22,9 +22,9 @@ mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
 mdbq/selenium/__init__.py,sha256=AKzeEceqZyvqn2dEDoJSzDQnbuENkJSHAlbHAD0u0ZI,10
-mdbq/selenium/get_driver.py,sha256=ppV_CJvvRu2__VIYQS-nfhW0lOlesuR11bG_d2MfmNs,21523
+mdbq/selenium/get_driver.py,sha256=bQ-8ksBKR83UlTb21TyOFw1LbfqCDwlF8cVLHFObqDo,20316
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.0.73.dist-info/METADATA,sha256=i2uf1d6ZPcI60XOSOGXW6wgePbz_pHsumb0-LGJD8Ns,364
-mdbq-4.0.73.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-4.0.73.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.73.dist-info/RECORD,,
+mdbq-4.0.74.dist-info/METADATA,sha256=DBw9KjzF79iclwZ7lXsyVD_hJbvo92XFN73fVRKemR0,364
+mdbq-4.0.74.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.0.74.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.74.dist-info/RECORD,,