增加get_match_driver()方法；

easy_set所有方法增加可指定ini文件，待测试

DrissionPage/easy_set.py

@@ -4,17 +4,18 @@
 @Contact :   g1879@qq.com
 @File    :   driver_page.py
 """
-from re import search as RE_SEARCH
 from os import popen
 from pathlib import Path
 from pprint import pprint
+from re import search as RE_SEARCH
 from typing import Union
 
 from selenium import webdriver
 
 from DrissionPage.config import OptionsManager, DriverOptions
-from DrissionPage.session_page import SessionPage
 from DrissionPage.drission import Drission
+from DrissionPage.session_page import SessionPage
+from common import unzip
 
 
 def show_settings() -> None:
@@ -35,6 +36,7 @@ def set_paths(driver_path: str = None,
               download_path: str = None,
               user_data_path: str = None,
               cache_path: str = None,
+              ini_path: str = None,
               check_version: bool = True) -> None:
     """快捷的路径设置函数                                          \n
     :param driver_path: chromedriver.exe路径
@@ -44,10 +46,11 @@ def set_paths(driver_path: str = None,
     :param tmp_path: 临时文件夹路径
     :param user_data_path: 用户数据路径
     :param cache_path: 缓存路径
+    :param ini_path: 要修改的ini文件路径
     :param check_version: 是否检查chromedriver和chrome是否匹配
     :return: None
     """
-    om = OptionsManager()
+    om = OptionsManager(ini_path)
 
     def format_path(path: str) -> str:
         if isinstance(path, str):
@@ -73,22 +76,23 @@ def set_paths(driver_path: str = None,
     om.save()
 
     if user_data_path is not None:
-        set_argument('--user-data-dir', format_path(user_data_path))
+        set_argument('--user-data-dir', format_path(user_data_path), ini_path)
 
     if cache_path is not None:
-        set_argument('--disk-cache-dir', format_path(cache_path))
+        set_argument('--disk-cache-dir', format_path(cache_path), ini_path)
 
     if check_version:
         check_driver_version(format_path(driver_path), format_path(chrome_path))
 
 
-def set_argument(arg: str, value: Union[bool, str]) -> None:
+def set_argument(arg: str, value: Union[bool, str], ini_path: str = None) -> None:
     """设置浏览器配置argument属性                            \n
     :param arg: 属性名
     :param value: 属性值，有值的属性传入值，没有的传入bool
+    :param ini_path: 要修改的ini文件路径
     :return: None
     """
-    do = DriverOptions()
+    do = DriverOptions(ini_path=ini_path)
     do.remove_argument(arg)
 
     if value:
@@ -98,52 +102,58 @@ def set_argument(arg: str, value: Union[bool, str]) -> None:
     do.save()
 
 
-def set_headless(on_off: bool = True) -> None:
+def set_headless(on_off: bool = True, ini_path: str = None) -> None:
     """设置是否隐藏浏览器界面               \n
     :param on_off: 开或关
+    :param ini_path: 要修改的ini文件路径
     :return: None
     """
-    set_argument('--headless', on_off)
+    set_argument('--headless', on_off, ini_path)
 
 
-def set_no_imgs(on_off: bool = True) -> None:
+def set_no_imgs(on_off: bool = True, ini_path: str = None) -> None:
     """设置是否禁止加载图片                    \n
     :param on_off: 开或关
+    :param ini_path: 要修改的ini文件路径
     :return: None
     """
-    set_argument('--blink-settings=imagesEnabled=false', on_off)
+    set_argument('--blink-settings=imagesEnabled=false', on_off, ini_path)
 
 
-def set_no_js(on_off: bool = True) -> None:
+def set_no_js(on_off: bool = True, ini_path: str = None) -> None:
     """设置是否禁用js                              \n
     :param on_off: 开或关
+    :param ini_path: 要修改的ini文件路径
     :return: None
     """
-    set_argument('--disable-javascript', on_off)
+    set_argument('--disable-javascript', on_off, ini_path)
 
 
-def set_mute(on_off: bool = True) -> None:
+def set_mute(on_off: bool = True, ini_path: str = None) -> None:
     """设置是否静音                              \n
     :param on_off: 开或关
+    :param ini_path: 要修改的ini文件路径
     :return: None
     """
-    set_argument('--mute-audio', on_off)
+    set_argument('--mute-audio', on_off, ini_path)
 
 
-def set_user_agent(user_agent: str) -> None:
+def set_user_agent(user_agent: str, ini_path: str = None) -> None:
     """设置user agent                           \n
     :param user_agent: user agent文本
+    :param ini_path: 要修改的ini文件路径
     :return: None
     """
-    set_argument('user-agent', user_agent)
+    set_argument('user-agent', user_agent, ini_path)
 
 
-def set_proxy(proxy: str) -> None:
+def set_proxy(proxy: str, ini_path: str = None) -> None:
     """设置代理                                  \n
     :param proxy: 代理网址和端口
+    :param ini_path: 要修改的ini文件路径
     :return: None
     """
-    set_argument('--proxy-server', proxy)
+    set_argument('--proxy-server', proxy, ini_path)
 
 
 def check_driver_version(driver_path: str = None, chrome_path: str = None) -> bool:
@@ -166,54 +176,136 @@ def check_driver_version(driver_path: str = None, chrome_path: str = None) -> bo
         driver = webdriver.Chrome(driver_path, options=do)
         driver.quit()
         print('版本匹配，可正常使用。')
+
         return True
+
     except Exception as e:
-        info = f'''
+        print(f'出现异常：\n{e}\n，可执行easy_set.get_match_driver()自动下载匹配的版本。\n'
-                出现异常：
+              f'或自行从以下网址下载：https://chromedriver.chromium.org/downloads')
-                {e}chromedriver下载网址：https://chromedriver.chromium.org/downloads
+
-                '''
-        print(info)
         return False
 
 
-def _get_chrome_path() -> str:
+# -------------------------自动识别chrome版本号并下载对应driver------------------------
+def get_match_driver(ini_path: str = None, save_path: str = None) -> None:
+    """自动识别chrome版本并下载匹配的driver"""
+    save_path = save_path or str(Path(__file__).parent)
+
+    chrome_path = _get_chrome_path(ini_path)
+    print('chrome.exe路径', chrome_path, '\n')
+
+    ver = _get_chrome_version(chrome_path)
+    print('version', ver, '\n')
+
+    zip_path = _download_driver(ver, save_path)
+
+    if not zip_path:
+        print('没有对应版本的driver。')
+
+    try:
+        driver_path = unzip(zip_path, save_path)[0]
+    except TypeError:
+        driver_path = None
+
+    print('\n解压路径', driver_path, '\n')
+
+    if driver_path:
+        Path(zip_path).unlink()
+        set_paths(driver_path=driver_path, ini_path=ini_path, check_version=False)
+
+        if not check_driver_version(driver_path, chrome_path):
+            print('获取失败，请手动配置。')
+    else:
+        print('获取失败，请手动配置。')
+
+
+def _get_chrome_path(ini_path: str = None) -> Union[str, None]:
+    """从ini文件或系统变量中获取chrome.exe的路径"""
+    # -----------从ini文件中获取--------------
+    try:
+        path = OptionsManager(ini_path).chrome_options['binary_location']
+    except KeyError:
+        return None
+
+    if path and Path(path).is_file():
+        print('ini文件中', end='')
+        return path
+
+    # -----------从系统路径中获取--------------
     paths = popen('set path').read().lower()
     r = RE_SEARCH(r'[^;]*chrome[^;]*', paths)
 
     if r:
         path = Path(r.group(0)) if 'chrome.exe' in r.group(0) else Path(r.group(0)) / 'chrome.exe'
+
         if path.exists():
+            print('系统中', end='')
             return str(path)
 
     paths = paths.split(';')
 
     for path in paths:
         path = Path(path) / 'chrome.exe'
+
         if path.exists():
+            print('系统中', end='')
             return str(path)
 
 
 def _get_chrome_version(path: str) -> Union[str, None]:
+    """根据文件路径获取版本号          \n
+    :param path: chrome.exe文件路径
+    :return: 版本号
+    """
+    if not path:
+        return
+
     path = path.replace('\\', '\\\\')
 
     try:
-        version = popen(f'wmic datafile where "name=\'{path}\'" get version').read().lower().split('\n')[2]
+        return (popen(f'wmic datafile where "name=\'{path}\'" get version').read()
-        return version
+                .lower().split('\n')[2].replace(' ', ''))
     except:
         return None
 
 
-def _download_driver(version: str) -> bool:
+def _download_driver(version: str, save_path: str = None) -> Union[str, None]:
+    """根据传入的版本号到镜像网站查找，下载最相近的          \n
+    :param version: 本地版本号
+    :return: 保存地址
+    """
+    if not version:
+        return
+
     page = SessionPage(Drission().session)
     page.get('http://npm.taobao.org/mirrors/chromedriver')
 
-    if version in page.html:
+    remote_ver = None
-        url = f'https://cdn.npm.taobao.org/dist/chromedriver/{version}/chromedriver_win32.zip'
+    loc_main = version.split('.')[0]
-        result = page.download(url, '.', show_msg=True)
+
+    try:
+        loc_num = int(version.replace('.', ''))
+    except ValueError:
+        return None
+
+    for i in page.eles('xpath://pre/a'):
+        remote_main = i.text.split('.')[0]
+
+        try:
+            remote_num = int(i.text.replace('.', '').replace('/', ''))
+        except ValueError:
+            continue
+
+        if remote_main == loc_main and remote_num >= loc_num:
+            remote_ver = i.text
+            break
+
+    if remote_ver:
+        url = f'https://cdn.npm.taobao.org/dist/chromedriver/{remote_ver}chromedriver_win32.zip'
+        save_path = save_path or Path(__file__).parent
+        result = page.download(url, save_path, file_exists='overwrite', show_msg=True)
 
         if result[0]:
             return result[1]
-    else:
-        pass
 
-    return True
+    return None