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

4.0.0b24修复动作链问题

Browse Source
This commit is contained in:
g1879 2023-12-19 21:29:04 +08:00
parent 774c6dd963
commit b1f4c0767d
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DrissionPage/__init__.py
View File

@ -13,4 +13,4 @@ from ._configs.chromium_options import ChromiumOptions
from ._configs.session_options import SessionOptions from ._configs.session_options import SessionOptions
__all__ = ['ChromiumPage', 'ChromiumOptions', 'SessionOptions', 'SessionPage', 'WebPage', '__version__'] __all__ = ['ChromiumPage', 'ChromiumOptions', 'SessionOptions', 'SessionPage', 'WebPage', '__version__']
__version__ = '4.0.0b23' __version__ = '4.0.0b24'

7
DrissionPage/_functions/tools.py
View File

@ -211,7 +211,7 @@ def wait_until(page, condition, timeout=10, poll=0.1, raise_err=True):
value = condition_method(page) value = condition_method(page)
if value: if value:
return value return value
except Exception as exc: except Exception:
pass pass
sleep(poll) sleep(poll)
@ -284,8 +284,9 @@ def raise_error(result, ignore=None):
elif error == 'Sanitizing cookie failed': elif error == 'Sanitizing cookie failed':
r = CookieFormatError(f'cookie格式不正确：{result["args"]}') r = CookieFormatError(f'cookie格式不正确：{result["args"]}')
elif result['type'] == 'call_method_error': elif result['type'] == 'call_method_error':
r = CDPError(f'\n错误：{result["error"]}\nmethod：{result["method"]}\nargs：{result["args"]}\n出现这个错误可能意味着程序有bug，' r = CDPError(f'\n错误：{result["error"]}\nmethod：{result["method"]}\nargs：{result["args"]}\n'
'请把错误信息和重现方法告知作者，谢谢。\n报告网站：https://gitee.com/g1879/DrissionPage/issues') f'出现这个错误可能意味着程序有bug，请把错误信息和重现方法告知作者，谢谢。'
f'\n报告网站：https://gitee.com/g1879/DrissionPage/issues')
else: else:
r = RuntimeError(result) r = RuntimeError(result)

8
DrissionPage/_units/actions.py
View File

@ -85,7 +85,7 @@ class Actions:
self.curr_x = x self.curr_x = x
self.curr_y = y self.curr_y = y
self._dr.run('Input.dispatchMouseEvent', type='mouseMoved', x=self.curr_x, y=self.curr_y, self._dr.run('Input.dispatchMouseEvent', type='mouseMoved', x=self.curr_x, y=self.curr_y,
modifiers=self.modifier, _ignore=AlertExistsError, _timeout=1) modifiers=self.modifier, _timeout=1)
ss = .02 - perf_counter() + t ss = .02 - perf_counter() + t
if ss > 0: if ss > 0:
sleep(ss) sleep(ss)
@ -188,7 +188,7 @@ class Actions:
if on_ele: if on_ele:
self.move_to(on_ele, duration=0) self.move_to(on_ele, duration=0)
self._dr.run('Input.dispatchMouseEvent', type='mousePressed', button=button, clickCount=count, self._dr.run('Input.dispatchMouseEvent', type='mousePressed', button=button, clickCount=count,
x=self.curr_x, y=self.curr_y, modifiers=self.modifier, _ignore=AlertExistsError, _timeout=1) x=self.curr_x, y=self.curr_y, modifiers=self.modifier, _timeout=1)
return self return self
def _release(self, button): def _release(self, button):
@ -197,7 +197,7 @@ class Actions:
:return: self :return: self
""" """
self._dr.run('Input.dispatchMouseEvent', type='mouseReleased', button=button, clickCount=1, self._dr.run('Input.dispatchMouseEvent', type='mouseReleased', button=button, clickCount=1,
x=self.curr_x, y=self.curr_y, modifiers=self.modifier, _ignore=AlertExistsError, _timeout=1) x=self.curr_x, y=self.curr_y, modifiers=self.modifier, _timeout=1)
return self return self
def scroll(self, delta_x=0, delta_y=0, on_ele=None): def scroll(self, delta_x=0, delta_y=0, on_ele=None):
@ -210,7 +210,7 @@ class Actions:
if on_ele: if on_ele:
self.move_to(on_ele, duration=0) self.move_to(on_ele, duration=0)
self._dr.run('Input.dispatchMouseEvent', type='mouseWheel', x=self.curr_x, y=self.curr_y, self._dr.run('Input.dispatchMouseEvent', type='mouseWheel', x=self.curr_x, y=self.curr_y,
deltaX=delta_x, deltaY=delta_y, modifiers=self.modifier, _ignore=AlertExistsError, _timeout=1) deltaX=delta_x, deltaY=delta_y, modifiers=self.modifier, _timeout=1)
return self return self
def up(self, pixel): def up(self, pixel):

2
setup.py
View File

@ -6,7 +6,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
setup( setup(
name="DrissionPage", name="DrissionPage",
version="4.0.0b23", version="4.0.0b24",
author="g1879", author="g1879",
author_email="g1879@qq.com", author_email="g1879@qq.com",
description="Python based web automation tool. It can control the browser and send and receive data packets.", description="Python based web automation tool. It can control the browser and send and receive data packets.",