Merge pull request #700 from 2513502304/main

将捕获异常的类型由HTTPStatusError换成基类HTTPError，以便正确处理爬取媒体资源出现任何错误时，都不会导致爬取评论的中断，详情参见提交记录

Author: NanmiCoder

media_platform/bilibili/client.py

@@ -210,8 +210,8 @@ async def get_video_media(self, url: str) -> Union[bytes, None]:
                     return None
                 else:
                     return response.content
-            except httpx.HTTPStatusError as exc:  # some wrong when call httpx.request method, such as connection error, client error or server error
-                utils.logger.error(f"[BilibiliClient.get_video_media] {exc}")
+            except httpx.HTTPError as exc:  # some wrong when call httpx.request method, such as connection error, client error, server error or response status code is not 2xx
+                utils.logger.error(f"[BilibiliClient.get_video_media] {exc.__class__.__name__} for {exc.request.url} - {exc}")  # 保留原始异常类型名称，以便开发者调试
                 return None
 
     async def get_video_comments(

media_platform/douyin/client.py

@@ -321,6 +321,6 @@ async def get_aweme_media(self, url: str) -> Union[bytes, None]:
                     return None
                 else:
                     return response.content
-            except httpx.HTTPStatusError as exc:  # some wrong when call httpx.request method, such as connection error, client error or server error
-                utils.logger.error(f"[DouYinClient.get_aweme_media] {exc}")
+            except httpx.HTTPError as exc:  # some wrong when call httpx.request method, such as connection error, client error, server error or response status code is not 2xx
+                utils.logger.error(f"[DouYinClient.get_aweme_media] {exc.__class__.__name__} for {exc.request.url} - {exc}")  # 保留原始异常类型名称，以便开发者调试
                 return None

media_platform/weibo/client.py

@@ -256,8 +256,8 @@ async def get_note_image(self, image_url: str) -> bytes:
                     return None
                 else:
                     return response.content
-            except httpx.HTTPStatusError as exc:  # some wrong when call httpx.request method, such as connection error, client error or server error
-                utils.logger.error(f"[DouYinClient.get_aweme_media] {exc}")
+            except httpx.HTTPError as exc:  # some wrong when call httpx.request method, such as connection error, client error, server error or response status code is not 2xx
+                utils.logger.error(f"[DouYinClient.get_aweme_media] {exc.__class__.__name__} for {exc.request.url} - {exc}")    # 保留原始异常类型名称，以便开发者调试
                 return None
 
     async def get_creator_container_info(self, creator_id: str) -> Dict:

media_platform/xhs/client.py

@@ -160,8 +160,8 @@ async def get_note_media(self, url: str) -> Union[bytes, None]:
                     return None
                 else:
                     return response.content
-            except httpx.HTTPStatusError as exc:  # some wrong when call httpx.request method, such as connection error, client error or server error
-                utils.logger.error(f"[DouYinClient.get_aweme_media] {exc}")
+            except httpx.HTTPError as exc:  # some wrong when call httpx.request method, such as connection error, client error, server error or response status code is not 2xx
+                utils.logger.error(f"[DouYinClient.get_aweme_media] {exc.__class__.__name__} for {exc.request.url} - {exc}")  # 保留原始异常类型名称，以便开发者调试
                 return None
 
     async def pong(self) -> bool: