jmcomic 2.0.4__tar.gz → 2.0.6__tar.gz

{jmcomic-2.0.4/src/jmcomic.egg-info → jmcomic-2.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jmcomic
-Version: 2.0.4
+Version: 2.0.6
 Summary: Python API For JMComic (禁漫天堂)
 Home-page: https://github.com/hect0x7/JMComic-Crawler-Python
 Author: hect0x7

{jmcomic-2.0.4 → jmcomic-2.0.6}/src/jmcomic/__init__.py

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

{jmcomic-2.0.4 → jmcomic-2.0.6}/src/jmcomic/jm_client_impl.py

@@ -95,9 +95,18 @@ class AbstractJmClient(
 
             setattr(self, func_name, wrap_func)
 
-        wrap_func_cache('get_photo_detail', 'album_cache_dict')
-        wrap_func_cache('get_album_detail', 'photo_cache_dict')
-        wrap_func_cache('search_album', 'search_album_cache_dict')
+        for func in {
+            'get_photo_detail',
+            'get_album_detail',
+            'search_album',
+        }:
+            wrap_func_cache(func, func + '.cache.dict')
+
+    def get_jmcomic_url(self, postman=None):
+        return JmModuleConfig.get_jmcomic_url(postman or self.get_root_postman())
+
+    def get_jmcomic_domain_all(self, postman=None):
+        return JmModuleConfig.get_jmcomic_domain_all(postman or self.get_root_postman())
 
 
 # 基于网页实现的JmClient
@@ -113,7 +122,7 @@ class JmHtmlClient(AbstractJmClient):
         # 用 JmcomicText 解析 html，返回实体类
         return JmcomicText.analyse_jm_album_html(resp.text)
 
-    def get_photo_detail(self, photo_id: str, album=True) -> JmPhotoDetail:
+    def get_photo_detail(self, photo_id, fetch_album=True) -> JmPhotoDetail:
         # 参数校验
         photo_id = JmcomicText.parse_to_photo_id(photo_id)
 
@@ -124,7 +133,7 @@ class JmHtmlClient(AbstractJmClient):
         photo_detail = JmcomicText.analyse_jm_photo_html(resp.text)
 
         # 一并获取该章节的所处本子
-        if album is True:
+        if fetch_album is True:
             photo_detail.from_album = self.get_album_detail(photo_detail.album_id)
 
         return photo_detail

{jmcomic-2.0.4 → jmcomic-2.0.6}/src/jmcomic/jm_client_interface.py

@@ -127,7 +127,7 @@ class JmDetailClient:
     def get_album_detail(self, album_id) -> JmAlbumDetail:
         raise NotImplementedError
 
-    def get_photo_detail(self, photo_id: str, album=True) -> JmPhotoDetail:
+    def get_photo_detail(self, photo_id, fetch_album=True) -> JmPhotoDetail:
         raise NotImplementedError
 
     def ensure_photo_can_use(self, photo_detail: JmPhotoDetail):
@@ -210,4 +210,8 @@ class JmcomicClient(
     JmUserClient,
     Postman,
 ):
-    pass
+    def get_jmcomic_url(self, postman=None):
+        return JmModuleConfig.get_jmcomic_url(postman or self)
+
+    def get_jmcomic_domain_all(self, postman=None):
+        return JmModuleConfig.get_jmcomic_domain_all(postman or self)

{jmcomic-2.0.4 → jmcomic-2.0.6}/src/jmcomic/jm_config.py

@@ -3,12 +3,24 @@ def default_jm_debug(topic: str, msg: str):
     print(f'{format_ts()}:【{topic}】{msg}')
 
 
+def default_postman_constructor(session, **kwargs):
+    from common import Postmans
+
+    kwargs.setdefault('impersonate', 'chrome110')
+    kwargs.setdefault('headers', JmModuleConfig.headers())
+
+    if session is True:
+        return Postmans.new_session(**kwargs)
+
+    return Postmans.new_postman(**kwargs)
+
+
 class JmModuleConfig:
     # 网站相关
     PROT = "https://"
     DOMAIN = None
-    JM_REDIRECT_URL = f'{PROT}jm365.xyz/3YeBdF'  # 永久網域，怕走失的小伙伴收藏起来
-    JM_PUB_URL = f'{PROT}jmcomic1.bet'
+    JM_REDIRECT_URL = f'{PROT}jm365.work/3YeBdF'  # 永久網域，怕走失的小伙伴收藏起来
+    JM_PUB_URL = f'{PROT}jmcomic2.bet'
     JM_CDN_IMAGE_URL_TEMPLATE = PROT + 'cdn-msp.{domain}/media/photos/{photo_id}/{index:05}{suffix}'  # index 从1开始
     JM_IMAGE_SUFFIX = ['.jpg', '.webp', '.png', '.gif']
 
@@ -40,6 +52,7 @@ class JmModuleConfig:
     # debug
     enable_jm_debug = True
     debug_executor = default_jm_debug
+    postman_constructor = default_postman_constructor
 
     @classmethod
     def domain(cls, postman=None):
@@ -84,15 +97,17 @@ class JmModuleConfig:
     def disable_jm_debug(cls):
         cls.enable_jm_debug = False
 
+    @classmethod
+    def new_postman(cls, session=False, **kwargs):
+        return cls.postman_constructor(session, **kwargs)
+
     @classmethod
     def get_jmcomic_url(cls, postman=None):
         """
         访问禁漫的永久网域，从而得到一个可用的禁漫网址
         @return: https://jm-comic2.cc
         """
-        if postman is None:
-            from common import Postmans
-            postman = Postmans.get_impl_clazz('cffi_Session').create()
+        postman = postman or cls.new_postman(session=True)
 
         resp = postman.get(cls.JM_REDIRECT_URL)
         url = resp.url
@@ -105,9 +120,7 @@ class JmModuleConfig:
         访问禁漫发布页，得到所有禁漫的域名
         @return：['18comic.vip', ..., 'jm365.xyz/ZNPJam'], 最后一个是【APP軟件下載】
         """
-        if postman is None:
-            from common import Postmans
-            postman = Postmans.get_impl_clazz('cffi').create()
+        postman = postman or cls.new_postman(session=True)
 
         resp = postman.get(cls.JM_PUB_URL)
         if resp.status_code != 200:

{jmcomic-2.0.4 → jmcomic-2.0.6}/src/jmcomic/jm_entity.py

@@ -204,6 +204,9 @@ class JmPhotoDetail(WorkEntity):
     def __len__(self):
         return len(self.page_arr)
 
+    def __iter__(self) -> Generator[JmImageDetail, Any, None]:
+        return super().__iter__()
+
 
 class JmAlbumDetail(WorkEntity):
 
@@ -297,6 +300,9 @@ class JmAlbumDetail(WorkEntity):
 
         return ret
 
+    def __iter__(self) -> Generator[JmPhotoDetail, Any, None]:
+        return super().__iter__()
+
 
 class JmSearchPage(IterableEntity):
 

{jmcomic-2.0.4 → jmcomic-2.0.6}/src/jmcomic/jm_option.py

@@ -1,68 +1,6 @@
 from .jm_client_impl import *
 
 
-class JmOptionAdvice:
-
-    def decide_image_save_dir(self,
-                              option: 'JmOption',
-                              photo_detail: JmPhotoDetail,
-                              ) -> StrNone:
-        """
-        决定一个本子图片的下载文件夹
-        @param option: JmOption对象
-        @param photo_detail: 本子章节实体类
-        @return: 下载文件夹，为空表示不处理
-        """
-        pass
-
-    def decide_image_filepath(self,
-                              option: 'JmOption',
-                              photo_detail: JmPhotoDetail,
-                              index: int,
-                              ) -> StrNone:
-        """
-        决定一个本子图片的绝对路径
-        @param option: JmOption对象
-        @param photo_detail: 本子章节实体类
-        @param index: 本子章节里的第几章图片
-        @return: 下载绝对路径，为空表示不处理
-        """
-        pass
-
-    def decide_image_suffix(self,
-                            option: 'JmOption',
-                            img_detail: JmImageDetail,
-                            ) -> StrNone:
-        """
-        决定一个图片的保存后缀名
-        @param option: JmOption对象
-        @param img_detail: 禁漫图片实体类
-        @return: 保存后缀名，为空表示不处理
-        """
-        pass
-
-
-class JmAdviceRegistry:
-    advice_registration: Dict[Any, List[JmOptionAdvice]] = {}
-
-    @classmethod
-    def register_advice(cls, base, *advice):
-        advice_ls = cls.advice_registration.get(base, None)
-
-        if advice_ls is None:
-            advice_ls = list(advice)
-            cls.advice_registration[base] = advice_ls
-        else:
-            for e in advice:
-                advice_ls.append(e)
-
-        return advice
-
-    @classmethod
-    def get_advice(cls, base) -> List[JmOptionAdvice]:
-        return cls.advice_registration.setdefault(base, [])
-
-
 class DirRule:
     rule_sample = [
         # 根目录 / Album-id / Photo-序号 /
@@ -205,12 +143,6 @@ class JmOption:
     """
 
     def decide_image_save_dir(self, photo_detail) -> str:
-        # 先检查advice的回调，如果回调支持，则优先使用回调
-        for advice in JmAdviceRegistry.get_advice(self):
-            save_dir = advice.decide_image_save_dir(self, photo_detail)
-            if save_dir is not None:
-                return save_dir
-
         # 使用 self.dir_rule 决定 save_dir
         save_dir = self.dir_rule.deside_image_save_dir(
             photo_detail.from_album,
@@ -221,12 +153,6 @@ class JmOption:
         return save_dir
 
     def decide_image_suffix(self, img_detail: JmImageDetail):
-        # 先检查advice的回调，如果回调支持，则优先使用回调
-        for advice in JmAdviceRegistry.get_advice(self):
-            suffix = advice.decide_image_suffix(self, img_detail)
-            if suffix is not None:
-                return suffix
-
         # 动图则使用原后缀
         suffix = img_detail.img_file_suffix
         if suffix.endswith("gif"):
@@ -236,25 +162,12 @@ class JmOption:
         return self.download_image_suffix or suffix
 
     def decide_image_filepath(self, photo_detail: JmPhotoDetail, index: int) -> str:
-        # 先检查advice的回调，如果回调支持，则优先使用回调
-        for advice in JmAdviceRegistry.get_advice(self):
-            filepath = advice.decide_image_filepath(self, photo_detail, index)
-            if filepath is not None:
-                return filepath
-
         # 通过拼接生成绝对路径
         save_dir = self.decide_image_save_dir(photo_detail)
         image: JmImageDetail = photo_detail[index]
         suffix = self.decide_image_suffix(image)
         return save_dir + image.img_file_name + suffix
 
-    """
-    下面是对Advice的支持
-    """
-
-    def register_advice(self, *advice):
-        JmAdviceRegistry.register_advice(self, *advice)
-
     """
     下面是创建对象相关方法
     """

{jmcomic-2.0.4 → jmcomic-2.0.6}/src/jmcomic/jm_toolkit.py

@@ -1,5 +1,3 @@
-from PIL import Image
-
 from .jm_entity import *
 
 

{jmcomic-2.0.4 → jmcomic-2.0.6/src/jmcomic.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jmcomic
-Version: 2.0.4
+Version: 2.0.6
 Summary: Python API For JMComic (禁漫天堂)
 Home-page: https://github.com/hect0x7/JMComic-Crawler-Python
 Author: hect0x7