完善异常上抛机制

Author: hect0x7

src/jmcomic/jm_downloader.py

@@ -1,6 +1,29 @@
 from .jm_option import *
 
 
+def catch_exception(field_name):
+    def deco(func):
+        def wrapper(self, *args, **kwargs):
+            try:
+                return func(self, *args, **kwargs)
+            except Exception as e:
+                detail: JmBaseEntity = args[1]
+                getattr(self, field_name).append((detail, e))
+                if detail.is_image():
+                    detail: JmImageDetail
+                    jm_log('image.failed', f'图片下载失败: [{detail.download_url}], 异常: {e}')
+
+                elif detail.is_photo():
+                    detail: JmPhotoDetail
+                    jm_log('photo.failed', f'章节下载失败: [{detail.id}], 异常: {e}')
+
+                raise e
+
+        return wrapper
+
+    return deco
+
+
 # noinspection PyMethodMayBeStatic
 class DownloadCallback:
 
@@ -56,29 +79,6 @@ def __init__(self, option: JmOption) -> None:
         self.download_failed_image: List[Tuple[JmImageDetail, BaseException]] = []
         self.download_failed_photo: List[Tuple[JmPhotoDetail, BaseException]] = []
 
-    @staticmethod
-    def catch_exception(field_name):
-        def deco(func):
-            def wrapper(self, *args, **kwargs):
-                try:
-                    return func(self, *args, **kwargs)
-                except Exception as e:
-                    detail: JmBaseEntity = args[1]
-                    getattr(self, field_name).append((detail, e))
-                    if detail.is_image():
-                        detail: JmImageDetail
-                        jm_log('image.failed', f'图片下载失败: [{detail.download_url}], 异常: {e}')
-
-                    elif detail.is_photo():
-                        detail: JmPhotoDetail
-                        jm_log('photo.failed', f'章节下载失败: [{detail.id}], 异常: {e}')
-
-                    raise e
-
-            return wrapper
-
-        return deco
-
     def download_album(self, album_id):
         client = self.client_for_album(album_id)
         album = client.get_album_detail(album_id)