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

mdbq/__version__.py

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

mdbq/selenium/get_driver.py

@@ -81,14 +81,50 @@ class GetDriver:
         """
         try:
             if platform.system().lower() == 'windows':
-                # Windows下使用--version参数
-                result = subprocess.run([chrome_path, '--version'], 
-                                      capture_output=True, text=True, timeout=10)
-                if result.returncode == 0:
-                    # 输出格式: "Google Chrome 120.0.6099.109"
-                    version_match = re.search(r'Chrome\s+(\d+\.\d+\.\d+\.\d+)', result.stdout)
-                    if version_match:
-                        return version_match.group(1)
+                # 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: 尝试从注册表获取版本
+                try:
+                    import winreg
+                    key_path = r"SOFTWARE\Google\Chrome\BLBeacon"
+                    with winreg.OpenKey(winreg.HKEY_CURRENT_USER, key_path) as key:
+                        version = winreg.QueryValueEx(key, "version")[0]
+                        return version
+                except:
+                    pass
+                
+                # 方法3: 尝试从文件属性获取版本
+                try:
+                    result = subprocess.run(['wmic', 'datafile', 'where', f'name="{chrome_path.replace("/", "\\")}"', 'get', 'version', '/value'], 
+                                          capture_output=True, text=True, timeout=10, shell=True)
+                    if result.returncode == 0:
+                        version_match = re.search(r'Version=(\d+\.\d+\.\d+\.\d+)', result.stdout)
+                        if version_match:
+                            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'], 
@@ -109,8 +145,14 @@ class GetDriver:
         :return: 版本号字符串，如"120.0.6099.109"
         """
         try:
-            result = subprocess.run([chromedriver_path, '--version'], 
-                                  capture_output=True, text=True, timeout=10)
+            if platform.system().lower() == 'windows':
+                # Windows下使用shell=True确保参数正确传递
+                result = subprocess.run([chromedriver_path, '--version'], 
+                                      capture_output=True, text=True, timeout=10, shell=True)
+            else:
+                result = subprocess.run([chromedriver_path, '--version'], 
+                                      capture_output=True, text=True, timeout=10)
+            
             if result.returncode == 0:
                 # 输出格式: "ChromeDriver 120.0.6099.109"
                 version_match = re.search(r'ChromeDriver\s+(\d+\.\d+\.\d+\.\d+)', result.stdout)
@@ -130,8 +172,10 @@ class GetDriver:
         chrome_version = self._get_chrome_version(chrome_path)
         chromedriver_version = self._get_chromedriver_version(chromedriver_path)
         
+        # 如果无法获取版本信息，返回True允许尝试启动
         if not chrome_version or not chromedriver_version:
-            return False, chrome_version, chromedriver_version
+            print(f"警告: 无法获取版本信息 - Chrome: {chrome_version}, Chromedriver: {chromedriver_version}")
+            return True, chrome_version, chromedriver_version
         
         # 提取主版本号进行比较
         chrome_major = chrome_version.split('.')[0]

{mdbq-4.0.72.dist-info → mdbq-4.0.73.dist-info}/METADATA

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

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

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=_hhEVsHNRe5szh4nb_dJ6z64dFjwH_wfQ3tLU7LCUX0,18
+mdbq/__version__.py,sha256=v9CxLcSDpoYTepVqra_1iaKkOd7scJSGR8ITdcM5Nr4,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=bZoE3Z2pf75r5ngDS_B9xshLiOwO--X-N5RKsQjKEQ8,19181
+mdbq/selenium/get_driver.py,sha256=ppV_CJvvRu2__VIYQS-nfhW0lOlesuR11bG_d2MfmNs,21523
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.0.72.dist-info/METADATA,sha256=76uckGGCRbJe7W5oV3_FTdkTR28VT_RKmrDpHLWLKhQ,364
-mdbq-4.0.72.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-4.0.72.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.72.dist-info/RECORD,,
+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,,