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_src()方法增加base64_to_bytes参数；使用1.0.0版DownloadKit

Browse Source
This commit is contained in:
g1879 2023-08-09 11:50:49 +08:00
parent dea41ab0dc
commit 01a930b740
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DrissionPage/chromium_element.py
View File

@ -439,9 +439,10 @@ class ChromiumElement(DrissionElement):
js = f'return window.getComputedStyle(this{pseudo_ele}).getPropertyValue("{style}");' js = f'return window.getComputedStyle(this{pseudo_ele}).getPropertyValue("{style}");'
return self.run_js(js) return self.run_js(js)
def get_src(self, timeout=None): def get_src(self, timeout=None, base64_to_bytes=True):
"""返回元素src资源，base64的会转为bytes返回，其它返回str """返回元素src资源，base64的可转为bytes返回，其它返回str
:param timeout: 等待资源加载的超时时间 :param timeout: 等待资源加载的超时时间
:param base64_to_bytes: 为True时，如果是base64数据，转换为bytes格式
:return: 资源内容 :return: 资源内容
""" """
timeout = self.page.timeout if timeout is None else timeout timeout = self.page.timeout if timeout is None else timeout
@ -474,10 +475,13 @@ class ChromiumElement(DrissionElement):
return None return None
if result['base64Encoded']: if result['base64Encoded']:
if base64_to_bytes:
from base64 import b64decode from base64 import b64decode
data = b64decode(result['content']) data = b64decode(result['content'])
else: else:
data = result['content'] data = result['content']
else:
data = result['content']
return data return data
def save(self, path=None, rename=None, timeout=None): def save(self, path=None, rename=None, timeout=None):

2
DrissionPage/chromium_element.pyi
View File

@ -178,7 +178,7 @@ class ChromiumElement(DrissionElement):
def style(self, style: str, pseudo_ele: str = '') -> str: ... def style(self, style: str, pseudo_ele: str = '') -> str: ...
def get_src(self, timeout: float = None) -> Union[bytes, str, None]: ... def get_src(self, timeout: float = None, base64_to_bytes: bool = True) -> Union[bytes, str, None]: ...
def save(self, path: [str, bool] = None, rename: str = None, timeout: float = None) -> None: ... def save(self, path: [str, bool] = None, rename: str = None, timeout: float = None) -> None: ...

2
requirements.txt
View File

@ -1,7 +1,7 @@
requests requests
lxml lxml
cssselect cssselect
DownloadKit>=0.5.3 DownloadKit>=1.0.0
FlowViewer>=0.3.0 FlowViewer>=0.3.0
websocket-client websocket-client
click click

4
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="3.2.30", version="3.3.0",
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.",
@ -22,7 +22,7 @@ setup(
'lxml', 'lxml',
'requests', 'requests',
'cssselect', 'cssselect',
'DownloadKit>=0.5.3', 'DownloadKit>=1.0.0',
'FlowViewer>=0.3.0', 'FlowViewer>=0.3.0',
'websocket-client', 'websocket-client',
'click', 'click',