jmcomic 2.5.24__tar.gz → 2.5.25__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.
- {jmcomic-2.5.24/src/jmcomic.egg-info → jmcomic-2.5.25}/PKG-INFO +1 -1
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic/__init__.py +1 -1
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic/jm_client_interface.py +1 -4
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic/jm_toolkit.py +1 -1
- {jmcomic-2.5.24 → jmcomic-2.5.25/src/jmcomic.egg-info}/PKG-INFO +1 -1
- {jmcomic-2.5.24 → jmcomic-2.5.25}/LICENSE +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/README.md +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/setup.cfg +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/setup.py +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic/api.py +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic/cl.py +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic/jm_client_impl.py +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic/jm_config.py +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic/jm_downloader.py +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic/jm_entity.py +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic/jm_exception.py +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic/jm_option.py +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic/jm_plugin.py +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic.egg-info/SOURCES.txt +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic.egg-info/dependency_links.txt +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic.egg-info/entry_points.txt +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic.egg-info/requires.txt +0 -0
- {jmcomic-2.5.24 → jmcomic-2.5.25}/src/jmcomic.egg-info/top_level.txt +0 -0
|
@@ -63,7 +63,7 @@ class JmImageResp(JmResp):
|
|
|
63
63
|
):
|
|
64
64
|
img_url = img_url or self.url
|
|
65
65
|
|
|
66
|
-
if decode_image is False:
|
|
66
|
+
if decode_image is False or scramble_id is None:
|
|
67
67
|
# 不解密图片，直接保存文件
|
|
68
68
|
JmImageTool.save_resp_img(
|
|
69
69
|
self,
|
|
@@ -245,9 +245,6 @@ class JmImageClient:
|
|
|
245
245
|
:param scramble_id: 图片所在photo的scramble_id
|
|
246
246
|
:param decode_image: 要保存的是解密后的图还是原图
|
|
247
247
|
"""
|
|
248
|
-
if scramble_id is None:
|
|
249
|
-
scramble_id = JmMagicConstants.SCRAMBLE_220980
|
|
250
|
-
|
|
251
248
|
# 请求图片
|
|
252
249
|
resp = self.get_jm_image(img_url)
|
|
253
250
|
|
|
@@ -6,7 +6,7 @@ from .jm_exception import *
|
|
|
6
6
|
class JmcomicText:
|
|
7
7
|
pattern_jm_domain = compile(r'https://([\w.-]+)')
|
|
8
8
|
pattern_jm_pa_id = [
|
|
9
|
-
(compile(r'(photos?|
|
|
9
|
+
(compile(r'(photos?|albums?)/(\d+)'), 2),
|
|
10
10
|
(compile(r'id=(\d+)'), 1),
|
|
11
11
|
]
|
|
12
12
|
pattern_html_jm_pub_domain = compile(r'[\w-]+\.\w+/?\w+')
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|