Skip to content

Commit 8070951

Browse files
authored
v2.3.6: 新增基于线程池实现的异步客户端代理及其对应的启用插件,用于解决移动端Client一次多个请求要等待的问题,优化重试机制和缓存机制 (#147)
1 parent df41112 commit 8070951

13 files changed

+311
-148
lines changed

assets/config/option_test_api.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ client:
66
retry_times: 3
77
postman:
88
meta_data:
9-
timeout: 5
9+
timeout: 7
1010

1111
# 插件配置
1212
plugin:
@@ -15,3 +15,8 @@ plugin:
1515
kwargs:
1616
interval: 0.5 # 间隔时间
1717
enable_warning: false # 不告警
18+
19+
- plugin: client_proxy
20+
kwargs:
21+
proxy_client_key: cl_proxy_future
22+
whitelist: [ api, ]

assets/config/option_workflow_download.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ dir_rule:
55

66
client:
77
domain:
8-
- jmcomic1.me
9-
- jmcomic.me
8+
html: [jmcomic1.me, jmcomic.me]
109

1110
# 插件配置
1211
plugin:
@@ -15,3 +14,8 @@ plugin:
1514
kwargs:
1615
interval: 0.5 # 间隔时间
1716
enable_warning: false # 不告警
17+
18+
- plugin: client_proxy
19+
kwargs:
20+
proxy_client_key: cl_proxy_future
21+
whitelist: [ api, ]

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.3.5'
5+
__version__ = '2.3.6'
66

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

src/jmcomic/api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def download_batch(download_api,
2222

2323
return multi_thread_launcher(
2424
iter_objs=set(
25-
JmcomicText.parse_to_album_id(jmid)
25+
JmcomicText.parse_to_jm_id(jmid)
2626
for jmid in jm_id_iter
2727
),
2828
apply_each_obj_func=lambda aid: download_api(aid, option, downloader),

src/jmcomic/cl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def parse(text):
6262
from .jm_toolkit import JmcomicText
6363

6464
try:
65-
return JmcomicText.parse_to_album_id(text)
65+
return JmcomicText.parse_to_jm_id(text)
6666
except Exception as e:
6767
print(e.args[0])
6868
exit(1)

0 commit comments

Comments
 (0)