新增-w --website参数,使用将覆盖配置文件[priority]website=

This commit is contained in:
lededev
2022-04-14 04:20:57 +08:00
parent fa9c690e60
commit 2bd294f1bd
2 changed files with 6 additions and 2 deletions

View File

@@ -72,6 +72,8 @@ def argparse_function(ver: str) -> typing.Tuple[str, str, str, str, bool, bool]:
help="Turn on debug mode to generate diagnostic log for issue report.") help="Turn on debug mode to generate diagnostic log for issue report.")
parser.add_argument("-N", "--no-network-operation", action="store_true", parser.add_argument("-N", "--no-network-operation", action="store_true",
help="No network query, do not get metadata, for cover cropping purposes, only takes effect when main mode is 3.") help="No network query, do not get metadata, for cover cropping purposes, only takes effect when main mode is 3.")
parser.add_argument("-w", "--website", dest='site', default='', nargs='?',
help="Override [priority]website= in config.")
parser.add_argument("-z", "--zero-operation", dest='zero_op', action="store_true", parser.add_argument("-z", "--zero-operation", dest='zero_op', action="store_true",
help="""Only show job list of files and numbers, and **NO** actual operation help="""Only show job list of files and numbers, and **NO** actual operation
is performed. It may help you correct wrong numbers before real job.""") is performed. It may help you correct wrong numbers before real job.""")
@@ -97,6 +99,7 @@ is performed. It may help you correct wrong numbers before real job.""")
config.G_conf_override["common:ignore_failed_list"] = get_bool_or_none(args.ignore_failed_list) config.G_conf_override["common:ignore_failed_list"] = get_bool_or_none(args.ignore_failed_list)
config.G_conf_override["debug_mode:switch"] = get_bool_or_none(args.debug) config.G_conf_override["debug_mode:switch"] = get_bool_or_none(args.debug)
config.G_conf_override["common:rerun_delay"] = get_str_or_none(args.delaytm) config.G_conf_override["common:rerun_delay"] = get_str_or_none(args.delaytm)
config.G_conf_override["priority:website"] = get_str_or_none(args.site)
no_net_op = False no_net_op = False
if conf.main_mode() == 3: if conf.main_mode() == 3:

View File

@@ -19,7 +19,8 @@ G_conf_override = {
"common:ignore_failed_list": None, "common:ignore_failed_list": None,
"common:rerun_delay": None, "common:rerun_delay": None,
"debug_mode:switch": None, "debug_mode:switch": None,
"face:aways_imagecut": None "face:aways_imagecut": None,
"priority:website" : None
} }
@@ -287,7 +288,7 @@ class Config:
self._exit("update:update_check") self._exit("update:update_check")
def sources(self) -> str: def sources(self) -> str:
return self.conf.get("priority", "website") return self.get_override("priority", "website")
def escape_literals(self) -> str: def escape_literals(self) -> str:
return self.conf.get("escape", "literals") return self.conf.get("escape", "literals")