Modify: Simply Storyline config

This commit is contained in:
yoshiko2
2022-11-24 01:29:38 +08:00
parent 92142f8f7a
commit 65e3cf98b0
2 changed files with 16 additions and 16 deletions

View File

@@ -108,9 +108,9 @@ switch=1
; xcity和amazon是日语的由于amazon商城没有番号信息选中对应DVD的准确率仅99.6%。如果三个列表全部为空则不查询, ; xcity和amazon是日语的由于amazon商城没有番号信息选中对应DVD的准确率仅99.6%。如果三个列表全部为空则不查询,
; 设置成不查询可大幅提高刮削速度。 ; 设置成不查询可大幅提高刮削速度。
; site= ; site=
site=1:avno1,4:airavwiki site = airav,avno1,airavwiki
censored_site=2:airav,5:xcity,6:amazon censored_site = airav,avno1,xcity,amazon
uncensored_site=3:58avgo uncensored_site = 58avgo
; 运行模式0:顺序执行(最慢) 1:线程池(默认值) 2:进程池(启动开销比线程池大,并发站点越多越快) ; 运行模式0:顺序执行(最慢) 1:线程池(默认值) 2:进程池(启动开销比线程池大,并发站点越多越快)
run_mode=1 run_mode=1
; show_result剧情简介调试信息 0关闭 1简略 2详细(详细部分不记入日志)剧情简介失效时可打开2查看原因 ; show_result剧情简介调试信息 0关闭 1简略 2详细(详细部分不记入日志)剧情简介失效时可打开2查看原因

View File

@@ -43,22 +43,22 @@ class noThread(object):
def getStoryline(number, title=None, sites: list=None, uncensored=None, proxies=None, verify=None): def getStoryline(number, title=None, sites: list=None, uncensored=None, proxies=None, verify=None):
start_time = time.time() start_time = time.time()
debug = False debug = False
storyine_sites = "1:avno1,4:airavwiki".split(',') storyine_sites = config.getInstance().storyline_site().split(",") # "1:airav,4:airavwiki".split(',')
if uncensored: if uncensored:
storyine_sites += "3:58avgo".split(',') storyine_sites = config.getInstance().storyline_uncensored_site().split(
",") + storyine_sites # "3:58avgo".split(',')
else: else:
storyine_sites += "2:airav,5:xcity".split(',') storyine_sites = config.getInstance().storyline_censored_site().split(
",") + storyine_sites # "2:airav,5:xcity".split(',')
r_dup = set() r_dup = set()
sort_sites = [] sort_sites = []
for s in storyine_sites: for s in storyine_sites:
ns = re.sub(r'.*?:', '', s, re.A) if s in G_registered_storyline_site and s not in r_dup:
if ns in G_registered_storyline_site and ns not in r_dup:
sort_sites.append(s) sort_sites.append(s)
r_dup.add(ns) r_dup.add(s)
sort_sites.sort() # sort_sites.sort()
apply_sites = [re.sub(r'.*?:', '', s, re.A) for s in sort_sites] mp_args = ((site, number, title, debug, proxies, verify) for site in sort_sites)
mp_args = ((site, number, title, debug, proxies, verify) for site in apply_sites) cores = min(len(sort_sites), os.cpu_count())
cores = min(len(apply_sites), os.cpu_count())
if cores == 0: if cores == 0:
return '' return ''
run_mode = 1 run_mode = 1
@@ -67,16 +67,16 @@ def getStoryline(number, title=None, sites: list=None, uncensored=None, proxies=
sel = '' 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(sort_sites)}个任务共耗时(含启动开销){time.time() - start_time:.3f}秒,结束于{time.strftime("%H:%M:%S")}'
sel_site = '' sel_site = ''
for site, desc in zip(apply_sites, results): for site, desc in zip(sort_sites, results):
if isinstance(desc, str) and len(desc): if isinstance(desc, str) and len(desc):
if not is_japanese(desc): if not is_japanese(desc):
sel_site, sel = site, desc sel_site, sel = site, desc
break break
if not len(sel_site): if not len(sel_site):
sel_site, sel = site, desc sel_site, sel = site, desc
for site, desc in zip(apply_sites, results): for site, desc in zip(sort_sites, results):
sl = len(desc) if isinstance(desc, str) else 0 sl = len(desc) if isinstance(desc, str) else 0
s += f'[选中{site}字数:{sl}]' if site == sel_site else f'{site}字数:{sl}' if sl else f'{site}:空' s += f'[选中{site}字数:{sl}]' if site == sel_site else f'{site}字数:{sl}' if sl else f'{site}:空'
if config.getInstance().debug(): if config.getInstance().debug():