v2.1.9: 支持自定义保存图片，优化debug的topic (#88)

Author: hect0x7

src/jmcomic/__init__.py

@@ -2,6 +2,6 @@
 # 被依赖方 <--- 使用方
 # config <--- entity <--- toolkit <--- client <--- option <--- downloader
 
-__version__ = '2.1.8'
+__version__ = '2.1.9'
 
 from .api import *

src/jmcomic/jm_client_impl.py

@@ -63,15 +63,14 @@ def request_with_retry(self,
             pass
 
         if domain_index != 0 or retry_count != 0:
-            jm_debug(
-                f'request_retry',
-                ', '.join([
-                    f'次数: [{retry_count}/{self.retry_times}]',
-                    f'域名: [{domain_index} of {self.domain_list}]',
-                    f'路径: [{url}]',
-                    f'参数: [{kwargs if "login" not in url else "#login_form#"}]'
-                ])
-            )
+            jm_debug(f'req.retry',
+                     ', '.join([
+                         f'次数: [{retry_count}/{self.retry_times}]',
+                         f'域名: [{domain_index} of {self.domain_list}]',
+                         f'路径: [{url}]',
+                         f'参数: [{kwargs if "login" not in url else "#login_form#"}]'
+                     ])
+                     )
 
         try:
             return request(url, **kwargs)
@@ -85,7 +84,7 @@ def request_with_retry(self,
 
     # noinspection PyMethodMayBeStatic, PyUnusedLocal
     def before_retry(self, e, kwargs, retry_count, url):
-        jm_debug('retry', str(e))
+        jm_debug('req.err', str(e))
 
     def enable_cache(self, debug=False):
         def wrap_func_cache(func_name, cache_dict_name):
@@ -134,7 +133,7 @@ def get_jmcomic_domain_all(self, postman=None):
     # noinspection PyUnusedLocal
     def fallback(self, request, url, domain_index, retry_count, **kwargs):
         msg = f"请求重试全部失败: [{url}], {self.domain_list}"
-        jm_debug('fallback', "msg")
+        jm_debug('fallback', msg)
         raise AssertionError(msg)
 
 
@@ -286,7 +285,7 @@ def album_comment(self,
             data['is_reply'] = 1
             data['forum_subject'] = 1
 
-        jm_debug('album_comment',
+        jm_debug('album.comment',
                  f'{video_id}: [{comment}]' +
                  (f' to ({comment_id})' if comment_id is not None else '')
                  )
@@ -297,7 +296,7 @@ def album_comment(self,
                          )
 
         ret = JmAcResp(resp)
-        jm_debug('album_comment', f'{video_id}: [{comment}] ← ({ret.model().cid})')
+        jm_debug('album.comment', f'{video_id}: [{comment}] ← ({ret.model().cid})')
 
         return ret
 

src/jmcomic/jm_downloader.py

@@ -9,39 +9,39 @@ class JmDownloadException(Exception):
 class DownloadCallback:
 
     def before_album(self, album: JmAlbumDetail):
-        jm_debug('album-before',
+        jm_debug('album.before',
                  f'本子获取成功: [{album.id}], '
                  f'作者: [{album.author}], '
                  f'章节数: [{len(album)}], '
                  f'标题: [{album.title}], '
                  )
 
     def after_album(self, album: JmAlbumDetail):
-        jm_debug('album-after', f'本子下载完成: [{album.id}]')
+        jm_debug('album.after', f'本子下载完成: [{album.id}]')
 
     def before_photo(self, photo: JmPhotoDetail):
-        jm_debug('photo-before',
+        jm_debug('photo.before',
                  f'开始下载章节: {photo.id} ({photo.album_id}[{photo.index}/{len(photo.from_album)}]), '
                  f'标题: [{photo.title}], '
                  f'图片数为[{len(photo)}]'
                  )
 
     def after_photo(self, photo: JmPhotoDetail):
-        jm_debug('photo-after',
+        jm_debug('photo.after',
                  f'章节下载完成: {photo.id} ({photo.album_id}[{photo.index}/{len(photo.from_album)}])')
 
     def before_image(self, image: JmImageDetail, img_save_path):
         if image.is_exists:
-            jm_debug('image-before',
+            jm_debug('image.before',
                      f'图片已存在: {image.tag} ← [{img_save_path}]'
                      )
         else:
-            jm_debug('image-before',
+            jm_debug('image.before',
                      f'图片准备下载: {image.tag}, [{image.img_url}] → [{img_save_path}]'
                      )
 
     def after_image(self, image: JmImageDetail, img_save_path):
-        jm_debug('image-after',
+        jm_debug('image.after',
                  f'图片下载完成: {image.tag}, [{image.img_url}] → [{img_save_path}]')
 
 
@@ -139,6 +139,6 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if exc_type is not None:
-            jm_debug('exception',
+            jm_debug('dler.exception',
                      f'{self.__class__.__name__} Exit with exception: {exc_type, exc_val}'
                      )

src/jmcomic/jm_toolkit.py

@@ -1,4 +1,5 @@
 from .jm_entity import *
+from PIL import Image
 
 
 class JmcomicText:
@@ -214,7 +215,7 @@ def save_resp_img(cls, resp: Any, filepath: str, need_convert=True):
         如果不需要改变文件的格式，使用need_convert=False可以跳过PIL解析图片，效率更高。
         """
         if need_convert is True:
-            cls.open_Image(resp.content).save(filepath)
+            cls.save_image(cls.open_Image(resp.content), filepath)
         else:
             save_resp_content(resp, filepath)
 
@@ -283,15 +284,18 @@ def decode_and_save(cls,
             )
 
         # 保存到新的解密文件
-        img_decode.save(decoded_save_path)
+        cls.save_image(img_decode, decoded_save_path)
 
     @classmethod
     def open_Image(cls, fp: Union[str, bytes]):
-        from PIL import Image
         from io import BytesIO
         fp = fp if isinstance(fp, str) else BytesIO(fp)
         return Image.open(fp)
 
+    @classmethod
+    def save_image(cls, image: Image, filepath: str):
+        image.save(filepath)
+
     @classmethod
     def get_num(cls, scramble_id, aid, filename: str) -> int:
         """