From 20c9acd455163a31207c32d0e482923c88c2c66d Mon Sep 17 00:00:00 2001
From: Oscar Hudson <hudso009@gmail.com>
Date: Sun, 9 Apr 2023 03:44:08 +0100
Subject: [PATCH] switch to dotenv

---
 .env.example |  8 ++++++++
 genNews.py   | 14 ++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 .env.example

diff --git a/.env.example b/.env.example
new file mode 100644
index 0000000..64d343e
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,8 @@
+# discord config
+DISCORD_TOKEN=fUnNyToKeN
+DISCORD_CHANNEL_ID=1234567890
+
+# ftp credentials
+FTP_HOST=ftp.example.com
+FTP_USERNAME=anonymous
+FTP_PASSWORD=anonymous
\ No newline at end of file
diff --git a/genNews.py b/genNews.py
index c0e0f05..48f7e8c 100644
--- a/genNews.py
+++ b/genNews.py
@@ -6,13 +6,13 @@
 import datetime
 import discord
 import asyncio
+import os
+from dotenv import load_dotenv
 
 async def sendDiscordUpdate(articleName, authorName):
     bot = discord.Client()
-    with open('privars.json', 'rt') as readEnv:
-        data = json.loads(readEnv.read()).get('Discord')
-        token = data.get('Token')
-        channelId = int(data.get('Channel'))
+    token = os.getenv("DISCORD_TOKEN")
+    channelId = int(os.getenv("DISCORD_CHANNEL_ID"))
 
     @bot.event
     async def on_ready():
@@ -62,10 +62,8 @@ def writeCurrentNews(title, author):
         writeNewsJson.write(json.dumps(newsData, indent=2))
 
 def uploadNewsFiles(fileName, fileObj):
-    with open('privars.json', 'rt') as readCredentials:
-        credentials = json.loads(readCredentials.read())['ftpDetails']
-    ftp = ftplib.FTP(credentials.get('host'))
-    ftp.login(user=credentials.get('user'), passwd=credentials.get('password'))
+    ftp = ftplib.FTP(os.getenv("FTP_HOST"))
+    ftp.login(user=os.getenv("FTP_USERNAME"), passwd=os.getenv("FTP_PASSWORD"))
     ftp.storbinary(f'STOR {fileName}', open(fileObj, 'rb'))
     print(f'Successfully transferred {fileName} to the server!')
     try: