aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParker <contact@pkrm.dev>2025-01-21 21:06:33 -0600
committerParker <contact@pkrm.dev>2025-01-21 21:06:33 -0600
commit13ee0683582498cedc66d2e3a14cb32510392135 (patch)
tree045c5d517bcdf7cd0a015e280f0490c8f4b39c49
parentb0ea7ab93564f1b2f004f7ea74783508f12f4ff6 (diff)
Fix database creation
-rw-r--r--code/bot.py12
-rw-r--r--code/cogs/newaccount.py10
-rw-r--r--code/utils/database.py4
3 files changed, 15 insertions, 11 deletions
diff --git a/code/bot.py b/code/bot.py
index b067f73..919f394 100644
--- a/code/bot.py
+++ b/code/bot.py
@@ -1,5 +1,5 @@
import discord
-from discord.ext import commands
+from discord.ext import commands, tasks
import os
from utils.database import Base, engine
@@ -14,6 +14,7 @@ class MyBot(commands.Bot):
)
async def setup_hook(self):
+ delete_accounts_task.start()
for ext in os.listdir("./code/cogs"):
if ext.endswith(".py"):
await self.load_extension(f"cogs.{ext[:-3]}")
@@ -28,7 +29,14 @@ async def on_ready():
config.LOG.info(f"{bot.user} has connected to Discord.")
-if __name__ == "__main__":
+@tasks.loop(minutes=1)
+async def delete_accounts_task():
+ from utils.jellyfin_delete import delete_accounts
+
Base.metadata.create_all(bind=engine)
+ delete_accounts()
+
+
+if __name__ == "__main__":
config.load_config()
bot.run(config.BOT_TOKEN)
diff --git a/code/cogs/newaccount.py b/code/cogs/newaccount.py
index f3f5ac8..fd3f698 100644
--- a/code/cogs/newaccount.py
+++ b/code/cogs/newaccount.py
@@ -1,10 +1,9 @@
import discord
from discord import app_commands
-from discord.ext import commands, tasks
+from discord.ext import commands
from utils.database import Session
from utils.jellyfin_create import create_jellyfin_account
-from utils.jellyfin_delete import delete_accounts
from utils.models import JellyfinAccounts
from utils.config import (
JELLYFIN_PUBLIC_URL,
@@ -17,9 +16,6 @@ class NewAccount(commands.Cog):
def __init__(self, bot):
self.bot = bot
- def cog_load(self):
- self.delete_accounts_loop.start()
-
@app_commands.command()
@app_commands.check(lambda inter: JELLYFIN_ENABLED)
async def newaccount(self, interaction: discord.Interaction) -> None:
@@ -91,10 +87,6 @@ class NewAccount(commands.Cog):
embed=embed, ephemeral=True
)
- @tasks.loop(minutes=1)
- async def delete_accounts_loop(self):
- delete_accounts()
-
async def setup(bot):
await bot.add_cog(NewAccount(bot))
diff --git a/code/utils/database.py b/code/utils/database.py
index cb2ecf7..cd757ec 100644
--- a/code/utils/database.py
+++ b/code/utils/database.py
@@ -1,6 +1,10 @@
from sqlalchemy import create_engine
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import sessionmaker
+import os
+
+if not os.path.exists("data"):
+ os.makedirs("data")
database_url = "sqlite:///data/cordarr.db"