From 49d2b56064180149c992686936d16f6563371e36 Mon Sep 17 00:00:00 2001
From: David Mossakowski <dmossakowski@gmail.com>
Date: Wed, 24 Jan 2024 19:26:28 +0100
Subject: [PATCH] David/20240124 test env a (#38)

clean up load_dotenv override any already loaded vars with new ones and fix order of loading env variables - 2h
---
 competitionsEngine.py |  5 -----
 main_app_ui.py        |  3 ---
 server.py             | 36 ++++++++++++++++++++++++++----------
 skala_api.py          |  3 ---
 skala_db.py           | 25 +++++++++++++++++++------
 5 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/competitionsEngine.py b/competitionsEngine.py
index 8f85e19..e7f71f3 100644
--- a/competitionsEngine.py
+++ b/competitionsEngine.py
@@ -39,11 +39,6 @@
 
 from functools import lru_cache, reduce
 import logging
-from dotenv import load_dotenv
-
-
-
-load_dotenv()
 
 DATA_DIRECTORY = os.getenv('DATA_DIRECTORY')
 
diff --git a/main_app_ui.py b/main_app_ui.py
index 732ac5a..9560e4a 100644
--- a/main_app_ui.py
+++ b/main_app_ui.py
@@ -29,7 +29,6 @@
     stream_with_context, copy_current_request_context, make_response
 
 import logging
-from dotenv import load_dotenv
 
 from flask import Blueprint
 import activities_db as activity_engine
@@ -62,8 +61,6 @@
 
 languages = {}
 
-load_dotenv()
-
 DATA_DIRECTORY = os.getenv('DATA_DIRECTORY')
 
 if DATA_DIRECTORY is None:
diff --git a/server.py b/server.py
index e2c7643..ec3af3f 100644
--- a/server.py
+++ b/server.py
@@ -18,10 +18,29 @@
 import base64
 import io
 import urllib
+import os
+import traceback
+import time
+import datetime
+import threading
+import random
+
 from functools import wraps
 
 #import fastapi_test  
 from dotenv import load_dotenv
+load_dotenv(override=True)
+
+DATA_DIRECTORY = os.getenv('DATA_DIRECTORY')
+
+print("server DATA_DIRECTORY="+str(DATA_DIRECTORY))
+
+if DATA_DIRECTORY is None:
+    DATA_DIRECTORY = os.getcwd()
+elif not os.path.exists(DATA_DIRECTORY):
+    print("DATA_DIRECTORY does not exist. Creating it"+str(DATA_DIRECTORY))
+    os.makedirs(DATA_DIRECTORY)
+
 from flask import Flask, redirect, url_for, session, request, render_template, send_file, jsonify, Response, \
     stream_with_context, copy_current_request_context
 
@@ -31,13 +50,9 @@
 import requests
 import json
 
-import os
-import traceback
-import time
-import datetime
-import threading
-import random
 import logging
+
+
 from main_app_ui import app_ui, languages
 from skala_api import skala_api_app
 import competitionsEngine
@@ -57,9 +72,6 @@
 
 #from flask_openapi3 import OpenAPI, Info, Tag
 
-
-
-load_dotenv()
 # https://docs.authlib.org/en/latest/flask/2/index.html#flask-oauth2-server
 # If you are developing on your localhost, remember to set the environment variable:
 # export AUTHLIB_INSECURE_TRANSPORT=true
@@ -68,9 +80,12 @@
 
 DATA_DIRECTORY = os.getenv('DATA_DIRECTORY')
 
+print("server DATA_DIRECTORY="+str(DATA_DIRECTORY))
+
 if DATA_DIRECTORY is None:
     DATA_DIRECTORY = os.getcwd()
-    
+
+
 # Configuration
 GOOGLE_CLIENT_ID = os.getenv("GOOGLE_CLIENT_ID", None)
 GOOGLE_CLIENT_SECRET = os.getenv("GOOGLE_CLIENT_SECRET", None)
@@ -184,6 +199,7 @@ def init_logging(log_file=None, append=False, console_loglevel=logging.INFO):
             filemode_val = 'a'
         else:
             filemode_val = 'w'
+        
         logging.basicConfig(level=logging.DEBUG,
                             format="%(asctime)s %(levelname)s %(threadName)s %(name)s %(message)s",
                             # datefmt='%m-%d %H:%M',
diff --git a/skala_api.py b/skala_api.py
index 17d9920..a353a16 100644
--- a/skala_api.py
+++ b/skala_api.py
@@ -30,7 +30,6 @@
     stream_with_context, copy_current_request_context, g
 
 import logging
-from dotenv import load_dotenv
 
 from flask import Blueprint
 import activities_db as activities_db
@@ -72,8 +71,6 @@
 
 languages = {}
 
-load_dotenv()
-
 grades = ['1', '2', '3', '4a', '4b', '4c', '5a','5a+', '5b', '5c','5c+', '6a', '6a+', '6b', '6b+', '6c', '6c+', '7a', '7a+', '7b', '7b+', '7c', '7c+', '8a', '8a+', '8b', '8b+', '8c', '8c+', '9a', '9a+', '9b', '9b+', '9c']
     
 
diff --git a/skala_db.py b/skala_db.py
index 437ae9f..29092e7 100644
--- a/skala_db.py
+++ b/skala_db.py
@@ -24,12 +24,9 @@
 #    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 from collections import Counter
-import tracemalloc
 import sqlite3 as lite
 import uuid
-import copy
 from threading import RLock
-import csv
 
 import requests
 
@@ -38,12 +35,27 @@
     stream_with_context, copy_current_request_context
 
 import logging
-from dotenv import load_dotenv
+
+DATA_DIRECTORY = os.getenv('DATA_DIRECTORY')
+
+print("DATA_DIRECTORY="+str(DATA_DIRECTORY))
+
+SPOTIFY_APP_ID = os.getenv('SPOTIFY_APP_ID')
+
+print("SPOTIFY_APP_ID="+str(SPOTIFY_APP_ID))
+
+
+ENV_VAR = os.getenv('ENV_VAR')
+
+print("ENV_VAR="+str(ENV_VAR))
+
+
+LINKED_VAR = os.getenv('LINKED_VAR')
+
+print("LINKED_VAR="+str(LINKED_VAR))
 
 
-load_dotenv()
 
-DATA_DIRECTORY = os.getenv('DATA_DIRECTORY')
 
 if DATA_DIRECTORY is None:
     DATA_DIRECTORY = os.getcwd()
@@ -64,6 +76,7 @@
 def init():
     logging.info('initializing skala_db...')
 
+
     if not os.path.exists(DATA_DIRECTORY):
         os.makedirs(DATA_DIRECTORY)