countdown-bot

commit e3d73841ae005509f3bb3fa91467d3d17004cf48
parent 197cfaececf5cc89f54017d3e3163291dc4a352e
Author: ashermorgan <59518073+ashermorgan@users.noreply.github.com>
Date:   Fri, 25 Jun 2021 16:10:38 -0700

Implement database location setting

Diffstat:
M
.gitignore
 | 
3
++-
M
bot.py
 | 
58
+++++++++++++++++++++++++++++-----------------------------
M
setup.py
 | 
3
++-

3 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .venv
 settings.json
-data.db
+*.db
+*.sqlite3
diff --git a/bot.py b/bot.py
@@ -15,8 +15,36 @@ import tempfile
 
 
 
+# Global variables
+settings = {}
+POINT_RULES = {
+    "1000s": 1000,
+    "1001s": 500,
+    "200s": 200,
+    "201s": 100,
+    "100s": 100,
+    "101s": 50,
+    "Prime Numbers": 15,
+    "Odd Numbers": 12,
+    "Even Numbers": 10,
+    "First Number": 0,
+}
+COLORS = {
+    "error": 0xD52C42,
+    "embed": 0x248AD1,
+}
+
+
+
+# Load settings
+with open(os.path.join(os.path.dirname(__file__), "settings.json"), "a+") as f:
+    f.seek(0)
+    settings = json.load(f)
+
+
+
 # Connect to database
-engine = create_engine("sqlite:///data.db")
+engine = create_engine(settings["database"])
 
 # Define tables
 Base = declarative_base()
@@ -319,27 +347,6 @@ Session = sessionmaker(bind=engine)
 
 
 
-# Global variables
-settings = {}
-POINT_RULES = {
-    "1000s": 1000,
-    "1001s": 500,
-    "200s": 200,
-    "201s": 100,
-    "100s": 100,
-    "101s": 50,
-    "Prime Numbers": 15,
-    "Odd Numbers": 12,
-    "Even Numbers": 10,
-    "First Number": 0,
-}
-COLORS = {
-    "error": 0xD52C42,
-    "embed": 0x248AD1,
-}
-
-
-
 # Error classes
 class MessageNotAllowedError(Exception):
     """Raised when someone posts twice in a row."""
@@ -570,13 +577,6 @@ async def loadCountdown(bot, countdown):
 
 
 
-# Load countdown settings
-with open(os.path.join(os.path.dirname(__file__), "settings.json"), "a+") as f:
-    f.seek(0)
-    settings = json.load(f)
-
-
-
 # Create Discord bot
 bot = commands.Bot(command_prefix=getPrefix, case_insensitive=True)
 bot.remove_command("help")
diff --git a/setup.py b/setup.py
@@ -6,6 +6,7 @@ import os
 with open(os.path.join(os.path.dirname(__file__), "settings.json"), "w") as f:
     data = {
         "token": "YOUR_TOKEN_HERE",
-        "prefixes": ["c."]
+        "prefixes": ["c."],
+        "database": "sqlite:///data.sqlite3"
     }
     json.dump(data, f)