diff --git a/DrissionPage/_pages/chromium_page.py b/DrissionPage/_pages/chromium_page.py index aae5dbe..48bcbf9 100644 --- a/DrissionPage/_pages/chromium_page.py +++ b/DrissionPage/_pages/chromium_page.py @@ -107,6 +107,11 @@ class ChromiumPage(ChromiumBase): """返回所控制的浏览器版本号""" return self._browser.version + @property + def address(self): + """返回浏览器地址ip:port""" + return self.browser.address + def save(self, path=None, name=None, as_pdf=False, **kwargs): """把当前页面保存为文件，如果path和name参数都为None，只返回文本 :param path: 保存路径，为None且name不为None时保存在当前路径 diff --git a/DrissionPage/_pages/chromium_page.pyi b/DrissionPage/_pages/chromium_page.pyi index 589a58d..8178e46 100644 --- a/DrissionPage/_pages/chromium_page.pyi +++ b/DrissionPage/_pages/chromium_page.pyi @@ -61,6 +61,9 @@ class ChromiumPage(ChromiumBase): @property def browser_version(self) -> str: ... + @property + def address(self) -> str: ... + @property def set(self) -> ChromiumPageSetter: ... diff --git a/DrissionPage/_units/clicker.py b/DrissionPage/_units/clicker.py index 73de7c3..cb889ee 100644 --- a/DrissionPage/_units/clicker.py +++ b/DrissionPage/_units/clicker.py @@ -43,7 +43,7 @@ class Clicker(object): select = self._ele.parent('t:select') if select.select.is_multi: self._ele.parent('t:select').select.cancel_by_option(self._ele) - return + return self._ele if not by_js: # 模拟点击 can_click = False @@ -101,11 +101,11 @@ class Clicker(object): lx, ly = self._ele.rect._get_page_coord(vx, vy) self._click(lx, ly, vx, vy) - return True + return self._ele if by_js is not False: self._ele._run_js('this.click();') - return True + return self._ele if Settings.raise_when_click_failed: raise CanNotClickError return False @@ -113,7 +113,7 @@ class Clicker(object): def right(self): """右键单击""" self._ele.owner.scroll.to_see(self._ele) - self._click(*self._ele.rect.click_point, *self._ele.rect.viewport_click_point, button='right') + return self._click(*self._ele.rect.click_point, *self._ele.rect.viewport_click_point, button='right') def middle(self, get_tab=True): """中键单击，默认返回新出现的tab对象 @@ -143,14 +143,14 @@ class Clicker(object): w, h = self._ele.rect.size offset_x = w // 2 offset_y = h // 2 - self._click(*offset_scroll(self._ele, offset_x, offset_y), button=button, count=count) + return self._click(*offset_scroll(self._ele, offset_x, offset_y), button=button, count=count) def multi(self, times=2): """多次点击 :param times: 默认双击 :return: None """ - self.at(count=times) + return self.at(count=times) def to_download(self, save_path=None, rename=None, suffix=None, new_tab=False, by_js=False, timeout=None): """点击触发下载 @@ -198,6 +198,34 @@ class Clicker(object): return (self._ele.tab.browser.get_mix_tab(tid) if self._ele.tab._type == 'MixTab' else self._ele.tab.browser.get_tab(tid)) + def for_url_change(self, text=None, exclude=False, by_js=False, timeout=None): + """点击并等待tab的url变成包含或不包含指定文本 + :param text: 用于识别的文本，为None等待当前url变化 + :param exclude: 是否排除，为True时当url不包含text指定文本时返回True，text为None时自动设为True + :param by_js: 是否用js点击 + :param timeout: 超时时间（秒），为None使用页面设置 + :return: 是否等待成功 + """ + if text is None: + exclude = True + text = self._ele.tab.url + self.left(by_js=by_js) + return True if self._ele.tab.wait.url_change(text=text, exclude=exclude, timeout=timeout) else False + + def for_title_change(self, text=None, exclude=False, by_js=False, timeout=None): + """点击并等待tab的title变成包含或不包含指定文本 + :param text: 用于识别的文本，为None等待当前title变化 + :param exclude: 是否排除，为True时当title不包含text指定文本时返回True，text为None时自动设为True + :param by_js: 是否用js点击 + :param timeout: 超时时间（秒），为None使用页面设置 + :return: 是否等待成功 + """ + if text is None: + exclude = True + text = self._ele.tab.title + self.left(by_js=by_js) + return True if self._ele.tab.wait.title_change(text=text, exclude=exclude, timeout=timeout) else False + def _click(self, loc_x, loc_y, view_x, view_y, button='left', count=1): """实施点击 :param loc_x: 绝对x坐标 @@ -213,3 +241,4 @@ class Clicker(object): y=view_y, button=button, clickCount=count, _ignore=AlertExistsError) self._ele.owner._run_cdp('Input.dispatchMouseEvent', type='mouseReleased', x=view_x, y=view_y, button=button, _ignore=AlertExistsError) + return self._ele diff --git a/DrissionPage/_units/clicker.pyi b/DrissionPage/_units/clicker.pyi index 557189b..1511100 100644 --- a/DrissionPage/_units/clicker.pyi +++ b/DrissionPage/_units/clicker.pyi @@ -17,11 +17,13 @@ class Clicker(object): def __init__(self, ele: ChromiumElement): self._ele: ChromiumElement = ... - def __call__(self, by_js: Union[bool, str, None] = False, timeout: float = 1.5, wait_stop: bool = True) -> bool: ... + def __call__(self, by_js: Union[bool, str, None] = False, + timeout: float = 1.5, wait_stop: bool = True) -> Union[ChromiumElement, False]: ... - def left(self, by_js: Union[bool, str, None] = False, timeout: float = 1.5, wait_stop: bool = True) -> bool: ... + def left(self, by_js: Union[bool, str, None] = False, + timeout: float = 1.5, wait_stop: bool = True) -> Union[ChromiumElement, False]: ... - def right(self) -> None: ... + def right(self) -> ChromiumElement: ... def middle(self, get_tab: bool = True) -> Union[ChromiumTab, MixTab, None]: ... @@ -29,9 +31,9 @@ class Clicker(object): offset_x: float = None, offset_y: float = None, button: str = 'left', - count: int = 1) -> None: ... + count: int = 1) -> ChromiumElement: ... - def multi(self, times: int = 2) -> None: ... + def multi(self, times: int = 2) -> ChromiumElement: ... def to_download(self, save_path: Union[str, Path] = None, @@ -45,9 +47,15 @@ class Clicker(object): def for_new_tab(self, by_js: bool = False, timeout: float = 3) -> Union[ChromiumTab, MixTab]: ... + def for_url_change(self, text: str = None, exclude: bool = False, + by_js: bool = False, timeout: float = None) -> bool: ... + + def for_title_change(self, text: str = None, exclude: bool = False, + by_js: bool = False, timeout: float = None) -> bool: ... + def _click(self, loc_x: float, loc_y: float, view_x: float, view_y: float, button: str = 'left', - count: int = 1) -> None: ... + count: int = 1) -> ChromiumElement: ... diff --git a/DrissionPage/_units/waiter.py b/DrissionPage/_units/waiter.py index e702946..e8afbd1 100644 --- a/DrissionPage/_units/waiter.py +++ b/DrissionPage/_units/waiter.py @@ -262,19 +262,19 @@ class BaseWaiter(OriginWaiter): :param exclude: 是否排除，为True时当url不包含text指定文本时返回True :param timeout: 超时时间（秒） :param raise_err: 等待失败时是否报错，为None时根据Settings设置 - :return: 是否等待成功 + :return: 等待成功返回页面对象，否则返回False """ - return self._change('url', text, exclude, timeout, raise_err) + return self._owner if self._change('url', text, exclude, timeout, raise_err) else False def title_change(self, text, exclude=False, timeout=None, raise_err=None): """等待title变成包含或不包含指定文本 :param text: 用于识别的文本 :param exclude: 是否排除，为True时当title不包含text指定文本时返回True - :param timeout: 超时时间（秒） + :param timeout: 超时时间（秒），为None使用页面设置 :param raise_err: 等待失败时是否报错，为None时根据Settings设置 - :return: 是否等待成功 + :return: 等待成功返回页面对象，否则返回False """ - return self._change('title', text, exclude, timeout, raise_err) + return self._owner if self._change('title', text, exclude, timeout, raise_err) else False def _change(self, arg, text, exclude=False, timeout=None, raise_err=None): """等待指定属性变成包含或不包含指定文本 @@ -403,7 +403,7 @@ class ElementWaiter(OriginWaiter): """等待元素从dom删除 :param timeout: 超时时间（秒），为None使用元素所在页面timeout属性 :param raise_err: 等待失败时是否报错，为None时根据Settings设置 - :return: 是否等待成功 + :return: 成功返回元素对象，失败返回False """ return self._wait_state('is_alive', False, timeout, raise_err, err_text='等待元素被删除失败。') @@ -411,7 +411,7 @@ class ElementWaiter(OriginWaiter): """等待元素从dom显示 :param timeout: 超时时间（秒），为None使用元素所在页面timeout属性 :param raise_err: 等待失败时是否报错，为None时根据Settings设置 - :return: 是否等待成功 + :return: 成功返回元素对象，失败返回False """ return self._wait_state('is_displayed', True, timeout, raise_err, err_text='等待元素显示失败。') @@ -419,7 +419,7 @@ class ElementWaiter(OriginWaiter): """等待元素从dom隐藏 :param timeout: 超时时间（秒），为None使用元素所在页面timeout属性 :param raise_err: 等待失败时是否报错，为None时根据Settings设置 - :return: 是否等待成功 + :return: 成功返回元素对象，失败返回False """ return self._wait_state('is_displayed', False, timeout, raise_err, err_text='等待元素隐藏失败。') @@ -435,7 +435,7 @@ class ElementWaiter(OriginWaiter): """等待当前元素不被遮盖 :param timeout: 超时时间（秒），为None使用元素所在页面timeout属性 :param raise_err: 等待失败时是否报错，为None时根据Settings设置 - :return: 是否等待成功 + :return: 成功返回元素对象，失败返回False """ return self._wait_state('is_covered', False, timeout, raise_err, err_text='等待元素不被覆盖失败。') @@ -443,7 +443,7 @@ class ElementWaiter(OriginWaiter): """等待当前元素变成可用 :param timeout: 超时时间（秒），为None使用元素所在页面timeout属性 :param raise_err: 等待失败时是否报错，为None时根据Settings设置 - :return: 是否等待成功 + :return: 成功返回元素对象，失败返回False """ return self._wait_state('is_enabled', True, timeout, raise_err, err_text='等待元素变成可用失败。') @@ -451,7 +451,7 @@ class ElementWaiter(OriginWaiter): """等待当前元素变成不可用 :param timeout: 超时时间（秒），为None使用元素所在页面timeout属性 :param raise_err: 等待失败时是否报错，为None时根据Settings设置 - :return: 是否等待成功 + :return: 成功返回元素对象，失败返回False """ return self._wait_state('is_enabled', False, timeout, raise_err, err_text='等待元素变成不可用失败。') @@ -459,14 +459,14 @@ class ElementWaiter(OriginWaiter): """等待当前元素变成不可用或从DOM移除 :param timeout: 超时时间（秒），为None使用元素所在页面timeout属性 :param raise_err: 等待失败时是否报错，为None时根据Settings设置 - :return: 是否等待成功 + :return: 成功返回元素对象，失败返回False """ if timeout is None: timeout = self._timeout end_time = perf_counter() + timeout while perf_counter() < end_time: if not self._ele.states.is_enabled or not self._ele.states.is_alive: - return True + return self._ele sleep(.05) if raise_err is True or Settings.raise_when_wait_failed is True: @@ -479,7 +479,7 @@ class ElementWaiter(OriginWaiter): :param timeout: 超时时间（秒），为None使用元素所在页面timeout属性 :param gap: 检测间隔时间 :param raise_err: 等待失败时是否报错，为None时根据Settings设置 - :return: 是否等待成功 + :return: 成功返回元素对象，失败返回False """ if timeout is None: timeout = self._timeout @@ -498,7 +498,7 @@ class ElementWaiter(OriginWaiter): while perf_counter() < end_time: sleep(gap) if self._ele.rect.size == size and self._ele.rect.location == location: - return True + return self._ele size = self._ele.rect.size location = self._ele.rect.location @@ -512,7 +512,7 @@ class ElementWaiter(OriginWaiter): :param wait_moved: 是否等待元素运动结束 :param timeout: 超时时间（秒），为None使用元素所在页面timeout属性 :param raise_err: 等待失败时是否报错，为None时根据Settings设置 - :return: 是否等待成功 + :return: 成功返回元素对象，失败返回False """ t1 = perf_counter() r = self._wait_state('is_clickable', True, timeout, raise_err, err_text='等待元素可点击失败（等{}秒）。') @@ -536,11 +536,11 @@ class ElementWaiter(OriginWaiter): :param timeout: 超时时间（秒），为None使用元素所在页面timeout属性 :param raise_err: 等待失败时是否报错，为None时根据Settings设置 :param err_text: 抛出错误时显示的信息 - :return: 是否等待成功 + :return: 成功返回元素对象，失败返回False """ a = self._ele.states.__getattribute__(attr) if (a and mode) or (not a and not mode): - return True if isinstance(a, bool) else a + return self._ele if isinstance(a, bool) else a if timeout is None: timeout = self._timeout @@ -548,7 +548,7 @@ class ElementWaiter(OriginWaiter): while perf_counter() < end_time: a = self._ele.states.__getattribute__(attr) if (a and mode) or (not a and not mode): - return True if isinstance(a, bool) else a + return self._ele if isinstance(a, bool) else a sleep(.05) err_text = err_text or '等待元素状态改变失败（等待{}秒）。' diff --git a/DrissionPage/_units/waiter.pyi b/DrissionPage/_units/waiter.pyi index 69e33de..9e3a70f 100644 --- a/DrissionPage/_units/waiter.pyi +++ b/DrissionPage/_units/waiter.pyi @@ -5,7 +5,7 @@ @Copyright: (c) 2024 by g1879, Inc. All Rights Reserved. @License : BSD 3-Clause. """ -from typing import Union, Tuple, Literal, List +from typing import Union, Tuple, List from .downloader import DownloadMission from .._base.browser import Chromium @@ -92,6 +92,12 @@ class TabWaiter(BaseWaiter): def alert_closed(self) -> None: ... + def url_change(self, text: str, exclude: bool = False, + timeout: float = None, raise_err: bool = None) -> Union[False, ChromiumTab, MixTab]: ... + + def title_change(self, text: str, exclude: bool = False, + timeout: float = None, raise_err: bool = None) -> Union[False, ChromiumTab, MixTab]: ... + class PageWaiter(TabWaiter): _owner: Union[ChromiumPage, MixPage] = ... @@ -104,6 +110,12 @@ class PageWaiter(TabWaiter): def all_downloads_done(self, timeout: float = None, cancel_if_timeout: bool = True) -> bool: ... + def url_change(self, text: str, exclude: bool = False, + timeout: float = None, raise_err: bool = None) -> Union[False, ChromiumPage, MixPage]: ... + + def title_change(self, text: str, exclude: bool = False, + timeout: float = None, raise_err: bool = None) -> Union[False, ChromiumPage, MixPage]: ... + class ElementWaiter(OriginWaiter): _owner: ChromiumElement = ... @@ -116,36 +128,37 @@ class ElementWaiter(OriginWaiter): @property def _timeout(self) -> float: ... - def deleted(self, timeout: float = None, raise_err: bool = None) -> bool: ... + def deleted(self, timeout: float = None, raise_err: bool = None) -> Union[ChromiumElement, False]: ... - def displayed(self, timeout: float = None, raise_err: bool = None) -> bool: ... + def displayed(self, timeout: float = None, raise_err: bool = None) -> Union[ChromiumElement, False]: ... - def hidden(self, timeout: float = None, raise_err: bool = None) -> bool: ... + def hidden(self, timeout: float = None, raise_err: bool = None) -> Union[ChromiumElement, False]: ... - def covered(self, timeout: float = None, raise_err: bool = None) -> Union[Literal[False], int]: ... + def covered(self, timeout: float = None, raise_err: bool = None) -> Union[False, int]: ... - def not_covered(self, timeout: float = None, raise_err: bool = None) -> bool: ... + def not_covered(self, timeout: float = None, raise_err: bool = None) -> Union[ChromiumElement, False]: ... - def enabled(self, timeout: float = None, raise_err: bool = None) -> bool: ... + def enabled(self, timeout: float = None, raise_err: bool = None) -> Union[ChromiumElement, False]: ... - def disabled(self, timeout: float = None, raise_err: bool = None) -> bool: ... + def disabled(self, timeout: float = None, raise_err: bool = None) -> Union[ChromiumElement, False]: ... - def clickable(self, wait_moved: bool = True, timeout: float = None, raise_err: bool = None) -> bool: ... + def clickable(self, wait_moved: bool = True, + timeout: float = None, raise_err: bool = None) -> Union[ChromiumElement, False]: ... def has_rect(self, timeout: float = None, - raise_err: bool = None) -> Union[Literal[False], List[Tuple[float, float]]]: ... + raise_err: bool = None) -> Union[False, List[Tuple[float, float]]]: ... def disabled_or_deleted(self, timeout: float = None, raise_err: bool = None) -> bool: ... - def stop_moving(self, timeout: float = None, gap: float = .1, raise_err: bool = None) -> bool: ... + def stop_moving(self, timeout: float = None, gap: float = .1, raise_err: bool = None) -> Union[ChromiumElement, False]: ... def _wait_state(self, attr: str, mode: bool = False, timeout: float = None, raise_err: bool = None, - err_text: str = None) -> bool: ... + err_text: str = None) -> Union[ChromiumElement, False]: ... class FrameWaiter(BaseWaiter, ElementWaiter): @@ -154,3 +167,9 @@ class FrameWaiter(BaseWaiter, ElementWaiter): def __init__(self, owner: ChromiumFrame): ... def __call__(self, second: float, scope: float = None) -> ChromiumFrame: ... + + def url_change(self, text: str, exclude: bool = False, + timeout: float = None, raise_err: bool = None) -> Union[False, ChromiumFrame]: ... + + def title_change(self, text: str, exclude: bool = False, + timeout: float = None, raise_err: bool = None) -> Union[False, ChromiumFrame]: ...