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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
g1879 2022-01-03 21:57:57 +08:00
commit f3b702f9a9
9 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DrissionPage/base.py
View File

@ -143,7 +143,7 @@ class DrissionElement(BaseElement):
:param index: 前面第几个查询结果元素
:param filter_loc: 用于筛选元素的查询语法
:param timeout: 查找元素的超时时间
:return: 兄弟元素
:return: 兄弟元素或节点文本组成的列表
"""
nodes = self._get_brothers(index, filter_loc, 'preceding', timeout=timeout)
return nodes[-1] if nodes else None
@ -153,7 +153,7 @@ class DrissionElement(BaseElement):
:param index: 后面第几个查询结果元素
:param filter_loc: 用于筛选元素的查询语法
:param timeout: 查找元素的超时时间
:return: 兄弟元素
:return: 兄弟元素或节点文本组成的列表
"""
nodes = self._get_brothers(index, filter_loc, 'following', timeout=timeout)
return nodes[0] if nodes else None
@ -162,7 +162,7 @@ class DrissionElement(BaseElement):
"""返回后面全部兄弟元素或节点组成的列表，可用查询语法筛选 \n
:param filter_loc: 用于筛选元素的查询语法
:param timeout: 查找元素的超时时间
:return: SessionElement对象
:return: 兄弟元素或节点文本组成的列表
"""
return self._get_brothers(filter_loc=filter_loc, direction='following', timeout=timeout)
@ -170,7 +170,7 @@ class DrissionElement(BaseElement):
"""返回前面全部兄弟元素或节点组成的列表，可用查询语法筛选 \n
:param filter_loc: 用于筛选元素的查询语法
:param timeout: 查找元素的超时时间
:return: SessionElement对象
:return: 兄弟元素或节点文本组成的列表
"""
return self._get_brothers(filter_loc=filter_loc, direction='preceding', timeout=timeout)
@ -179,7 +179,7 @@ class DrissionElement(BaseElement):
:param index: 前面第几个查询结果元素
:param filter_loc: 用于筛选元素的查询语法
:param timeout: 查找元素的超时时间
:return: 兄弟元素
:return: 本元素前面的某个元素或节点
"""
nodes = self._get_brothers(index, filter_loc, 'preceding', False, timeout=timeout)
return nodes[-1] if nodes else None
@ -189,7 +189,7 @@ class DrissionElement(BaseElement):
:param index: 后面第几个查询结果元素
:param filter_loc: 用于筛选元素的查询语法
:param timeout: 查找元素的超时时间
:return: 兄弟元素
:return: 本元素后面的某个元素或节点
"""
nodes = self._get_brothers(index, filter_loc, 'following', False, timeout)
return nodes[0] if nodes else None
@ -198,7 +198,7 @@ class DrissionElement(BaseElement):
"""返回后面全部兄弟元素或节点组成的列表，可用查询语法筛选 \n
:param filter_loc: 用于筛选元素的查询语法
:param timeout: 查找元素的超时时间
:return: SessionElement对象
:return: 本元素前面的元素或节点组成的列表
"""
return self._get_brothers(filter_loc=filter_loc, direction='preceding', brother=False, timeout=timeout)
@ -206,7 +206,7 @@ class DrissionElement(BaseElement):
"""返回前面全部兄弟元素或节点组成的列表，可用查询语法筛选 \n
:param filter_loc: 用于筛选元素的查询语法
:param timeout: 查找元素的超时时间
:return: SessionElement对象
:return: 本元素后面的元素或节点组成的列表
"""
return self._get_brothers(filter_loc=filter_loc, direction='following', brother=False, timeout=timeout)
@ -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}'

5
DrissionPage/config.py
View File

@ -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

2
DrissionPage/configs.ini
View File

@ -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 = []

8
DrissionPage/driver_element.py
View File

@ -127,14 +127,14 @@ class DriverElement(DrissionElement):
"""
return self._ele(loc_or_str, timeout=timeout, single=False)
def s_ele(self, loc_or_ele=None):
def s_ele(self, loc_or_str: Union[Tuple[str, str], str] = None):
"""查找第一个符合条件的元素以SessionElement形式返回，处理复杂页面时效率很高 \n
:param loc_or_ele: 元素的定位信息，可以是loc元组，或查询字符串
:param loc_or_str: 元素的定位信息，可以是loc元组，或查询字符串
:return: SessionElement对象或属性、文本
"""
return make_session_ele(self, loc_or_ele)
return make_session_ele(self, loc_or_str)
def s_eles(self, loc_or_str: Union[Tuple[str, str], str]):
def s_eles(self, loc_or_str: Union[Tuple[str, str], str] = None):
"""查找所有符合条件的元素以SessionElement列表形式返回 \n
:param loc_or_str: 定位符
:return: SessionElement或属性、文本组成的列表

9
DrissionPage/driver_page.py
View File

@ -112,14 +112,17 @@ class DriverPage(BasePage):
"""
return self._ele(loc_or_str, timeout, single=False)
def s_ele(self, loc_or_ele):
def s_ele(self, loc_or_ele: Union[Tuple[str, str], str, DriverElement] = None):
"""查找第一个符合条件的元素以SessionElement形式返回，处理复杂页面时效率很高 \n
:param loc_or_ele: 元素的定位信息，可以是loc元组，或查询字符串
:return: SessionElement对象或属性、文本
"""
return make_session_ele(self, loc_or_ele)
if isinstance(loc_or_ele, DriverElement):
return make_session_ele(loc_or_ele)
else:
return make_session_ele(self, loc_or_ele)
def s_eles(self, loc_or_str: Union[Tuple[str, str], str]):
def s_eles(self, loc_or_str: Union[Tuple[str, str], str] = None):
"""查找所有符合条件的元素以SessionElement列表形式返回 \n
:param loc_or_str: 元素的定位信息，可以是loc元组，或查询字符串
:return: SessionElement对象组成的列表

7
DrissionPage/easy_set.py
View File

@ -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))

6
DrissionPage/session_element.py
View File

@ -126,7 +126,7 @@ class SessionElement(DrissionElement):
"""
return self._ele(loc_or_str)
def s_eles(self, loc_or_str: Union[Tuple[str, str], str]):
def s_eles(self, loc_or_str: Union[Tuple[str, str], str] = None):
"""返回当前元素下级所有符合条件的子元素、属性或节点文本 \n
:param loc_or_str: 元素的定位信息，可以是loc元组，或查询字符串
:return: SessionElement对象或属性、文本组成的列表
@ -200,9 +200,9 @@ def make_session_ele(html_or_ele: Union[str, BaseElement, BasePage],
# ---------------处理定位符---------------
if not loc:
if isinstance(html_or_ele, SessionElement):
return html_or_ele
return html_or_ele if single else [html_or_ele]
loc = ('xpath', '.')
single = True
elif isinstance(loc, (str, tuple)):
loc = get_loc(loc)

12
DrissionPage/session_page.py
View File

@ -97,7 +97,7 @@ class SessionPage(BasePage):
return self._url_available
def ele(self, loc_or_ele: Union[Tuple[str, str], str, SessionElement], timeout=None) \
def ele(self, loc_or_ele: Union[Tuple[str, str], str, SessionElement], timeout: float = None) \
-> Union[SessionElement, List[SessionElement], str, None]:
"""返回页面中符合条件的第一个元素、属性或节点文本 \n
:param loc_or_ele: 元素的定位信息，可以是元素对象，loc元组，或查询字符串
@ -106,7 +106,7 @@ class SessionPage(BasePage):
"""
return self._ele(loc_or_ele)
def eles(self, loc_or_str: Union[Tuple[str, str], str], timeout=None) -> List[SessionElement]:
def eles(self, loc_or_str: Union[Tuple[str, str], str], timeout: float = None) -> List[SessionElement]:
"""返回页面中所有符合条件的元素、属性或节点文本 \n
:param loc_or_str: 元素的定位信息，可以是loc元组，或查询字符串
:param timeout: 不起实际作用，用于和DriverElement对应，便于无差别调用
@ -114,14 +114,14 @@ class SessionPage(BasePage):
"""
return self._ele(loc_or_str, single=False)
def s_ele(self, loc_or_str: Union[Tuple[str, str], str]):
def s_ele(self, loc_or_ele: Union[Tuple[str, str], str, SessionElement] = None):
"""返回页面中符合条件的第一个元素、属性或节点文本 \n
:param loc_or_str: 元素的定位信息，可以是元素对象，loc元组，或查询字符串
:param loc_or_ele: 元素的定位信息，可以是元素对象，loc元组，或查询字符串
:return: SessionElement对象或属性、文本
"""
return self._ele(loc_or_str)
return make_session_ele(self.html) if loc_or_ele is None else self._ele(loc_or_ele)
def s_eles(self, loc_or_str: Union[Tuple[str, str], str]):
def s_eles(self, loc_or_str: Union[Tuple[str, str], str] = None):
"""返回页面中符合条件的所有元素、属性或节点文本 \n
:param loc_or_str: 元素的定位信息，可以是元素对象，loc元组，或查询字符串
:return: SessionElement对象或属性、文本

2
setup.py
View File

@ -6,7 +6,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
setup(
name="DrissionPage",
version="2.0.3",
version="2.2.1",
author="g1879",
author_email="g1879@qq.com",
description="A module that integrates selenium and requests session, encapsulates common page operations.",