github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-22 22:43:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

fix env errors

Browse source
This commit is contained in:
hay-kot 2021-03-30 11:12:59 -08:00
commit bfcfeb525d
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
mealie/core/config.py
View file

@ -23,11 +23,11 @@ def determine_data_dir(production: bool) -> Path:
return CWD.parent.parent.joinpath("dev", "data") return CWD.parent.parent.joinpath("dev", "data")
def determine_secrets(production: bool) -> str: def determine_secrets(data_dir: Path, production: bool) -> str:
if not production: if not production:
return "shh-secret-test-key" return "shh-secret-test-key"
secrets_file = DATA_DIR.joinpath(".secret") secrets_file = data_dir.joinpath(".secret")
if secrets_file.is_file(): if secrets_file.is_file():
with open(secrets_file, "r") as f: with open(secrets_file, "r") as f:
return f.read() return f.read()
@ -40,6 +40,7 @@ def determine_secrets(production: bool) -> str:
class AppDirectories: class AppDirectories:
def __init__(self, cwd, data_dir) -> None: def __init__(self, cwd, data_dir) -> None:
self.DATA_DIR = data_dir
self.WEB_PATH = cwd.joinpath("dist") self.WEB_PATH = cwd.joinpath("dist")
self.IMG_DIR = data_dir.joinpath("img") self.IMG_DIR = data_dir.joinpath("img")
self.BACKUP_DIR = data_dir.joinpath("backups") self.BACKUP_DIR = data_dir.joinpath("backups")
@ -78,10 +79,10 @@ class AppSettings:
global DB_VERSION global DB_VERSION
self.PRODUCTION = bool(os.environ.get("ENV")) self.PRODUCTION = bool(os.environ.get("ENV"))
self.API_PORT = int(os.getenv("API_PORT", 9000)) self.API_PORT = int(os.getenv("API_PORT", 9000))
self.API = bool(os.getenv("API_DOCS", True)) self.API = os.getenv("API_DOCS", "False") == "True"
self.DOCS_URL = "/docs" if self.API else None self.DOCS_URL = "/docs" if self.API else None
self.REDOC_URL = "/redoc" if self.API else None self.REDOC_URL = "/redoc" if self.API else None
self.SECRET = determine_secrets(self.PRODUCTION) self.SECRET = determine_secrets(app_dirs.DATA_DIR, self.PRODUCTION)
self.DATABASE_TYPE = os.getenv("DB_TYPE", "sqlite") self.DATABASE_TYPE = os.getenv("DB_TYPE", "sqlite")
# Used to Set SQLite File Version # Used to Set SQLite File Version
@ -89,7 +90,7 @@ class AppSettings:
if self.DATABASE_TYPE == "sqlite": if self.DATABASE_TYPE == "sqlite":
self.SQLITE_FILE = app_dirs.SQLITE_DIR.joinpath(f"mealie_{DB_VERSION}.sqlite") self.SQLITE_FILE = app_dirs.SQLITE_DIR.joinpath(f"mealie_{DB_VERSION}.sqlite")
else: else:
raise Exception("Unable to determine database type. Acceptible options are 'sqlite' ") raise Exception("Unable to determine database type. Acceptible options are 'sqlite'")
self.DEFAULT_GROUP = os.getenv("DEFAULT_GROUP", "Home") self.DEFAULT_GROUP = os.getenv("DEFAULT_GROUP", "Home")
self.DEFAULT_PASSWORD = os.getenv("DEFAULT_PASSWORD", "MyPassword") self.DEFAULT_PASSWORD = os.getenv("DEFAULT_PASSWORD", "MyPassword")