parker/guava
parker/guava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix support for environment variables

Browse Source
This commit is contained in:
Parker M. 2024-06-26 18:41:37 -05:00
parent 88c545b96f
commit e276ef9486
No known key found for this signature in database
GPG Key ID: 95CD2E0C7E329F2A
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/bot.py
View File

@ -57,6 +57,5 @@ async def get_access_token():
if __name__ == "__main__": if __name__ == "__main__":
config_contents = config.load_config() config.load_config()
config.validate_config(config_contents)
bot.run(config.TOKEN) bot.run(config.TOKEN)

14
code/config.py
View File

@ -45,12 +45,15 @@ create a new templated config.ini file if it doesn't exist.
def load_config(): def load_config():
# Look for variables in the environment # Look for variables in the environment
if "TOKEN" in os.environ or "BOT_COLOR" in os.environ or "BOT_INVITE_LINK" in os.environ: if "TOKEN" in os.environ or "BOT_COLOR" in os.environ or "BOT_INVITE_LINK" in os.environ:
LOG.info("Detected environment variables. Checking for configuration options.")
validate_env_vars() validate_env_vars()
else:
LOG.info("Detected local environment. Checking for config.ini file.")
try: try:
with open("config.ini", "r") as f: with open("config.ini", "r") as f:
file_contents = f.read() file_contents = f.read()
return file_contents validate_config(file_contents)
except FileNotFoundError: except FileNotFoundError:
config = configparser.ConfigParser() config = configparser.ConfigParser()
@ -221,25 +224,26 @@ def validate_env_vars():
BOT_INVITE_LINK = os.environ["BOT_INVITE_LINK"] BOT_INVITE_LINK = os.environ["BOT_INVITE_LINK"]
# Make sure FEEDBACK_CHANNEL_ID is either None or 19 characters long # Make sure FEEDBACK_CHANNEL_ID is either None or 19 characters long
if os.environ["FEEDBACK_CHANNEL_ID"] is not None: try:
if len(os.environ["FEEDBACK_CHANNEL_ID"]) != 19: if len(os.environ["FEEDBACK_CHANNEL_ID"]) != 19:
LOG.error("FEEDBACK_CHANNEL_ID is not a valid Discord channel ID.") LOG.error("FEEDBACK_CHANNEL_ID is not a valid Discord channel ID.")
errors += 1 errors += 1
else: else:
FEEDBACK_CHANNEL_ID = int(os.environ["FEEDBACK_CHANNEL_ID"]) FEEDBACK_CHANNEL_ID = int(os.environ["FEEDBACK_CHANNEL_ID"])
else: except KeyError:
FEEDBACK_CHANNEL_ID = None FEEDBACK_CHANNEL_ID = None
# Make sure BUG_CHANNEL_ID is either None or 19 characters long # Make sure BUG_CHANNEL_ID is either None or 19 characters long
if os.environ["BUG_CHANNEL_ID"] is not None: try:
if len(os.environ["BUG_CHANNEL_ID"]) != 19: if len(os.environ["BUG_CHANNEL_ID"]) != 19:
LOG.error("BUG_CHANNEL_ID is not a valid Discord channel ID.") LOG.error("BUG_CHANNEL_ID is not a valid Discord channel ID.")
errors += 1 errors += 1
else: else:
BUG_CHANNEL_ID = int(os.environ["BUG_CHANNEL_ID"]) BUG_CHANNEL_ID = int(os.environ["BUG_CHANNEL_ID"])
else: except KeyError:
BUG_CHANNEL_ID = None BUG_CHANNEL_ID = None
# Assign the rest of the variables # Assign the rest of the variables
TOKEN = os.environ["TOKEN"] TOKEN = os.environ["TOKEN"]
SPOTIFY_CLIENT_ID = os.environ["SPOTIFY_CLIENT_ID"] SPOTIFY_CLIENT_ID = os.environ["SPOTIFY_CLIENT_ID"]