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 2023-01-18 11:13:15 +08:00
parent 1fd0d0c87f
commit cf8e00bb94
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
DrissionPage/chromium_page.py
View File

@ -22,7 +22,7 @@ class ChromiumPage(ChromiumBase):
"""用于管理浏览器的类"""
def __init__(self, addr_driver_opts=None, tab_id=None, timeout=None):
"""初始化 \n
"""
:param addr_driver_opts: 浏览器地址:端口、ChromiumDriver对象或DriverOptions对象
:param tab_id: 要控制的标签页id，不指定默认为激活的
:param timeout: 超时时间
@ -30,7 +30,7 @@ class ChromiumPage(ChromiumBase):
super().__init__(addr_driver_opts, tab_id, timeout)
def _connect_browser(self, addr_driver_opts=None, tab_id=None):
"""连接浏览器，在第一次时运行 \n
"""连接浏览器，在第一次时运行 \n
:param addr_driver_opts: 浏览器地址、ChromiumDriver对象或DriverOptions对象
:param tab_id: 要控制的标签页id，不指定默认为激活的
:return: None
@ -208,22 +208,25 @@ class ChromiumPage(ChromiumBase):
:return: None
"""
if switch_to:
begin_len = len(self.tabs)
self._control_session.get(f'http://{self.address}/json/new')
begin_tabs = set(self.tabs)
len_tabs = len(begin_tabs)
self.run_cdp('Target.createTarget', url='')
tabs = self.tabs
while len(tabs) <= begin_len:
while len(tabs) == len_tabs:
tabs = self.tabs
sleep(.005)
self._to_tab(tabs[0], read_doc=False)
new_tab = set(tabs) - begin_tabs
self._to_tab(new_tab.pop(), read_doc=False)
if url:
self.get(url)
elif url:
self._control_session.get(f'http://{self.address}/json/new?{url}')
self.run_cdp('Target.createTarget', url=url)
else:
self._control_session.get(f'http://{self.address}/json/new')
self.run_cdp('Target.createTarget', url='')
def set_main_tab(self, tab_id=None):
"""设置主tab \n