Mirrors
/
undetected-chromedriver
mirror of https://github.com/ultrafunkamsterdam/undetected-chromedriver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add parameter driver_executable_is_patched

This commit is contained in:
Milan Hauth 2023-12-03 11:50:19 +01:00
parent 783b839315
commit 2c07c9f515
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
undetected_chromedriver/__init__.py
View File

@ -107,6 +107,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
options=None, options=None,
user_data_dir=None, user_data_dir=None,
driver_executable_path=None, driver_executable_path=None,
driver_executable_is_patched=False,
browser_executable_path=None, browser_executable_path=None,
port=0, port=0,
enable_cdp_events=False, enable_cdp_events=False,
@ -250,6 +251,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
self.debug = debug self.debug = debug
self.patcher = Patcher( self.patcher = Patcher(
executable_path=driver_executable_path, executable_path=driver_executable_path,
executable_is_patched=driver_executable_is_patched,
force=patcher_force_close, force=patcher_force_close,
version_main=version_main, version_main=version_main,
user_multi_procs=user_multi_procs, user_multi_procs=user_multi_procs,

13
undetected_chromedriver/patcher.py
View File

@ -44,6 +44,7 @@ class Patcher(object):
def __init__( def __init__(
self, self,
executable_path=None, executable_path=None,
executable_is_patched=False,
force=False, force=False,
version_main: int = 0, version_main: int = 0,
user_multi_procs=False, user_multi_procs=False,
@ -52,6 +53,8 @@ class Patcher(object):
Args: Args:
executable_path: None = automatic executable_path: None = automatic
a full file path to the chromedriver executable a full file path to the chromedriver executable
executable_is_patched: False
executable_path is an already patched chromedriver executable
force: False force: False
terminate processes which are holding lock terminate processes which are holding lock
version_main: 0 = auto version_main: 0 = auto
@ -86,10 +89,12 @@ class Patcher(object):
self.executable_path = os.path.abspath( self.executable_path = os.path.abspath(
os.path.join(".", self.executable_path) os.path.join(".", self.executable_path)
) )
self.executable_is_patched = False
if executable_path: if executable_path:
self._custom_exe_path = True self._custom_exe_path = True
self.executable_path = executable_path self.executable_path = executable_path
self.executable_is_patched = executable_is_patched
# Set the correct repository to download the Chromedriver from # Set the correct repository to download the Chromedriver from
if self.is_old_chromedriver: if self.is_old_chromedriver:
@ -118,11 +123,12 @@ class Patcher(object):
self.platform_name = "mac-x64" self.platform_name = "mac-x64"
self.exe_name %= "" self.exe_name %= ""
def auto(self, executable_path=None, force=False, version_main=None, _=None): def auto(self, executable_path=None, executable_is_patched=None, force=False, version_main=None, _=None):
""" """
Args: Args:
executable_path: executable_path:
executable_is_patched:
force: force:
version_main: version_main:
@ -144,8 +150,11 @@ class Patcher(object):
self.executable_path = executable_path self.executable_path = executable_path
self._custom_exe_path = True self._custom_exe_path = True
if executable_is_patched == None:
executable_is_patched = self.executable_is_patched
if self._custom_exe_path: if self._custom_exe_path:
ispatched = self.is_binary_patched(self.executable_path) ispatched = executable_is_patched or self.is_binary_patched(self.executable_path)
if not ispatched: if not ispatched:
return self.patch_exe() return self.patch_exe()
else: else: