jmcomic 2.5.16__py3-none-any.whl → 2.5.18__py3-none-any.whl

jmcomic/__init__.py

@@ -2,7 +2,7 @@
 # 被依赖方 <--- 使用方
 # config <--- entity <--- toolkit <--- client <--- option <--- downloader
 
-__version__ = '2.5.16'
+__version__ = '2.5.18'
 
 from .api import *
 from .jm_plugin import *

jmcomic/jm_client_impl.py

@@ -92,7 +92,7 @@ class AbstractJmClient(
             jm_log(self.log_topic(), self.decode(url))
         else:
             # 图片url
-            pass
+            self.update_request_with_specify_domain(kwargs, None, True)
 
         if domain_index != 0 or retry_count != 0:
             jm_log(f'req.retry',
@@ -133,7 +133,7 @@ class AbstractJmClient(
         """
         return resp
 
-    def update_request_with_specify_domain(self, kwargs: dict, domain: str):
+    def update_request_with_specify_domain(self, kwargs: dict, domain: Optional[str], is_image: bool = False):
         """
         域名自动切换时，用于更新请求参数的回调
         """
@@ -463,7 +463,10 @@ class JmHtmlClient(AbstractJmClient):
 
         return resp
 
-    def update_request_with_specify_domain(self, kwargs: dict, domain: Optional[str]):
+    def update_request_with_specify_domain(self, kwargs: dict, domain: Optional[str], is_image=False):
+        if is_image:
+            return
+
         latest_headers = kwargs.get('headers', None)
         base_headers = self.get_meta_data('headers', None) or JmModuleConfig.new_html_headers(domain)
         base_headers.update(latest_headers or {})
@@ -909,8 +912,10 @@ class JmApiClient(AbstractJmClient):
 
         return resp
 
-    def update_request_with_specify_domain(self, kwargs: dict, domain: str):
-        pass
+    def update_request_with_specify_domain(self, kwargs: dict, domain: Optional[str], is_image=False):
+        if is_image:
+            # 设置APP端的图片请求headers
+            kwargs['headers'] = {**JmModuleConfig.APP_HEADERS_TEMPLATE, **JmModuleConfig.APP_HEADERS_IMAGE}
 
     # noinspection PyMethodMayBeStatic
     def decide_headers_and_ts(self, kwargs, url):
@@ -930,7 +935,7 @@ class JmApiClient(AbstractJmClient):
             token, tokenparam = JmCryptoTool.token_and_tokenparam(ts)
 
         # 设置headers
-        headers = kwargs.get('headers', None) or JmMagicConstants.APP_HEADERS_TEMPLATE.copy()
+        headers = kwargs.get('headers', None) or JmModuleConfig.APP_HEADERS_TEMPLATE.copy()
         headers.update({
             'token': token,
             'tokenparam': tokenparam,

jmcomic/jm_config.py

@@ -59,50 +59,16 @@ class JmMagicConstants:
     SUB_SINGLE_JAPANESE = SUB_JAPANESE
     SUB_SINGLE_YOUTH = 'youth'
 
-    # 分页大小
-    PAGE_SIZE_SEARCH = 80
-    PAGE_SIZE_FAVORITE = 20
-
     # 图片分割参数
     SCRAMBLE_220980 = 220980
     SCRAMBLE_268850 = 268850
     SCRAMBLE_421926 = 421926  # 2023-02-08后改了图片切割算法
 
-    # 当本子没有作者名字时，顶替作者名字
-    DEFAULT_AUTHOR = 'default_author'
-
     # 移动端API密钥
     APP_TOKEN_SECRET = '18comicAPP'
     APP_TOKEN_SECRET_2 = '18comicAPPContent'
     APP_DATA_SECRET = '185Hcomic3PAPP7R'
-    APP_VERSION = '1.7.0'
-    APP_HEADERS_TEMPLATE = {
-        'Accept-Encoding': 'gzip',
-        'user-agent': 'Mozilla/5.0 (Linux; Android 9; V1938CT Build/PQ3A.190705.11211812; wv) AppleWebKit/537.36 (KHTML, '
-                      'like Gecko) Version/4.0 Chrome/91.0.4472.114 Safari/537.36',
-    }
-
-    # 网页端headers
-    HTML_HEADERS_TEMPLATE = {
-        'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,'
-                  'application/signed-exchange;v=b3;q=0.7',
-        'accept-language': 'zh-CN,zh;q=0.9',
-        'cache-control': 'no-cache',
-        'dnt': '1',
-        'pragma': 'no-cache',
-        'priority': 'u=0, i',
-        'referer': 'https://18comic.vip/',
-        'sec-ch-ua': '"Chromium";v="124", "Google Chrome";v="124", "Not-A.Brand";v="99"',
-        'sec-ch-ua-mobile': '?0',
-        'sec-ch-ua-platform': '"Windows"',
-        'sec-fetch-dest': 'document',
-        'sec-fetch-mode': 'navigate',
-        'sec-fetch-site': 'none',
-        'sec-fetch-user': '?1',
-        'upgrade-insecure-requests': '1',
-        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 '
-                      'Safari/537.36',
-    }
+    APP_VERSION = '1.7.1'
 
 
 # 模块级别共用配置
@@ -123,33 +89,75 @@ class JmModuleConfig:
     # JM的异常网页code
     JM_ERROR_STATUS_CODE = {
         403: 'ip地区禁止访问/爬虫被识别',
-        500: '500: 禁漫服务器内部异常（可能是服务器过载，可以换个ip或稍后重试）',
+        500: '500: 禁漫服务器内部异常（可能是服务器过载，可以切换ip或稍后重试）',
         520: '520: Web server is returning an unknown error (禁漫服务器内部报错)',
         524: '524: The origin web server timed out responding to this request. (禁漫服务器处理超时)',
     }
 
+    # 分页大小
+    PAGE_SIZE_SEARCH = 80
+    PAGE_SIZE_FAVORITE = 20
+
     # 图片分隔相关
     SCRAMBLE_CACHE = {}
 
+    # 当本子没有作者名字时，顶替作者名字
+    DEFAULT_AUTHOR = 'default_author'
+
+    APP_HEADERS_TEMPLATE = {
+        'Accept-Encoding': 'gzip, deflate',
+        'user-agent': 'Mozilla/5.0 (Linux; Android 9; V1938CT Build/PQ3A.190705.11211812; wv) AppleWebKit/537.36 (KHTML, '
+                      'like Gecko) Version/4.0 Chrome/91.0.4472.114 Safari/537.36',
+    }
+
+    APP_HEADERS_IMAGE = {
+        'Accept': 'image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8',
+        'X-Requested-With': 'com.jiaohua_browser',
+        'Referer': 'https://www.jmfreedomproxy.xyz/',
+        'Accept-Language': 'zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7',
+    }
+
+    # 网页端headers
+    HTML_HEADERS_TEMPLATE = {
+        'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,'
+                  'application/signed-exchange;v=b3;q=0.7',
+        'accept-language': 'zh-CN,zh;q=0.9',
+        'cache-control': 'no-cache',
+        'dnt': '1',
+        'pragma': 'no-cache',
+        'priority': 'u=0, i',
+        'referer': 'https://18comic.vip/',
+        'sec-ch-ua': '"Chromium";v="124", "Google Chrome";v="124", "Not-A.Brand";v="99"',
+        'sec-ch-ua-mobile': '?0',
+        'sec-ch-ua-platform': '"Windows"',
+        'sec-fetch-dest': 'document',
+        'sec-fetch-mode': 'navigate',
+        'sec-fetch-site': 'none',
+        'sec-fetch-user': '?1',
+        'upgrade-insecure-requests': '1',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 '
+                      'Safari/537.36',
+    }
     # cookies，目前只在移动端使用，因为移动端请求接口须携带，但不会校验cookies的内容。
     APP_COOKIES = None
 
     # 移动端图片域名
     DOMAIN_IMAGE_LIST = str_to_list('''
+    cdn-msp.jmapiproxy1.cc
+    cdn-msp.jmapiproxy2.cc
+    cdn-msp2.jmapiproxy2.cc
+    cdn-msp3.jmapiproxy2.cc
     cdn-msp.jmapinodeudzn.net
-    cdn-msp2.jmapinodeudzn.net
-    cdn-msp2.jmapiproxy3.cc
     cdn-msp3.jmapinodeudzn.net
 
     ''')
 
     # 移动端API域名
     DOMAIN_API_LIST = str_to_list('''
-    www.jmapinodeudzn.xyz
-    www.cdn-eldenringproxy.xyz
-    www.cdn-eldenringproxy.me
-    www.cdn-eldenringproxy.vip
-    www.jmapinode.xyz
+    www.jmapidestiny.xyz
+    www.jmeadpoolcdn.one
+    www.jmeadpoolcdn.life
+    
     ''')
 
     # 网页端域名配置
@@ -336,7 +344,7 @@ class JmModuleConfig:
         """
         网页端的headers
         """
-        headers = JmMagicConstants.HTML_HEADERS_TEMPLATE.copy()
+        headers = cls.HTML_HEADERS_TEMPLATE.copy()
         headers.update({
             'authority': domain,
             'origin': f'https://{domain}',

jmcomic/jm_entity.py

@@ -305,7 +305,8 @@ class JmPhotoDetail(DetailEntity, Downloadable):
         # 2. 值目前在网页端只在photo页面的图片标签的data-original属性出现
         # 这里的模拟思路是，获取到第一个图片标签的data-original，
         # 取出其query参数 → self.data_original_query_params, 该值未来会传递给 JmImageDetail
-        self.data_original_query_params = self.get_data_original_query_params(data_original_0)
+        # self.data_original_query_params = self.get_data_original_query_params(data_original_0)
+        self.data_original_query_params = None
 
     @property
     def is_single_album(self) -> bool:
@@ -355,7 +356,7 @@ class JmPhotoDetail(DetailEntity, Downloadable):
             return self._author.strip()
 
         # 使用默认
-        return JmMagicConstants.DEFAULT_AUTHOR
+        return JmModuleConfig.DEFAULT_AUTHOR
 
     def create_image_detail(self, index) -> JmImageDetail:
         # 校验参数
@@ -475,7 +476,7 @@ class JmAlbumDetail(DetailEntity, Downloadable):
         if len(self.authors) >= 1:
             return self.authors[0]
 
-        return JmMagicConstants.DEFAULT_AUTHOR
+        return JmModuleConfig.DEFAULT_AUTHOR
 
     @property
     def id(self):
@@ -612,7 +613,7 @@ class JmSearchPage(JmPageContent):
 
     @property
     def page_size(self) -> int:
-        return JmMagicConstants.PAGE_SIZE_SEARCH
+        return JmModuleConfig.PAGE_SIZE_SEARCH
 
     # 下面的方法是对单个album的包装
 
@@ -653,7 +654,7 @@ class JmFavoritePage(JmPageContent):
 
     @property
     def page_size(self) -> int:
-        return JmMagicConstants.PAGE_SIZE_FAVORITE
+        return JmModuleConfig.PAGE_SIZE_FAVORITE
 
     def iter_folder_id_name(self) -> Generator[Tuple[str, str], None, None]:
         """

jmcomic/jm_plugin.py

@@ -601,7 +601,7 @@ class FavoriteFolderExportPlugin(JmOptionPlugin):
         for page in page_data:
             for aid, extra in page.content:
                 data.append(
-                    (aid, extra.get('author', '') or JmMagicConstants.DEFAULT_AUTHOR, extra['name'])
+                    (aid, extra.get('author', '') or JmModuleConfig.DEFAULT_AUTHOR, extra['name'])
                 )
 
         if len(data) == 0:

{jmcomic-2.5.16.dist-info → jmcomic-2.5.18.dist-info}/METADATA

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

jmcomic-2.5.18.dist-info/RECORD

@@ -0,0 +1,18 @@
+jmcomic/__init__.py,sha256=mkj1JvIZueqk3MCGI4yyfXtA3Zxz0rWzBS7Vgxk8oY4,903
+jmcomic/api.py,sha256=40mzFEVhR0h_Ta-ub8vMfJ9yx89yvL09XMv9zK0QUvA,3865
+jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
+jmcomic/jm_client_impl.py,sha256=dJvlhBs0aPxGgH4wsXEFPamHTsxgrmGUytbnv8TQLYk,39523
+jmcomic/jm_client_interface.py,sha256=5JFSZEvAffDPh7oo8GQNVbm_Hdlmy_KYvTwrkY-OSA4,19074
+jmcomic/jm_config.py,sha256=6vjefeNuHH6CXCMYRUcAAH7_b7nnn_djf5blW8sjX-o,16643
+jmcomic/jm_downloader.py,sha256=0r4z7FRnow6xkRy_WTv7nLQOhYdtZmoouw0BNrhngco,10397
+jmcomic/jm_entity.py,sha256=yjGz55r2UwCIhQLUEBHhx3-MAipBYLHqn4ofnqvg1GI,19090
+jmcomic/jm_exception.py,sha256=B9APE1jw23JBzCT12eV_imCZny3mNrSXju1p2IquaHA,4801
+jmcomic/jm_option.py,sha256=wmoOIwffM8b8fKUufRslXK5-bynD1nPXqc1sotXLIzQ,21918
+jmcomic/jm_plugin.py,sha256=HlsT94kKooTNEiWqGHukD0y86GToPpPWELhzU3rQ0lk,36359
+jmcomic/jm_toolkit.py,sha256=jU83ujluX_NxqwI7wwgoirJ_ZE2UmPBGvZCyVYnCJvQ,29164
+jmcomic-2.5.18.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.5.18.dist-info/METADATA,sha256=vtCI_pzZnymEt1iMeBm-0_429ZaVOLThaseWUA54IHc,7064
+jmcomic-2.5.18.dist-info/WHEEL,sha256=nCVcAvsfA9TDtwGwhYaRrlPhTLV9m-Ga6mdyDtuwK18,91
+jmcomic-2.5.18.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
+jmcomic-2.5.18.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.5.18.dist-info/RECORD,,

{jmcomic-2.5.16.dist-info → jmcomic-2.5.18.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (73.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

jmcomic-2.5.16.dist-info/RECORD

@@ -1,18 +0,0 @@
-jmcomic/__init__.py,sha256=H9Ze9uEpJEaGjwXlspViliWWDFsTgN66TfaFI8ZaEBM,903
-jmcomic/api.py,sha256=40mzFEVhR0h_Ta-ub8vMfJ9yx89yvL09XMv9zK0QUvA,3865
-jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
-jmcomic/jm_client_impl.py,sha256=UjWKyYF-pdYNbtw0FqvYQ0zsxGMySh8e9OIFZb1Xe7E,39188
-jmcomic/jm_client_interface.py,sha256=5JFSZEvAffDPh7oo8GQNVbm_Hdlmy_KYvTwrkY-OSA4,19074
-jmcomic/jm_config.py,sha256=CSl6s8rxyQq7bbhCCGnXtp8NMfZxabbByRYBvXlsH0s,16365
-jmcomic/jm_downloader.py,sha256=0r4z7FRnow6xkRy_WTv7nLQOhYdtZmoouw0BNrhngco,10397
-jmcomic/jm_entity.py,sha256=4B1NNFZ4dMlUguY4VpfG54C4h8l-uXk232Uj1RdQ1Ns,19049
-jmcomic/jm_exception.py,sha256=B9APE1jw23JBzCT12eV_imCZny3mNrSXju1p2IquaHA,4801
-jmcomic/jm_option.py,sha256=wmoOIwffM8b8fKUufRslXK5-bynD1nPXqc1sotXLIzQ,21918
-jmcomic/jm_plugin.py,sha256=4A3R4O6OHtG25wc5bLy-mkUJzC-qovH9GHv29mA-7MI,36361
-jmcomic/jm_toolkit.py,sha256=jU83ujluX_NxqwI7wwgoirJ_ZE2UmPBGvZCyVYnCJvQ,29164
-jmcomic-2.5.16.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.5.16.dist-info/METADATA,sha256=URI3NbsCbyDoAyEmX7aaEQSANnDgLRX7smtMpqeoMXo,7064
-jmcomic-2.5.16.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-jmcomic-2.5.16.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
-jmcomic-2.5.16.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.5.16.dist-info/RECORD,,