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

ChromiumPage增加close()，删除close_other_tabs()；微调quit()

Browse Source
This commit is contained in:
g1879 2024-01-04 00:28:46 +08:00
parent 1be8f00c21
commit f13681e0df
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DrissionPage/_base/browser.py
View File

@ -169,9 +169,7 @@ class Browser(object):
"""
try:
self.run_cdp('Browser.close')
self.driver.stop()
except PageDisconnectedError:
self.driver.stop()
return
if force:

19
DrissionPage/_pages/chromium_page.py
View File

@ -214,6 +214,10 @@ class ChromiumPage(ChromiumBase):
return self.browser.run_cdp('Target.createTarget', **kwargs)['targetId']
def close(self):
"""关闭Page管理的标签页"""
self.browser.close_tab(self.tab_id)
def close_tabs(self, tabs_or_ids=None, others=False):
"""关闭传入的标签页，默认关闭当前页。可传入多个
:param tabs_or_ids: 要关闭的标签页对象或id，可传入列表或元组，为None时关闭当前页
@ -247,13 +251,6 @@ class ChromiumPage(ChromiumBase):
while self.tabs_count != end_len and perf_counter() < end_time:
sleep(.1)
def close_other_tabs(self, tabs_or_ids=None):
"""关闭传入的标签页以外标签页，默认保留当前页。可传入多个
:param tabs_or_ids: 要保留的标签页对象或id，可传入列表或元组，为None时保存当前页
:return: None
"""
self.close_tabs(tabs_or_ids, True)
def quit(self, timeout=5, force=True):
"""关闭浏览器
:param timeout: 等待浏览器关闭超时时间（秒）
@ -265,6 +262,14 @@ class ChromiumPage(ChromiumBase):
def __repr__(self):
return f'<ChromiumPage browser_id={self.browser.id} tab_id={self.tab_id}>'
# ----------即将废弃-----------
def close_other_tabs(self, tabs_or_ids=None):
"""关闭传入的标签页以外标签页，默认保留当前页。可传入多个
:param tabs_or_ids: 要保留的标签页对象或id，可传入列表或元组，为None时保存当前页
:return: None
"""
self.close_tabs(tabs_or_ids, True)
def get_rename(original, rename):
if '.' in rename:

5
DrissionPage/_pages/chromium_page.pyi
View File

@ -67,12 +67,11 @@ class ChromiumPage(ChromiumBase):
def _new_tab(self, new_window: bool = False, background: bool = False, new_context: bool = False) -> str: ...
def close(self) -> None: ...
def close_tabs(self, tabs_or_ids: Union[str, ChromiumTab, List[Union[str, ChromiumTab]],
Tuple[Union[str, ChromiumTab]]] = None, others: bool = False) -> None: ...
def close_other_tabs(self, tabs_or_ids: Union[
str, ChromiumTab, List[Union[str, ChromiumTab]], Tuple[Union[str, ChromiumTab]]] = None) -> None: ...
def quit(self, timeout: float = 5, force: bool = True) -> None: ...