extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2025-04-22 18:38:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move config.yaml to the root folder of ED

Browse Source
This commit is contained in:
cmdr2 2023-06-30 16:36:24 +05:30
parent 5a643c383b
commit d023fd07b0
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/get_config.py
View File

@ -1,10 +1,11 @@
import os import os
import argparse import argparse
import sys import sys
import shutil
# The config file is in the same directory as this script # The config file is in the same directory as this script
config_directory = os.path.dirname(__file__) 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") config_json = os.path.join(config_directory, "config.json")
parser = argparse.ArgumentParser(description='Get values from config file') parser = argparse.ArgumentParser(description='Get values from config file')
@ -15,6 +16,10 @@ parser.add_argument('key', metavar='key', nargs='+',
args = parser.parse_args() 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): if os.path.isfile(config_yaml):
from ruamel.yaml import YAML from ruamel.yaml import YAML

10
ui/easydiffusion/app.py
View File

@ -102,7 +102,13 @@ def init():
def getConfig(default_val=APP_CONFIG_DEFAULTS): 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): if os.path.isfile(config_yaml_path):
try: try:
yaml = YAML() yaml = YAML()
@ -143,7 +149,7 @@ def getConfig(default_val=APP_CONFIG_DEFAULTS):
def setConfig(config): def setConfig(config):
try: # config.yaml 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() yaml = YAML()
if not hasattr(config, "_yaml_comment"): if not hasattr(config, "_yaml_comment"):