[61] small fixes

pull/1788/head
meisnate12 10 months ago
parent 95b5efbd51
commit 977c6f73f5

@ -1 +1 @@
1.19.1-develop60 1.19.1-develop61

@ -342,11 +342,11 @@ class IMDb:
if any([a in data for a in ["keyword", "keyword.any", "keyword.not"]]): if any([a in data for a in ["keyword", "keyword.any", "keyword.not"]]):
out["keywordConstraint"] = {} out["keywordConstraint"] = {}
if "keyword" in data: if "keyword" in data:
out["keywordConstraint"]["allKeywords"] = data["keyword"] out["keywordConstraint"]["allKeywords"] = [k.replace(" ", "-") for k in data["keyword"]]
if "keyword.any" in data: if "keyword.any" in data:
out["keywordConstraint"]["anyKeywords"] = data["keyword.any"] out["keywordConstraint"]["anyKeywords"] = [k.replace(" ", "-") for k in data["keyword.any"]]
if "keyword.not" in data: if "keyword.not" in data:
out["keywordConstraint"]["excludeKeywords"] = data["keyword.not"] out["keywordConstraint"]["excludeKeywords"] = [k.replace(" ", "-") for k in data["keyword.not"]]
if any([a in data for a in ["language", "language.any", "language.not", "language.primary"]]): if any([a in data for a in ["language", "language.any", "language.not", "language.primary"]]):
out["languageConstraint"] = {} out["languageConstraint"] = {}

@ -435,7 +435,7 @@ def load_files(files_to_load, method, err_type="Config", schedule=None, lib_vars
current = [] current = []
def check_dict(attr, name): def check_dict(attr, name):
if attr in file: if attr in file and (method != "metadata_files" or attr != "pmm"):
if file[attr]: if file[attr]:
if attr == "git" and file[attr].startswith("PMM/"): if attr == "git" and file[attr].startswith("PMM/"):
current.append(("PMM Default", file[attr][4:], temp_vars, asset_directory)) current.append(("PMM Default", file[attr][4:], temp_vars, asset_directory))

@ -26,7 +26,7 @@ arguments = {
"config": {"args": "c", "type": "str", "help": "Run with desired *.yml file"}, "config": {"args": "c", "type": "str", "help": "Run with desired *.yml file"},
"times": {"args": ["t", "time"], "type": "str", "default": "05:00", "help": "Times to update each day use format HH:MM (Default: 05:00) (comma-separated list)"}, "times": {"args": ["t", "time"], "type": "str", "default": "05:00", "help": "Times to update each day use format HH:MM (Default: 05:00) (comma-separated list)"},
"run": {"args": "r", "type": "bool", "help": "Run without the scheduler"}, "run": {"args": "r", "type": "bool", "help": "Run without the scheduler"},
"tests": {"args": ["rt", "test", "run-test", "run-tests"], "type": "bool", "help": "Run in debug mode with only collections that have test: true"}, "tests": {"args": ["ts", "rt", "test", "run-test", "run-tests"], "type": "bool", "help": "Run in debug mode with only collections that have test: true"},
"debug": {"args": "db", "type": "bool", "help": "Run with Debug Logs Reporting to the Command Window"}, "debug": {"args": "db", "type": "bool", "help": "Run with Debug Logs Reporting to the Command Window"},
"trace": {"args": "tr", "type": "bool", "help": "Run with extra Trace Debug Logs"}, "trace": {"args": "tr", "type": "bool", "help": "Run with extra Trace Debug Logs"},
"log-requests": {"args": ["lr", "log-request"], "type": "bool", "help": "Run with all Requests printed"}, "log-requests": {"args": ["lr", "log-request"], "type": "bool", "help": "Run with all Requests printed"},
@ -381,10 +381,9 @@ def run_config(config, stats):
logger.info("") logger.info("")
logger.separator("Run Again") logger.separator("Run Again")
logger.info("") logger.info("")
for x in range(1, config.general["run_again_delay"] + 1): for x in range(0, config.general["run_again_delay"]):
logger.ghost(f"Waiting to run again in {config.general['run_again_delay'] - x + 1} minutes") logger.ghost(f"Waiting to run again in {config.general['run_again_delay'] - x} minutes")
for y in range(60): time.sleep(60)
time.sleep(1)
logger.exorcise() logger.exorcise()
for library in config.libraries: for library in config.libraries:
if library.run_again: if library.run_again:

Loading…
Cancel
Save