diff --git a/VERSION b/VERSION index 596c2e58..9076d6d2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.1-develop60 +1.19.1-develop61 diff --git a/modules/imdb.py b/modules/imdb.py index 17bb8d7b..d753b323 100644 --- a/modules/imdb.py +++ b/modules/imdb.py @@ -342,11 +342,11 @@ class IMDb: if any([a in data for a in ["keyword", "keyword.any", "keyword.not"]]): out["keywordConstraint"] = {} if "keyword" in data: - out["keywordConstraint"]["allKeywords"] = data["keyword"] + out["keywordConstraint"]["allKeywords"] = [k.replace(" ", "-") for k in data["keyword"]] 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: - 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"]]): out["languageConstraint"] = {} diff --git a/modules/util.py b/modules/util.py index 8a4dc5bb..31691604 100644 --- a/modules/util.py +++ b/modules/util.py @@ -435,7 +435,7 @@ def load_files(files_to_load, method, err_type="Config", schedule=None, lib_vars current = [] def check_dict(attr, name): - if attr in file: + if attr in file and (method != "metadata_files" or attr != "pmm"): if file[attr]: if attr == "git" and file[attr].startswith("PMM/"): current.append(("PMM Default", file[attr][4:], temp_vars, asset_directory)) diff --git a/plex_meta_manager.py b/plex_meta_manager.py index b4b12d9e..9eb01535 100644 --- a/plex_meta_manager.py +++ b/plex_meta_manager.py @@ -26,7 +26,7 @@ arguments = { "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)"}, "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"}, "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"}, @@ -381,10 +381,9 @@ def run_config(config, stats): logger.info("") logger.separator("Run Again") logger.info("") - for x in range(1, config.general["run_again_delay"] + 1): - logger.ghost(f"Waiting to run again in {config.general['run_again_delay'] - x + 1} minutes") - for y in range(60): - time.sleep(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} minutes") + time.sleep(60) logger.exorcise() for library in config.libraries: if library.run_again: