diff --git a/scripts/get_config.py b/scripts/get_config.py index 1ac0889c..64ad0d47 100644 --- a/scripts/get_config.py +++ b/scripts/get_config.py @@ -1,10 +1,11 @@ import os import argparse import sys +import shutil # The config file is in the same directory as this script config_directory = os.path.dirname(__file__) -config_yaml = os.path.join(config_directory, "config.yaml") +config_yaml = os.path.join(config_directory, "..", "config.yaml") config_json = os.path.join(config_directory, "config.json") parser = argparse.ArgumentParser(description='Get values from config file') @@ -15,6 +16,10 @@ parser.add_argument('key', metavar='key', nargs='+', args = parser.parse_args() +# migrate the old config yaml location +config_legacy_yaml = os.path.join(config_directory, "config.yaml") +if os.path.isfile(config_legacy_yaml): + shutil.move(config_legacy_yaml, config_yaml) if os.path.isfile(config_yaml): from ruamel.yaml import YAML diff --git a/ui/easydiffusion/app.py b/ui/easydiffusion/app.py index 26bbba45..949ed60d 100644 --- a/ui/easydiffusion/app.py +++ b/ui/easydiffusion/app.py @@ -102,7 +102,13 @@ def init(): def getConfig(default_val=APP_CONFIG_DEFAULTS): - config_yaml_path = os.path.join(CONFIG_DIR, "config.yaml") + config_yaml_path = os.path.join(CONFIG_DIR, "..", "config.yaml") + + # migrate the old config yaml location + config_legacy_yaml = os.path.join(CONFIG_DIR, "config.yaml") + if os.path.isfile(config_legacy_yaml): + shutil.move(config_legacy_yaml, config_yaml_path) + if os.path.isfile(config_yaml_path): try: yaml = YAML() @@ -143,7 +149,7 @@ def getConfig(default_val=APP_CONFIG_DEFAULTS): def setConfig(config): try: # config.yaml - config_yaml_path = os.path.join(CONFIG_DIR, "config.yaml") + config_yaml_path = os.path.join(CONFIG_DIR, "..", "config.yaml") yaml = YAML() if not hasattr(config, "_yaml_comment"):