Skip to content

Commit 6a63e93

Browse files
authored
v2.5.25: 支持Client直接下载无混淆图片,添加docs示例 (#312)
1 parent 1d6e5c9 commit 6a63e93

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

assets/docs/sources/tutorial/0_common_usage.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ download_album(123, option)
3838
option.download_album(123)
3939
```
4040

41-
## 获取本子/章节/图片的实体类
41+
## 获取本子/章节/图片的实体类,下载图片
4242

4343
```python
4444
from jmcomic import *
@@ -59,7 +59,13 @@ def fetch(photo: JmPhotoDetail):
5959
image: JmImageDetail
6060
for image in photo:
6161
print(f'图片url: {image.img_url}')
62-
62+
63+
# 下载单个图片
64+
client.download_by_image_detail(image, './a.jpg')
65+
# 如果是已知未混淆的图片,也可以直接使用url来下载
66+
random_image_domain = JmModuleConfig.DOMAIN_IMAGE_LIST
67+
client.download_image(f'https://{random_image_domain}/media/albums/416130.jpg', './a.jpg')
68+
6369

6470
# 多线程发起请求
6571
multi_thread_launcher(

src/jmcomic/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# 被依赖方 <--- 使用方
33
# config <--- entity <--- toolkit <--- client <--- option <--- downloader
44

5-
__version__ = '2.5.24'
5+
__version__ = '2.5.25'
66

77
from .api import *
88
from .jm_plugin import *

src/jmcomic/jm_client_interface.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def transfer_to(self,
6363
):
6464
img_url = img_url or self.url
6565

66-
if decode_image is False:
66+
if decode_image is False or scramble_id is None:
6767
# 不解密图片,直接保存文件
6868
JmImageTool.save_resp_img(
6969
self,
@@ -245,9 +245,6 @@ def download_image(self,
245245
:param scramble_id: 图片所在photo的scramble_id
246246
:param decode_image: 要保存的是解密后的图还是原图
247247
"""
248-
if scramble_id is None:
249-
scramble_id = JmMagicConstants.SCRAMBLE_220980
250-
251248
# 请求图片
252249
resp = self.get_jm_image(img_url)
253250

src/jmcomic/jm_toolkit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
class JmcomicText:
77
pattern_jm_domain = compile(r'https://([\w.-]+)')
88
pattern_jm_pa_id = [
9-
(compile(r'(photos?|album)/(\d+)'), 2),
9+
(compile(r'(photos?|albums?)/(\d+)'), 2),
1010
(compile(r'id=(\d+)'), 1),
1111
]
1212
pattern_html_jm_pub_domain = compile(r'[\w-]+\.\w+/?\w+')

0 commit comments

Comments
 (0)