Skip to content

Commit efb151e

Browse files
committed
polish code
1 parent 1e325a9 commit efb151e

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ page: JmCategoryPage = cl.categories_filter(
216216
page=1,
217217
time=JmMagicConstants.TIME_ALL, # 时间选择全部,具体可以写什么请见JmMagicConstants
218218
category=JmMagicConstants.CATEGORY_ALL, # 分类选择全部,具体可以写什么请见JmMagicConstants
219-
order_by=JmMagicConstants.ORDER_BY_LATEST, # 按照更新时间排序,具体可以写什么请见JmMagicConstants
219+
order_by=JmMagicConstants.ORDER_BY_VIEW, # 按照观看数排序,具体可以写什么请见JmMagicConstants
220220
)
221221

222222
# 月排行,底层实现也是调的categories_filter

src/jmcomic/jm_client_impl.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def request_with_retry(self,
7878
)
7979

8080
if domain_index >= len(self.domain_list):
81-
return self.fallback(request, url, domain_index, retry_count, **kwargs)
81+
return self.fallback(request, url, domain_index, retry_count, is_image, **kwargs)
8282

8383
url_backup = url
8484

@@ -116,9 +116,9 @@ def request_with_retry(self,
116116
self.before_retry(e, kwargs, retry_count, url)
117117

118118
if retry_count < self.retry_times:
119-
return self.request_with_retry(request, url_backup, domain_index, retry_count + 1, **kwargs)
119+
return self.request_with_retry(request, url_backup, domain_index, retry_count + 1, is_image, **kwargs)
120120
else:
121-
return self.request_with_retry(request, url_backup, domain_index + 1, 0, **kwargs)
121+
return self.request_with_retry(request, url_backup, domain_index + 1, 0, is_image, **kwargs)
122122

123123
# noinspection PyMethodMayBeStatic
124124
def raise_if_resp_should_retry(self, resp, is_image):
@@ -206,7 +206,7 @@ def set_domain_list(self, domain_list: List[str]):
206206
self.domain_list = domain_list
207207

208208
# noinspection PyUnusedLocal
209-
def fallback(self, request, url, domain_index, retry_count, **kwargs):
209+
def fallback(self, request, url, domain_index, retry_count, is_image, **kwargs):
210210
msg = f"请求重试全部失败: [{url}], {self.domain_list}"
211211
jm_log('req.fallback', msg)
212212
ExceptionTool.raises(msg, {}, RequestRetryAllFailException)
@@ -1054,11 +1054,11 @@ def update_api_domain(self):
10541054
break
10551055
except Exception as e:
10561056
jm_log('api.update_domain.error',
1057-
f'自动更新API域名失败,仍使用jmcomic内置域名。'
1057+
f'通过[{url}]自动更新API域名失败,仍使用jmcomic内置域名。'
10581058
f'可通过代码[JmModuleConfig.FLAG_API_CLIENT_AUTO_UPDATE_DOMAIN=False]关闭自动更新API域名. 异常: {e}'
10591059
)
1060-
finally:
1061-
JmModuleConfig.FLAG_API_CLIENT_AUTO_UPDATE_DOMAIN_DONE = True
1060+
# set done finally
1061+
JmModuleConfig.FLAG_API_CLIENT_AUTO_UPDATE_DOMAIN_DONE = True
10621062

10631063
client_init_cookies_lock = Lock()
10641064

src/jmcomic/jm_plugin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,6 +1229,7 @@ def invoke(self,
12291229
def hook_new_jm_client(*args, **kwargs):
12301230
client: AbstractJmClient = new_jm_client(*args, **kwargs)
12311231
client.domain_retry_strategy = self.request_with_retry
1232+
return client
12321233

12331234
self.option.new_jm_client = hook_new_jm_client
12341235

0 commit comments

Comments
 (0)