github/FlareSolverr
1
1
Fork 0
mirror of https://github.com/FlareSolverr/FlareSolverr.git synced 2025-06-08 20:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reuse patched chromedriver

Browse Source
This commit is contained in:
ngosang 2022-09-24 19:39:57 +02:00
parent ecaac2e1d9
commit 676a930f02
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/utils.py
View File

@ -2,6 +2,7 @@ import json
import logging import logging
import os import os
import re import re
import shutil
from selenium.webdriver.chrome.webdriver import WebDriver from selenium.webdriver.chrome.webdriver import WebDriver
import undetected_chromedriver as uc import undetected_chromedriver as uc
@ -10,6 +11,7 @@ FLARESOLVERR_VERSION = None
CHROME_MAJOR_VERSION = None CHROME_MAJOR_VERSION = None
USER_AGENT = None USER_AGENT = None
XVFB_DISPLAY = None XVFB_DISPLAY = None
PATCHED_DRIVER_PATH = None
def get_config_log_html() -> bool: def get_config_log_html() -> bool:
@ -32,6 +34,7 @@ def get_flaresolverr_version() -> str:
def get_webdriver() -> WebDriver: def get_webdriver() -> WebDriver:
global PATCHED_DRIVER_PATH
logging.debug('Launching web browser...') logging.debug('Launching web browser...')
# undetected_chromedriver # undetected_chromedriver
@ -55,15 +58,23 @@ def get_webdriver() -> WebDriver:
driver_exe_path = None driver_exe_path = None
version_main = None version_main = None
if os.path.exists("/app/chromedriver"): if os.path.exists("/app/chromedriver"):
# running inside Docker
driver_exe_path = "/app/chromedriver" driver_exe_path = "/app/chromedriver"
else: else:
version_main = get_chrome_major_version() version_main = get_chrome_major_version()
if PATCHED_DRIVER_PATH is not None:
driver_exe_path = PATCHED_DRIVER_PATH
# downloads and patches the chromedriver # downloads and patches the chromedriver
# todo: if we don't set driver_executable_path it downloads, patches, and deletes the driver each time # if we don't set driver_executable_path it downloads, patches, and deletes the driver each time
driver = uc.Chrome(options=options, driver_executable_path=driver_exe_path, version_main=version_main, driver = uc.Chrome(options=options, driver_executable_path=driver_exe_path, version_main=version_main,
windows_headless=windows_headless) windows_headless=windows_headless)
# save the patched driver to avoid re-downloads
if driver_exe_path is None:
PATCHED_DRIVER_PATH = os.path.join(driver.patcher.data_path, driver.patcher.exe_name)
shutil.copy(driver.patcher.executable_path, PATCHED_DRIVER_PATH)
# selenium vanilla # selenium vanilla
# options = webdriver.ChromeOptions() # options = webdriver.ChromeOptions()
# options.add_argument('--no-sandbox') # options.add_argument('--no-sandbox')