From fcc3ce60bcfa57734a51723717fe681ee4bf1327 Mon Sep 17 00:00:00 2001
From: Frederick Yin <fkfd@fkfd.me>
Date: Sat, 5 Feb 2022 16:39:41 +0800
Subject: Config format switched to .ini

Eliminated toml from dependency list
---
 jimbrella/config.py | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

(limited to 'jimbrella/config.py')

diff --git a/jimbrella/config.py b/jimbrella/config.py
index 81e5d09..0759f50 100644
--- a/jimbrella/config.py
+++ b/jimbrella/config.py
@@ -1,30 +1,12 @@
+from configparser import ConfigParser
 import os
 from pathlib import Path
-import toml
 
 config_path = (
     os.environ["JIMBRELLA_CONFIG"]
     if "JIMBRELLA_CONFIG" in os.environ
-    else "/opt/jimbrella/config.toml"
+    else "/opt/jimbrella/config.ini"
 )
 
-f = open(config_path)
-config = toml.load(f)
-f.close()
-
-JIMBRELLA_DIR = Path(config["jimbrella_dir"])
-
-FLASK_SECRET_KEY = config["flask"]["secret_key"]
-
-ACCEPT_NEW_USERS = config["user"]["accept_new_users"]
-
-JFORM_TAKEAWAY_URL = config["jform"]["takeaway_url"]
-JFORM_GIVEBACK_URL = config["jform"]["giveback_url"]
-JFORM_BOOKMARK_DIR = JIMBRELLA_DIR / Path(config["jform"]["bookmark_dir"])
-
-DATABASE_PATH = JIMBRELLA_DIR / Path(config["db"]["db_path"])
-
-DUE_HOURS = config["rules"]["due_hours"]
-
-LOG_PATH = JIMBRELLA_DIR / Path(config["logging"]["log_path"])
-ADMIN_LOG_PATH = JIMBRELLA_DIR / Path(config["logging"]["admin_log_path"])
+config = ConfigParser()
+config.read(config_path)
-- 
cgit v1.2.3