blackteay/DrissionPage
1
0
Fork 0
mirror of https://gitee.com/g1879/DrissionPage.git synced 2024-12-10 04:00:23 +08:00
Code Issues Projects Releases Wiki Activity

增加@|查找语法；ini文件删除--no-sandbox项

Browse Source
This commit is contained in:
g1879 2023-02-07 18:11:45 +08:00
parent 0d93f885e2
commit 43d0a742d1
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DrissionPage/configs/configs.ini
View File

@ -5,7 +5,7 @@ download_path =
[chrome_options] [chrome_options]
debugger_address = 127.0.0.1:9222 debugger_address = 127.0.0.1:9222
binary_location = chrome binary_location = chrome
arguments = ['--no-first-run', '--no-sandbox', '--disable-gpu', '--ignore-certificate-errors', '--disable-infobars', '--disable-popup-blocking'] arguments = ['--no-first-run', '--disable-gpu', '--ignore-certificate-errors', '--disable-infobars', '--disable-popup-blocking']
extensions = [] extensions = []
experimental_options = {'prefs': {'profile.default_content_settings.popups': 0, 'profile.default_content_setting_values': {'notifications': 2}, 'plugins.plugins_list': [{'enabled': False, 'name': 'Chrome PDF Viewer'}]}, 'useAutomationExtension': False, 'excludeSwitches': ['enable-automation']} experimental_options = {'prefs': {'profile.default_content_settings.popups': 0, 'profile.default_content_setting_values': {'notifications': 2}, 'plugins.plugins_list': [{'enabled': False, 'name': 'Chrome PDF Viewer'}]}, 'useAutomationExtension': False, 'excludeSwitches': ['enable-automation']}
page_load_strategy = normal page_load_strategy = normal

18
DrissionPage/functions/locator.py
View File

@ -63,6 +63,9 @@ def str_to_loc(loc):
if loc.startswith('@@') and loc != '@@': if loc.startswith('@@') and loc != '@@':
loc_str = _make_multi_xpath_str('*', loc) loc_str = _make_multi_xpath_str('*', loc)
elif loc.startswith('@|') and loc != '@|':
loc_str = _make_multi_xpath_str('*', loc, False)
# 单属性查找 # 单属性查找
elif loc.startswith('@') and loc != '@': elif loc.startswith('@') and loc != '@':
loc_str = _make_single_xpath_str('*', loc) loc_str = _make_single_xpath_str('*', loc)
@ -75,6 +78,8 @@ def str_to_loc(loc):
else: else:
if loc[at_ind:].startswith('@@'): if loc[at_ind:].startswith('@@'):
loc_str = _make_multi_xpath_str(loc[4:at_ind], loc[at_ind:]) loc_str = _make_multi_xpath_str(loc[4:at_ind], loc[at_ind:])
elif loc[at_ind:].startswith('@|'):
loc_str = _make_multi_xpath_str(loc[4:at_ind], loc[at_ind:], False)
else: else:
loc_str = _make_single_xpath_str(loc[4:at_ind], loc[at_ind:]) loc_str = _make_single_xpath_str(loc[4:at_ind], loc[at_ind:])
@ -144,14 +149,15 @@ def _make_single_xpath_str(tag: str, text: str) -> str:
return f'//*[{arg_str}]{txt_str}' if arg_str else f'//*{txt_str}' return f'//*[{arg_str}]{txt_str}' if arg_str else f'//*{txt_str}'
def _make_multi_xpath_str(tag: str, text: str) -> str: def _make_multi_xpath_str(tag: str, text: str, _and: bool = True) -> str:
"""生成多属性查找的xpath语句 """生成多属性查找的xpath语句
:param tag: 标签名 :param tag: 标签名
:param text: 待处理的字符串 :param text: 待处理的字符串
:param _and: 是否与方式
:return: xpath字符串 :return: xpath字符串
""" """
arg_list = [] if tag == '*' else [f'name()="{tag}"'] arg_list = []
args = text.split('@@') args = text.split('@@') if _and else text.split('@|')
for arg in args[1:]: for arg in args[1:]:
r = split(r'([:=])', arg, maxsplit=1) r = split(r'([:=])', arg, maxsplit=1)
@ -180,7 +186,11 @@ def _make_multi_xpath_str(tag: str, text: str) -> str:
if arg_str: if arg_str:
arg_list.append(arg_str) arg_list.append(arg_str)
arg_str = ' and '.join(arg_list) arg_str = ' and '.join(arg_list) if _and else ' or '.join(arg_list)
if tag != '*':
condition = f' and ({arg_str})' if arg_str else ''
arg_str = f'name()="{tag}"{condition}'
return f'//*[{arg_str}]' if arg_str else f'//*' return f'//*[{arg_str}]' if arg_str else f'//*'