jmcomic 2.5.19__tar.gz → 2.5.21__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. {jmcomic-2.5.19/src/jmcomic.egg-info → jmcomic-2.5.21}/PKG-INFO +1 -1
  2. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic/__init__.py +1 -1
  3. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic/jm_config.py +25 -21
  4. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic/jm_downloader.py +1 -4
  5. {jmcomic-2.5.19 → jmcomic-2.5.21/src/jmcomic.egg-info}/PKG-INFO +1 -1
  6. {jmcomic-2.5.19 → jmcomic-2.5.21}/LICENSE +0 -0
  7. {jmcomic-2.5.19 → jmcomic-2.5.21}/README.md +0 -0
  8. {jmcomic-2.5.19 → jmcomic-2.5.21}/setup.cfg +0 -0
  9. {jmcomic-2.5.19 → jmcomic-2.5.21}/setup.py +0 -0
  10. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic/api.py +0 -0
  11. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic/cl.py +0 -0
  12. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic/jm_client_impl.py +0 -0
  13. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic/jm_client_interface.py +0 -0
  14. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic/jm_entity.py +0 -0
  15. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic/jm_exception.py +0 -0
  16. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic/jm_option.py +0 -0
  17. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic/jm_plugin.py +0 -0
  18. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic/jm_toolkit.py +0 -0
  19. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic.egg-info/SOURCES.txt +0 -0
  20. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic.egg-info/dependency_links.txt +0 -0
  21. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic.egg-info/entry_points.txt +0 -0
  22. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic.egg-info/requires.txt +0 -0
  23. {jmcomic-2.5.19 → jmcomic-2.5.21}/src/jmcomic.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: jmcomic
3
- Version: 2.5.19
3
+ Version: 2.5.21
4
4
  Summary: Python API For JMComic (禁漫天堂)
5
5
  Home-page: https://github.com/hect0x7/JMComic-Crawler-Python
6
6
  Author: hect0x7
@@ -2,7 +2,7 @@
2
2
  # 被依赖方 <--- 使用方
3
3
  # config <--- entity <--- toolkit <--- client <--- option <--- downloader
4
4
 
5
- __version__ = '2.5.19'
5
+ __version__ = '2.5.21'
6
6
 
7
7
  from .api import *
8
8
  from .jm_plugin import *
@@ -112,6 +112,30 @@ class JmModuleConfig:
112
112
  # 当本子没有作者名字时,顶替作者名字
113
113
  DEFAULT_AUTHOR = 'default_author'
114
114
 
115
+ # cookies,目前只在移动端使用,因为移动端请求接口须携带,但不会校验cookies的内容。
116
+ APP_COOKIES = None
117
+
118
+ # 移动端图片域名
119
+ DOMAIN_IMAGE_LIST = shuffled('''
120
+ cdn-msp.jmapiproxy1.cc
121
+ cdn-msp.jmapiproxy2.cc
122
+ cdn-msp2.jmapiproxy2.cc
123
+ cdn-msp3.jmapiproxy2.cc
124
+ cdn-msp.jmapinodeudzn.net
125
+ cdn-msp3.jmapinodeudzn.net
126
+ ''')
127
+
128
+ # 移动端API域名
129
+ DOMAIN_API_LIST = shuffled('''
130
+ www.cdnxxx-proxy.vip
131
+ www.cdnxxx-proxy.org
132
+ www.cdnxxx-proxy.xyz
133
+ www.cdnxxx-proxy.co
134
+ www.cdnblackmyth.xyz
135
+
136
+
137
+ ''')
138
+
115
139
  APP_HEADERS_TEMPLATE = {
116
140
  'Accept-Encoding': 'gzip, deflate',
117
141
  'user-agent': 'Mozilla/5.0 (Linux; Android 9; V1938CT Build/PQ3A.190705.11211812; wv) AppleWebKit/537.36 (KHTML, '
@@ -121,7 +145,7 @@ class JmModuleConfig:
121
145
  APP_HEADERS_IMAGE = {
122
146
  'Accept': 'image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8',
123
147
  'X-Requested-With': 'com.jiaohua_browser',
124
- 'Referer': 'https://www.jmfreedomproxy.xyz/',
148
+ 'Referer': PROT + DOMAIN_API_LIST[0],
125
149
  'Accept-Language': 'zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7',
126
150
  }
127
151
 
@@ -146,26 +170,6 @@ class JmModuleConfig:
146
170
  'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 '
147
171
  'Safari/537.36',
148
172
  }
149
- # cookies,目前只在移动端使用,因为移动端请求接口须携带,但不会校验cookies的内容。
150
- APP_COOKIES = None
151
-
152
- # 移动端图片域名
153
- DOMAIN_IMAGE_LIST = shuffled('''
154
- cdn-msp.jmapiproxy1.cc
155
- cdn-msp.jmapiproxy2.cc
156
- cdn-msp2.jmapiproxy2.cc
157
- cdn-msp3.jmapiproxy2.cc
158
- cdn-msp.jmapinodeudzn.net
159
- cdn-msp3.jmapinodeudzn.net
160
- ''')
161
-
162
- # 移动端API域名
163
- DOMAIN_API_LIST = shuffled('''
164
- www.jmeadpoolcdn.one
165
- www.jmapiproxyxxx.one
166
- www.jmeadpoolcdn.life
167
-
168
- ''')
169
173
 
170
174
  # 网页端域名配置
171
175
  # 无需配置,默认为None,需要的时候会发起请求获得
@@ -110,7 +110,6 @@ class JmDownloader(DownloadCallback):
110
110
  if use_cache is True and image.exists:
111
111
  return
112
112
 
113
- e = None
114
113
  try:
115
114
  client.download_by_image_detail(
116
115
  image,
@@ -121,9 +120,7 @@ class JmDownloader(DownloadCallback):
121
120
  jm_log('image.failed', f'图片下载失败: [{image.download_url}], 异常: {e}')
122
121
  # 保存失败记录
123
122
  self.download_failed_list.append((image, e))
124
-
125
- if e is not None:
126
- raise e
123
+ raise
127
124
 
128
125
  self.after_image(image, img_save_path)
129
126
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: jmcomic
3
- Version: 2.5.19
3
+ Version: 2.5.21
4
4
  Summary: Python API For JMComic (禁漫天堂)
5
5
  Home-page: https://github.com/hect0x7/JMComic-Crawler-Python
6
6
  Author: hect0x7
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes