diff --git a/backup.py b/backup.py index 27cd924..1cfeb94 100644 --- a/backup.py +++ b/backup.py @@ -12,6 +12,7 @@ location = os.environ.get("config", "config.yaml") # Set yaml config as conf conf = config.importConfig(location) +# Import Standalone Arguments args = conf["args"] diff --git a/modules/config.py b/modules/config.py index e0c04f1..3d576d3 100644 --- a/modules/config.py +++ b/modules/config.py @@ -16,14 +16,19 @@ def importConfig(filename): conf["databases"][database]["excluded_tables"] = 0 if not conf["databases"][database].get("driver", None): conf["databases"][database]["driver"] = "postgres" - if not conf["args"].get("backup_interval", None): - conf["args"]["backup_interval"] = -1 - if not conf["args"].get("backup_count", None): - conf["args"]["backup_count"] = -1 - if not conf["args"].get("backup_location", None): - conf["args"]["backup_location"] = str(os.getcwd())+"/Backups" - if not conf["args"].get("tz", None): - conf["args"]["tz"] = 'America/New_York' + else: + print("No Databases Provided, exiting...") + error.exit_program() + if not conf.get("args", None): + conf["args"] = {} + if not conf["args"].get("backup_interval", None): + conf["args"]["backup_interval"] = -1 + if not conf["args"].get("backup_count", None): + conf["args"]["backup_count"] = -1 + if not conf["args"].get("backup_location", None): + conf["args"]["backup_location"] = str(os.getcwd())+"/Backups" + if not conf["args"].get("tz", None): + conf["args"]["tz"] = 'America/New_York' else: print("databases Keyword is necessary to add a database") return conf diff --git a/modules/error.py b/modules/error.py index c71bc0b..d917bfb 100644 --- a/modules/error.py +++ b/modules/error.py @@ -1,10 +1,10 @@ # Contains errors for program -# import sys -# -# def exit_program(): -# print("Exiting the program...") -# sys.exit(0) +import sys + +def exit_program(): + print("Exiting the program...") + sys.exit(0) class SQLServerError(Exception): def __init__(self, message=None):