Modernize codebase

.dockerignore

@@ -0,0 +1,17 @@
+# git
+.git/
+.gitignore
+
+# vim
+**/*.swp
+
+# database
+pgdata/
+
+# envvars
+.env
+.env.example
+
+# docker
+.dockerignore
+docker-compose.yml

.env.example

@@ -0,0 +1,12 @@
+# docker-compose configuration for postgres
+DB_PORT=5432
+DB_VOLUME="/absolute/path/to/pgdata"
+
+# postgres startup variables
+POSTGRES_USER=discordoragi
+POSTGRES_PASSWORD="CHANGE THIS TO A SAFE PASSWORD"
+POSTGRES_DB=discordoragi
+
+# connection info for db
+DB_URL="postgresql://"
+DB_HOST=db

.gitignore

@@ -65,3 +65,12 @@ oauth.ini
 #Pycharm
 .idea
 .vscode
+
+# Vim
+**/*.swp
+
+# Configuration
+.env
+
+# Database
+pgdata/

Dockerfile

@@ -0,0 +1,11 @@
+FROM ubuntu:latest
+
+ENV PATH="/root/.local/bin:$PATH"
+
+WORKDIR /app
+
+COPY pyproject.toml .
+
+RUN apt update && apt install -y tree vim postgresql-client build-essential libssl-dev libffi-dev python3 python3-dev python3-pip python3-venv && pip install pipx && pipx install poetry && poetry install
+
+COPY . .

bot/__init__.py → discordoragi/bot/__init__.py

@@ -1,5 +1,4 @@
-
-from bot.discordoragi import Discordoragi
+from .discordoragi import Discordoragi
 
 
 __all__ = ['Discordoragi', 'SessionManager', 'HTTPStatusError']

bot/discordoragi.py → discordoragi/bot/discordoragi.py

@@ -5,8 +5,8 @@
 import yaml
 from time import time
 from aiohttp_wrapper import SessionManager
-from helpers.discord_helpers import get_name_with_discriminator
-from helpers import PostgresController
+from ..helpers.discord_helpers import get_name_with_discriminator
+from ..helpers import PostgresController
 from logging import Formatter, INFO, StreamHandler, getLogger
 
 

discordoragi/cogs/__init__.py

@@ -0,0 +1,3 @@
+from .search import Search
+
+__all__ = ['Search']

run.py → discordoragi/run.py

@@ -1,8 +1,8 @@
 """
 Actually runs the code
 """
-from bot import Discordoragi
-from cogs import Search
+from .bot import Discordoragi
+from .cogs import Search
 from asyncio import get_event_loop
 
 

docker-compose.yml

@@ -0,0 +1,33 @@
+version: '3.8'
+services:
+  db:
+    image: postgres:14-alpine
+    restart: always
+    volumes:
+      - discordoragi_pgdata:/var/lib/postgresql/data
+    expose:
+      - "${DB_PORT}"
+    environment:
+      POSTGRES_USER: "${POSTGRES_USER}"
+      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
+      POSTGRES_DB: "${POSTGRES_DB}"
+  test:
+    build: .
+    image: discordoragi_test:latest
+    depends_on:
+      - db
+    environment:
+      DB_URL: "${DB_URL}"
+      DB_USER: "${POSTGRES_USER}"
+      DB_PASSWORD: "${POSTGRES_PASSWORD}"
+      DB_HOST: "${DB_HOST}"
+      DB_PORT: "${DB_PORT}"
+      DB_DATABASE: "${POSTGRES_DB}"
+    command: ["sleep", "infinity"]
+volumes:
+  discordoragi_pgdata:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: "${DB_VOLUME}"