v2.1.1: 优化代码和Github工作流脚本 (#75)

Author: hect0x7

src/jmcomic/__init__.py

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

src/jmcomic/api.py

@@ -25,7 +25,7 @@ def download_album(jm_album_id, option=None):
     def download_photo(photo: JmPhotoDetail,
                        debug_topic='photo',
                        ):
-        jm_client.ensure_photo_can_use(photo)
+        jm_client.check_photo(photo)
 
         jm_debug(debug_topic,
                  f'开始下载章节: {photo.id} ({photo.album_id}[{photo.index}/{len(album)}]), '
@@ -88,7 +88,7 @@ def download_by_photo_detail(photo_detail: JmPhotoDetail,
     # 下载准备
     use_cache = option.download_cache
     decode_image = option.download_image_decode
-    jm_client.ensure_photo_can_use(photo_detail)
+    jm_client.check_photo(photo_detail)
 
     # 下载每个图片的函数
     def download_image(index, image: JmImageDetail, debug_topic='image'):

src/jmcomic/jm_client_impl.py

@@ -49,7 +49,7 @@ def request_with_retry(self,
         @param kwargs: 请求方法的kwargs
         """
         if domain_index >= len(self.domain_list):
-            raise AssertionError(f"请求重试全部失败: [{url}], {self.domain_list}")
+            self.fallback(request, url, domain_index, retry_count, **kwargs)
 
         if url.startswith('/'):
             # path
@@ -81,7 +81,6 @@ def request_with_retry(self,
         else:
             return self.request_with_retry(request, url, domain_index + 1, 0, **kwargs)
 
-
     # noinspection PyMethodMayBeStatic, PyUnusedLocal
     def before_retry(self, e, kwargs, retry_count, url):
         jm_debug('error', str(e))
@@ -130,6 +129,9 @@ def get_jmcomic_url(self, postman=None):
     def get_jmcomic_domain_all(self, postman=None):
         return JmModuleConfig.get_jmcomic_domain_all(postman or self.get_root_postman())
 
+    def fallback(self, request, url, domain_index, retry_count, **kwargs):
+        raise AssertionError(f"请求重试全部失败: [{url}], {self.domain_list}")
+
 
 # 基于网页实现的JmClient
 class JmHtmlClient(AbstractJmClient):
@@ -160,17 +162,6 @@ def get_photo_detail(self, photo_id, fetch_album=True) -> JmPhotoDetail:
 
         return photo_detail
 
-    def ensure_photo_can_use(self, photo_detail: JmPhotoDetail):
-        # 检查 from_album
-        if photo_detail.from_album is None:
-            photo_detail.from_album = self.get_album_detail(photo_detail.album_id)
-
-        # 检查 page_arr 和 data_original_domain
-        if photo_detail.page_arr is None or photo_detail.data_original_domain is None:
-            new = self.get_photo_detail(photo_detail.photo_id, False)
-            new.from_album = photo_detail.from_album
-            photo_detail.__dict__.update(new.__dict__)
-
     def search_album(self, search_query, main_tag=0, page=1) -> JmSearchPage:
         params = {
             'main_tag': main_tag,
@@ -226,7 +217,7 @@ def get_jm_html(self, url, require_200=True, **kwargs):
         resp = self.get(url, **kwargs)
 
         if require_200 is True and resp.status_code != 200:
-            write_text('./resp.html', resp.text)
+            # write_text('./resp.html', resp.text)
             self.check_special_http_code(resp)
             self.raise_request_error(resp)
 

src/jmcomic/jm_client_interface.py

@@ -151,9 +151,6 @@ def get_album_detail(self, album_id) -> JmAlbumDetail:
     def get_photo_detail(self, photo_id, fetch_album=True) -> JmPhotoDetail:
         raise NotImplementedError
 
-    def ensure_photo_can_use(self, photo_detail: JmPhotoDetail):
-        raise NotImplementedError
-
     def search_album(self, search_query: str, main_tag: int = 0, page: int = 1) -> JmSearchPage:
         raise NotImplementedError
 
@@ -163,6 +160,16 @@ def of_api_url(self, api_path, domain):
     def enable_cache(self, debug=False):
         raise NotImplementedError
 
+    def check_photo(self, photo_detail: JmPhotoDetail):
+        # 检查 from_album
+        if photo_detail.from_album is None:
+            photo_detail.from_album = self.get_album_detail(photo_detail.album_id)
+
+        # 检查 page_arr 和 data_original_domain
+        if photo_detail.page_arr is None or photo_detail.data_original_domain is None:
+            new = self.get_photo_detail(photo_detail.photo_id, False)
+            new.from_album = photo_detail.from_album
+            photo_detail.__dict__.update(new.__dict__)
 
 class JmUserClient:
 

usage/workflow_download.py

@@ -4,6 +4,8 @@
 452859
 
 
+
+
 '''
 
 
@@ -48,19 +50,19 @@ def hook_debug(option):
     jm_download_dir = get_env('JM_DOWNLOAD_DIR') or workspace()
     mkdir_if_not_exists(jm_download_dir)
 
-    class HookDebugClient(JmHtmlClient):
+    class RaiseErrorAwareClient(JmHtmlClient):
 
         @classmethod
-        def raise_request_error(cls, resp, msg):
+        def raise_request_error(cls, resp, msg=None):
             from common import write_text, fix_windir_name, format_ts
             write_text(
-                f'{jm_download_dir}/[请求失败的响应内容]_[{format_ts()}]_[{fix_windir_name(resp.url)}].html',
+                f'{jm_download_dir}/{fix_windir_name(resp.url)}',
                 resp.text
             )
 
             return super().raise_request_error(resp, msg)
 
-    option.jm_client_impl_mapping['html'] = HookDebugClient
+    option.jm_client_impl_mapping['html'] = RaiseErrorAwareClient
 
 
 def get_env(name):