From b363dfccdfa1df21cd6f24e91b3aba5e86d72bd3 Mon Sep 17 00:00:00 2001 From: g1879 Date: Thu, 30 Dec 2021 13:10:34 +0800 Subject: [PATCH] =?UTF-8?q?2.2.1=E3=80=82set=5Fpaths()=E5=A2=9E=E5=8A=A0lo?= =?UTF-8?q?cal=5Fport=E5=8F=82=E6=95=B0=EF=BC=9Bini=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0=E6=94=B9=E6=88=90?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=94=A8=E6=9C=AC=E5=9C=B09222=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=E6=89=93=E5=BC=80=E6=B5=8F=E8=A7=88=E5=99=A8=EF=BC=9B?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=AF=B9=E5=AE=9A=E4=BD=8D=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DrissionPage/base.py | 2 +- DrissionPage/config.py | 5 +++++ DrissionPage/configs.ini | 2 +- DrissionPage/easy_set.py | 7 ++++++- setup.py | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/DrissionPage/base.py b/DrissionPage/base.py index cf00017..46b76a3 100644 --- a/DrissionPage/base.py +++ b/DrissionPage/base.py @@ -239,7 +239,7 @@ class DrissionElement(BaseElement): loc = loc[1].lstrip('./') if index: - loc = f'xpath:(./{direction}{brother}::{loc})[{index}]' # TODO: 有没有括号是否有区别 + loc = f'xpath:./{direction}{brother}::{loc}[{index}]' else: loc = f'xpath:./{direction}{brother}::{loc}' diff --git a/DrissionPage/config.py b/DrissionPage/config.py index f16f30f..33d6cfc 100644 --- a/DrissionPage/config.py +++ b/DrissionPage/config.py @@ -599,6 +599,7 @@ class DriverOptions(Options): def set_paths(self, driver_path: str = None, chrome_path: str = None, + local_port: Union[int, str] = None, debugger_address: str = None, download_path: str = None, user_data_path: str = None, @@ -606,6 +607,7 @@ class DriverOptions(Options): """快捷的路径设置函数 \n :param driver_path: chromedriver.exe路径 :param chrome_path: chrome.exe路径 + :param local_port: 本地端口号 :param debugger_address: 调试浏览器地址，例：127.0.0.1:9222 :param download_path: 下载文件路径 :param user_data_path: 用户数据路径 @@ -618,6 +620,9 @@ class DriverOptions(Options): if chrome_path is not None: self.binary_location = chrome_path + if local_port is not None: + self.debugger_address = f'127.0.0.1:{local_port}' + if debugger_address is not None: self.debugger_address = debugger_address diff --git a/DrissionPage/configs.ini b/DrissionPage/configs.ini index 21eee64..f5c629d 100644 --- a/DrissionPage/configs.ini +++ b/DrissionPage/configs.ini @@ -3,7 +3,7 @@ chromedriver_path = tmp_path = [chrome_options] -debugger_address = +debugger_address = 127.0.0.1:9222 binary_location = arguments = ['--no-sandbox', '--disable-gpu', '--ignore-certificate-errors', '--disable-infobars'] extensions = [] diff --git a/DrissionPage/easy_set.py b/DrissionPage/easy_set.py index 070ab50..04cc4e1 100644 --- a/DrissionPage/easy_set.py +++ b/DrissionPage/easy_set.py @@ -31,6 +31,7 @@ def show_settings(ini_path: str = None) -> None: def set_paths(driver_path: str = None, chrome_path: str = None, + local_port: Union[int, str] = None, debugger_address: str = None, tmp_path: str = None, download_path: str = None, @@ -41,6 +42,7 @@ def set_paths(driver_path: str = None, """快捷的路径设置函数 \n :param driver_path: chromedriver.exe路径 :param chrome_path: chrome.exe路径 + :param local_port: 本地端口号 :param debugger_address: 调试浏览器地址，例：127.0.0.1:9222 :param download_path: 下载文件路径 :param tmp_path: 临时文件夹路径 @@ -53,7 +55,7 @@ def set_paths(driver_path: str = None, om = OptionsManager(ini_path) def format_path(path: str) -> str: - return '' if not path else str(path).replace('/', '\\') + return path or '' if driver_path is not None: om.set_item('paths', 'chromedriver_path', format_path(driver_path)) @@ -61,6 +63,9 @@ def set_paths(driver_path: str = None, if chrome_path is not None: om.set_item('chrome_options', 'binary_location', format_path(chrome_path)) + if local_port is not None: + om.set_item('chrome_options', 'debugger_address', format_path(f'127.0.0.1:{local_port}')) + if debugger_address is not None: om.set_item('chrome_options', 'debugger_address', format_path(debugger_address)) diff --git a/setup.py b/setup.py index 9afac7d..e84ed03 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ with open("README.md", "r", encoding='utf-8') as fh: setup( name="DrissionPage", - version="2.2.0", + version="2.2.1", author="g1879", author_email="g1879@qq.com", description="A module that integrates selenium and requests session, encapsulates common page operations.",