支持自动安装 selenium驱动

Boris-code · Boris-code · commit 40745d5bef01 · 2022-03-03T20:10:31.000+08:00
diff --git a/feapder/requirements.txt b/feapder/requirements.txt
@@ -16,3 +16,4 @@ urllib3>=1.25.8
 loguru>=0.5.3
 influxdb>=5.3.1
 pyperclip>=1.8.2
+webdriver-manager>=3.5.3
diff --git a/feapder/setting.py b/feapder/setting.py
@@ -77,6 +77,7 @@
     render_time=0,  # 渲染时长，即打开网页等待指定时间后再获取源码
     custom_argument=["--ignore-certificate-errors"],  # 自定义浏览器渲染参数
     xhr_url_regexes=None,  # 拦截xhr接口，支持正则，数组类型
+    auto_install_driver=False,  # 自动下载浏览器驱动 支持chrome 和 firefox
 )
 
 # 爬虫启动时，重新抓取失败的requests
diff --git a/feapder/templates/project_template/setting.py b/feapder/templates/project_template/setting.py
@@ -61,6 +61,7 @@
 #     render_time=0,  # 渲染时长，即打开网页等待指定时间后再获取源码
 #     custom_argument=["--ignore-certificate-errors"],  # 自定义浏览器渲染参数
 #     xhr_url_regexes=None,  # 拦截xhr接口，支持正则，数组类型
+#     auto_install_driver=False,  # 自动下载浏览器驱动 支持chrome 和 firefox
 # )
 #
 # # 爬虫启动时，重新抓取失败的requests
diff --git a/feapder/utils/webdriver.py b/feapder/utils/webdriver.py
@@ -17,6 +17,8 @@
 from selenium import webdriver
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
+from webdriver_manager.chrome import ChromeDriverManager
+from webdriver_manager.firefox import GeckoDriverManager
 
 from feapder.utils.log import log
 from feapder.utils.tools import Singleton
@@ -58,6 +60,7 @@ def __init__(
         custom_argument=None,
         xhr_url_regexes: list = None,
         download_path=None,
+        auto_install_driver=False,
         **kwargs,
     ):
         """
@@ -73,6 +76,7 @@ def __init__(
             executable_path: 浏览器路径，默认为默认路径
             xhr_url_regexes: 拦截xhr接口，支持正则，数组类型
             download_path: 文件下载保存路径；如果指定，不再出现“保留”“放弃”提示，仅对Chrome有效
+            auto_install_driver: 自动下载浏览器驱动 支持chrome 和 firefox
             **kwargs:
         """
         self._load_images = load_images
@@ -85,6 +89,7 @@ def __init__(
         self._custom_argument = custom_argument
         self._xhr_url_regexes = xhr_url_regexes
         self._download_path = download_path
+        self._auto_install_driver = auto_install_driver
 
         if self._xhr_url_regexes and driver_type != WebDriver.CHROME:
             raise Exception(
@@ -165,6 +170,13 @@ def firefox_driver(self):
                 firefox_profile=firefox_profile,
                 executable_path=self._executable_path,
             )
+        elif self._auto_install_driver:
+            driver = webdriver.Firefox(
+                capabilities=firefox_capabilities,
+                options=firefox_options,
+                firefox_profile=firefox_profile,
+                executable_path=GeckoDriverManager(print_first_line=False).install(),
+            )
         else:
             driver = webdriver.Firefox(
                 capabilities=firefox_capabilities,
@@ -230,6 +242,11 @@ def chrome_driver(self):
             driver = webdriver.Chrome(
                 options=chrome_options, executable_path=self._executable_path
             )
+        elif self._auto_install_driver:
+            driver = webdriver.Chrome(
+                options=chrome_options,
+                executable_path=ChromeDriverManager(print_first_line=False).install(),
+            )
         else:
             driver = webdriver.Chrome(options=chrome_options)
 
diff --git a/setup.py b/setup.py
@@ -51,6 +51,7 @@
     "loguru>=0.5.3",
     "influxdb>=5.3.1",
     "pyperclip>=1.8.2",
+    "webdriver-manager>=3.5.3",
 ]
 
 memory_dedup_requires = ["bitarray>=1.5.3"]

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@`
`77`	`77`	`render_time=0, # 渲染时长，即打开网页等待指定时间后再获取源码`
`78`	`78`	`custom_argument=["--ignore-certificate-errors"], # 自定义浏览器渲染参数`
`79`	`79`	`xhr_url_regexes=None, # 拦截xhr接口，支持正则，数组类型`
	`80`	`+ auto_install_driver=False, # 自动下载浏览器驱动支持chrome 和 firefox`
`80`	`81`	`)`
`81`	`82`
`82`	`83`	`# 爬虫启动时，重新抓取失败的requests`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@`
`61`	`61`	`# render_time=0, # 渲染时长，即打开网页等待指定时间后再获取源码`
`62`	`62`	`# custom_argument=["--ignore-certificate-errors"], # 自定义浏览器渲染参数`
`63`	`63`	`# xhr_url_regexes=None, # 拦截xhr接口，支持正则，数组类型`
	`64`	`+# auto_install_driver=False, # 自动下载浏览器驱动支持chrome 和 firefox`
`64`	`65`	`# )`
`65`	`66`	`#`
`66`	`67`	`# # 爬虫启动时，重新抓取失败的requests`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@`
`51`	`51`	`"loguru>=0.5.3",`
`52`	`52`	`"influxdb>=5.3.1",`
`53`	`53`	`"pyperclip>=1.8.2",`
	`54`	`+ "webdriver-manager>=3.5.3",`
`54`	`55`	`]`
`55`	`56`
`56`	`57`	`memory_dedup_requires = ["bitarray>=1.5.3"]`