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

增加get_frames()；get_frame()添加timeout属性，且可接收id或name

Browse Source
This commit is contained in:
g1879 2023-03-23 23:29:41 +08:00
parent 058b9b3c55
commit eea09117fc
3 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
DrissionPage/chromium_base.py
View File

@ -609,25 +609,50 @@ class ChromiumBase(BasePage):
if ele:
self.run_cdp('DOM.removeNode', nodeId=ele.ids.node_id)
def get_frame(self, loc_ind_ele):
def get_frame(self, loc_ind_ele, timeout=None):
"""获取页面中一个frame对象，可传入定位符、iframe序号、ChromiumFrame对象，序号从1开始
:param loc_ind_ele: 定位符、iframe序号、ChromiumFrame对象
:param timeout: 查找元素超时时间
:return: ChromiumFrame对象
"""
if isinstance(loc_ind_ele, (str, tuple)):
ele = self._ele(loc_ind_ele)
if isinstance(loc_ind_ele, str):
if not loc_ind_ele.startswith(('.', '#', '@', 't:', 't=', 'tag:', 'tag=', 'tx:', 'tx=', 'tx^', 'tx$',
'text:', 'text=', 'text^', 'text$', 'xpath:', 'xpath=', 'x:', 'x=', 'css:',
'css=', 'c:', 'c=')):
loc_ind_ele = f'xpath://*[(name()="iframe" or name()="frame") and ' \
f'(@name="{loc_ind_ele}" or @id="{loc_ind_ele}")]'
ele = self._ele(loc_ind_ele, timeout=timeout)
if ele and not str(type(ele)).endswith(".ChromiumFrame'>"):
raise RuntimeError('该定位符不是指向frame元素。')
raise TypeError('该定位符不是指向frame元素。')
return ele
elif isinstance(loc_ind_ele, tuple):
ele = self._ele(loc_ind_ele, timeout=timeout)
if ele and not str(type(ele)).endswith(".ChromiumFrame'>"):
raise TypeError('该定位符不是指向frame元素。')
return ele
elif isinstance(loc_ind_ele, int):
if loc_ind_ele < 1:
raise ValueError('序号必须大于0。')
xpath = f'x:(//*[name()="frame" or name()="iframe"])[{loc_ind_ele}]'
return self._ele(xpath)
xpath = f'xpath:(//*[name()="frame" or name()="iframe"])[{loc_ind_ele}]'
return self._ele(xpath, timeout=timeout)
elif str(type(loc_ind_ele)).endswith(".ChromiumFrame'>"):
return loc_ind_ele
else:
raise TypeError('必须传入定位符、iframe序号、ChromiumFrame对象其中之一。')
raise TypeError('必须传入定位符、iframe序号、id、name、ChromiumFrame对象其中之一。')
def get_frames(self, loc=None, timeout=None):
"""获取所有符号条件的frame对象
:param loc: 定位符，为None时返回所有
:param timeout: 查找超时时间
:return: ChromiumFrame对象组成的列表
"""
loc = loc or 'xpath://*[name()="iframe" or name()="frame"]'
frames = self._ele(loc, timeout=timeout, single=False, raise_err=False)
return [i for i in frames if str(type(i)).endswith(".ChromiumFrame'>")]
def get_session_storage(self, item=None):
"""获取sessionStorage信息，不设置item则获取全部

4
DrissionPage/chromium_base.pyi
View File

@ -174,7 +174,9 @@ class ChromiumBase(BasePage):
def remove_ele(self, loc_or_ele: Union[ChromiumElement, ChromiumFrame, str, Tuple[str, str]]) -> None: ...
def get_frame(self, loc_ind_ele: Union[str, int, ChromiumFrame]) -> ChromiumFrame: ...
def get_frame(self, loc_ind_ele: Union[str, int, tuple, ChromiumFrame], timeout: float = None) -> ChromiumFrame: ...
def get_frames(self, loc: Union[str, tuple] = None, timeout: float = None) -> List[ChromiumFrame]: ...
def run_cdp(self, cmd: str, **cmd_args) -> dict: ...

2
DrissionPage/commons/locator.py
View File

@ -108,7 +108,7 @@ def str_to_loc(loc):
elif loc.startswith(('css:', 'css=')) and loc not in ('css:', 'css='):
loc_by = 'css selector'
loc_str = loc[4:]
elif loc.startswith(('c:', 'cx=')) and loc not in ('c:', 'cx='):
elif loc.startswith(('c:', 'c=')) and loc not in ('c:', 'cx='):
loc_by = 'css selector'
loc_str = loc[2:]