diff --git a/api/directus.py b/api/directus.py deleted file mode 100644 index 0258fcf..0000000 --- a/api/directus.py +++ /dev/null @@ -1,56 +0,0 @@ -import json - -import requests - - -class DirectusAPI: - 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: - params = {} - for k in params.keys(): - if type(params[k]) is dict: - params[k] = json.dumps(params[k]) - url = self.base_url + endpoint - result = requests.get( - url, params=params, headers={"Authorization": f"Bearer {self.access_token}", "Cache-Control": "no-store"} - ) - return result - - def get(self, endpoint, params=None): - if params is None: - params = {} - result = self.__get_raw(endpoint, params) - try: - result_json = result.json() - if "errors" in result_json.keys(): - print(result_json["errors"]) - raise Exception("Error communicating with API") - data = result_json["data"] - except Exception as e: - print(f"Error: {e}") - return None - return data - - def get_one(self, endpoint, params=None): - if params is None: - params = {} - results = self.get(endpoint, params) - if len(results) == 1: - return results[0] - elif len(results) == 0: - return None - else: - raise Exception("One result expected, but got more than one result") - - def get_file(self, endpoint, params=None): - if params is None: - params = {} - result = self.__get_raw(endpoint, params) - data = result.content - if data is None: - raise Exception("No data from API") - return data diff --git a/build.py b/build.py index 26f86b8..32c13fb 100644 --- a/build.py +++ b/build.py @@ -1,11 +1,9 @@ -import api.directus as directus import src.build as build import src.config as config import src.download as download conf = config.Config() -content_api = directus.DirectusAPI(conf.content_base_url, conf.content_access_token) -dl = download.Download(content_api, conf) +dl = download.Download(conf) # Download the content files: dl.download_git_content() diff --git a/src/download.py b/src/download.py index 9a43a06..db99f7c 100644 --- a/src/download.py +++ b/src/download.py @@ -1,14 +1,11 @@ from git import Repo -from api.directus import DirectusAPI - from .config import Config class Download: - def __init__(self, content_api: DirectusAPI, config: Config): + def __init__(self, config: Config): self.config = config - self.content_api = content_api def download_git_content(self): repo_path = self.config.p_data / "git_content"