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-06 17:12:15 +08:00
parent 5ab29a040d
commit 1fa392802d
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
DrissionPage/common.py
View File

@ -137,8 +137,6 @@ def str_to_loc(loc: str) -> tuple:
# 根据文本查找
elif loc.startswith(('text:', 'text=')):
if len(loc) > 5:
# mode = 'exact' if loc[4] == '=' else 'fuzzy'
# loc_str = _make_xpath_str('*', 'text()', loc[5:], mode)
loc_str = _make_xpath_str('*', f'@text(){loc[4:]}')
else:
loc_str = '//*[not(text())]'
@ -153,6 +151,7 @@ def str_to_loc(loc: str) -> tuple:
elif loc.startswith(('css:', 'css=')):
loc_by = 'css selector'
loc_str = loc[4:]
elif loc.startswith(('c:', 'c=')):
loc_by = 'css selector'
loc_str = loc[2:]
@ -160,7 +159,6 @@ def str_to_loc(loc: str) -> tuple:
# 根据文本模糊查找
else:
if loc:
# loc_str = _make_xpath_str('*', 'text()', loc, 'fuzzy')
loc_str = _make_xpath_str('*', f'@text():{loc}')
else:
loc_str = '//*[not(text())]'
@ -168,7 +166,7 @@ def str_to_loc(loc: str) -> tuple:
return loc_by, loc_str
def _make_xpath_str(tag: str, text: str):
def _make_xpath_str(tag: str, text: str) -> str:
tag_name = '' if tag == '*' else f'name()="{tag}" and '
r = findall(r'@([^@]*)', text)
res_list = []
@ -188,6 +186,30 @@ def _make_xpath_str(tag: str, text: str):
return f"//*[{tag_name}{s}]"
# def _make_xpath_str(tag: str, arg: str, val: str, mode: str = 'fuzzy') -> str:
# """生成xpath语句 \n
# :param tag: 标签名
# :param arg: 属性名
# :param val: 属性值
# :param mode: 'exact' 或 'fuzzy'，对应精确或模糊查找
# :return: xpath字符串
# """
# tag_name = '' if tag == '*' else f'name()="{tag}" and '
#
# if mode == 'exact':
# return f'//*[{tag_name}{arg}={_make_search_str(val)}]'
#
# elif mode == 'fuzzy':
# if arg == 'text()':
# tag_name = '' if tag == '*' else f'{tag}/'
# return f'//{tag_name}text()[contains(., {_make_search_str(val)})]/..'
# else:
# return f"//*[{tag_name}contains({arg},{_make_search_str(val)})]"
#
# else:
# raise ValueError("mode参数只能是'exact'或'fuzzy'。")
def translate_loc(loc: tuple) -> tuple:
"""把By类型的loc元组转换为css selector或xpath类型的 \n
:param loc: By类型的loc元组
@ -229,30 +251,6 @@ def translate_loc(loc: tuple) -> tuple:
return loc_by, loc_str
# def _make_xpath_str(tag: str, arg: str, val: str, mode: str = 'fuzzy') -> str:
# """生成xpath语句 \n
# :param tag: 标签名
# :param arg: 属性名
# :param val: 属性值
# :param mode: 'exact' 或 'fuzzy'，对应精确或模糊查找
# :return: xpath字符串
# """
# tag_name = '' if tag == '*' else f'name()="{tag}" and '
#
# if mode == 'exact':
# return f'//*[{tag_name}{arg}={_make_search_str(val)}]'
#
# elif mode == 'fuzzy':
# if arg == 'text()':
# tag_name = '' if tag == '*' else f'{tag}/'
# return f'//{tag_name}text()[contains(., {_make_search_str(val)})]/..'
# else:
# return f"//*[{tag_name}contains({arg},{_make_search_str(val)})]"
#
# else:
# raise ValueError("mode参数只能是'exact'或'fuzzy'。")
def _make_search_str(search_str: str) -> str:
"""将"转义，不知何故不能直接用 \ 来转义 \n
:param search_str: 查询字符串