diff --git a/api/directus.py b/api/directus.py index 13a45e0..1c9bd4d 100644 --- a/api/directus.py +++ b/api/directus.py @@ -4,8 +4,9 @@ import requests class DirectusAPI: - def __init__(self, config): - self.config = config + def __init__(self, base_url, access_token): + self.base_url = base_url + self.access_token = access_token def __get_raw(self, endpoint, params = None): if params is None: @@ -13,12 +14,12 @@ class DirectusAPI: for k in params.keys(): if type(params[k]) is dict: params[k] = json.dumps(params[k]) - url = self.config.base_url + endpoint + url = self.base_url + endpoint result = requests.get( url, params = params, headers = { - "Authorization": f"Bearer {self.config.access_token}", + "Authorization": f"Bearer {self.access_token}", "Cache-Control": "no-store" } ) diff --git a/build.py b/build.py index ee88e46..bb2d628 100644 --- a/build.py +++ b/build.py @@ -4,7 +4,8 @@ import src.config as config import src.download as download conf = config.Config() -api = directus.DirectusAPI(conf) +api = directus.DirectusAPI(conf.question_base_url, conf.question_access_token) +content_api = directus.DirectusAPI(conf.content_base_url, conf.content_access_token) dl = download.Download(api, conf) bd = build.Build() diff --git a/src/config.py b/src/config.py index ae69389..ef1f6c2 100644 --- a/src/config.py +++ b/src/config.py @@ -13,8 +13,10 @@ class Config: with open("config/config.json") as file: self.config = json.load(file) - self.access_token = self.get_config_value("directus_api_key") - self.base_url = self.get_config_value("directus_api_url", "https://fragenkatalog.darc.de/") + self.question_access_token = self.get_config_value("directus_question_api_key") + self.question_base_url = self.get_config_value("directus_question_base_url", "https://fragenkatalog.darc.de/") + self.content_access_token = self.get_config_value("directus_content_api_key") + self.content_base_url = self.get_config_value("directus_content_base_url", "https://redaktion.50ohm.de/") self.no_latex = self.get_config_value("no_latex", False) def get_config_value(self, key: str, default=None):