storyline:Japanese results should not be the highest priority

This commit is contained in:
lededev
2021-11-05 03:19:26 +08:00
parent 92effe53b7
commit 744178d288

View File

@@ -53,25 +53,28 @@ def getStoryline(number, title, sites: list=None):
assert run_mode in (0,1,2) assert run_mode in (0,1,2)
with ThreadPool(cores) if run_mode == 1 else Pool(cores) if run_mode == 2 else noThread() as pool: with ThreadPool(cores) if run_mode == 1 else Pool(cores) if run_mode == 2 else noThread() as pool:
results = pool.map(getStoryline_mp, mp_args) results = pool.map(getStoryline_mp, mp_args)
sel = ''
if not debug and conf.storyline_show() == 0: if not debug and conf.storyline_show() == 0:
for value in results: for value in results:
if isinstance(value, str) and len(value): if isinstance(value, str) and len(value):
return value if not is_japanese(value):
return '' return value
if not len(sel):
sel = value
return sel
# 以下debug结果输出会写入日志进程池中的则不会只在标准输出中显示 # 以下debug结果输出会写入日志进程池中的则不会只在标准输出中显示
s = f'[!]Storyline{G_mode_txt[run_mode]}模式运行{len(apply_sites)}个任务共耗时(含启动开销){time.time() - start_time:.3f}秒,结束于{time.strftime("%H:%M:%S")}' s = f'[!]Storyline{G_mode_txt[run_mode]}模式运行{len(apply_sites)}个任务共耗时(含启动开销){time.time() - start_time:.3f}秒,结束于{time.strftime("%H:%M:%S")}'
first = True sel_site = ''
sel = ''
for site, desc in zip(apply_sites, results): for site, desc in zip(apply_sites, results):
sl = len(desc) if isinstance(desc, str) else 0 sl = len(desc) if isinstance(desc, str) else 0
if sl and first: if not is_japanese(desc):
s += f'[选中{site}字数:{sl}]' sel_site, sel = site, desc
first = False break
sel = desc if sl and not len(sel_site):
elif sl: sel_site, sel = site, desc
s += f'{site}字数:{sl}' for site, desc in zip(apply_sites, results):
else: sl = len(desc) if isinstance(desc, str) else 0
s += f'{site}:空' s += f'[选中{site}字数:{sl}]' if site == sel_site else f'{site}字数:{sl}' if sl else f'{site}:空'
print(s) print(s)
return sel return sel