3.2.31 get_src()方法增加base64_to_bytes参数；使用1.0.0版DownloadKit

DrissionPage/chromium_element.py

@@ -436,9 +436,10 @@ class ChromiumElement(DrissionElement):
         js = f'return window.getComputedStyle(this{pseudo_ele}).getPropertyValue("{style}");'
         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
         :param timeout: 等待资源加载的超时时间
+        :param base64_to_bytes: 为True时，如果是base64数据，转换为bytes格式
         :return: 资源内容
         """
         timeout = self.page.timeout if timeout is None else timeout
@@ -471,8 +472,11 @@ class ChromiumElement(DrissionElement):
             return None
 
         if result['base64Encoded']:
-            from base64 import b64decode
-            data = b64decode(result['content'])
+            if base64_to_bytes:
+                from base64 import b64decode
+                data = b64decode(result['content'])
+            else:
+                data = result['content']
         else:
             data = result['content']
         return data

DrissionPage/chromium_element.pyi

@@ -176,7 +176,7 @@ class ChromiumElement(DrissionElement):
 
     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: ...
 

requirements.txt

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

setup.py

@@ -22,7 +22,7 @@ setup(
         'lxml',
         'requests',
         'cssselect',
-        'DownloadKit>=0.5.3',
+        'DownloadKit>=1.0.0',
         'FlowViewer>=0.3.0',
         'websocket-client',
         'click',