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

增加多属性查找元素的语法

Browse Source
This commit is contained in:
g1879 2021-12-08 18:00:23 +08:00
parent ec9db8bbf5
commit 9c9c060149
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
DrissionPage/common.py
View File

@ -119,7 +119,7 @@ def str_to_loc(loc: str) -> tuple:
if at_ind == -1: if at_ind == -1:
loc_str = f'//*[name()="{loc[4:]}"]' loc_str = f'//*[name()="{loc[4:]}"]'
else: else:
if loc[4:].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:])
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:])
@ -159,20 +159,28 @@ def _make_single_xpath_str(tag: str, text: str) -> str:
:param text: 待处理的字符串 :param text: 待处理的字符串
:return: xpath字符串 :return: xpath字符串
""" """
tag_name = '' if tag == '*' else f'name()="{tag}" and ' arg_list = [] if tag == '*' else [f'name()="{tag}"']
arg_str = txt_str = ''
r = split(r'([:=])', text, maxsplit=1) r = split(r'([:=])', text, maxsplit=1)
if len(r) != 3:
return f'//*[{tag_name}{r[0]}]' if len(r) != 3 and len(r[0]) > 1:
else: arg_str = 'normalize-space(text())' if r[0] in ('@text()', '@tx()') else f'{r[0]}'
elif len(r) == 3 and len(r[0]) > 1:
if r[1] == '=': # 精确查找 if r[1] == '=': # 精确查找
arg = '.' if r[0] in ('@text()', '@tx()') else r[0] arg = '.' if r[0] in ('@text()', '@tx()') else r[0]
return f'//*[{tag_name}{arg}={_make_search_str(r[2])}]' arg_str = f'{arg}={_make_search_str(r[2])}'
else: # 模糊查找 else: # 模糊查找
if r[0] in ('@text()', '@tx()'): if r[0] in ('@text()', '@tx()'):
tag_name = '' if tag == '*' else f'{tag}/' txt_str = f'/text()[contains(., {_make_search_str(r[2])})]/..'
return f'//{tag_name}text()[contains(., {_make_search_str(r[2])})]/..' arg_str = ''
else: else:
return f"//*[{tag_name}contains({r[0]},{_make_search_str(r[2])})]" arg_str = f"contains({r[0]},{_make_search_str(r[2])})"
if arg_str:
arg_list.append(arg_str)
arg_str = ' and '.join(arg_list)
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) -> str:
@ -181,25 +189,28 @@ def _make_multi_xpath_str(tag: str, text: str) -> str:
:param text: 待处理的字符串 :param text: 待处理的字符串
:return: xpath字符串 :return: xpath字符串
""" """
tag_name = '' if tag == '*' else f'name()="{tag}" and ' arg_list = [] if tag == '*' else [f'name()="{tag}"']
args = text.split('@@') args = text.split('@@')
arg_list = []
for arg in args[1:]: for arg in args[1:]:
r = split(r'([:=])', arg, maxsplit=1) r = split(r'([:=])', arg, maxsplit=1)
if len(r) != 3: arg_str = ''
arg_str = 'text()' if r[0] in ('text()', 'tx()') else f'@{r[0]}'
else: if len(r) != 3 and r[0]:
arg_str = 'normalize-space(text())' if r[0] in ('text()', 'tx()') else f'@{r[0]}'
elif len(r) == 3:
arg = '.' if r[0] in ('text()', 'tx()') else f'@{r[0]}' arg = '.' if r[0] in ('text()', 'tx()') else f'@{r[0]}'
if r[1] == '=': if r[1] == '=':
arg_str = f'{arg}={_make_search_str(r[2])}' arg_str = f'{arg}={_make_search_str(r[2])}'
else: else:
arg_str = f'contains({arg},{_make_search_str(r[2])})' arg_str = f'contains({arg},{_make_search_str(r[2])})'
arg_list.append(arg_str)
re_str = f'//*[{tag_name}{" and ".join(arg_list)}]' if arg_str:
arg_list.append(arg_str)
return re_str arg_str = ' and '.join(arg_list)
return f'//*[{arg_str}]' if arg_str else f'//*'
def _make_search_str(search_str: str) -> str: def _make_search_str(search_str: str) -> str: