Restructure project

- Start using __init__.py - Remove the "bot" directory from root and move everything from inside to root - Adjust .gitignore to ignore pycharm files - Use discord.utils to setup logging - Change boot up art and version display - Remove version.py, start.sh - Add colorlog
jackra1n · Mar 14, 2024 · 8eda8ce · 8eda8ce
1 parent 3f18629
commit 8eda8ce
Show file tree

Hide file tree

Showing 34 changed files with 358 additions and 389 deletions.
diff --git a/.gitignore b/.gitignore
@@ -137,10 +137,21 @@ dmypy.json
 # Cython debug symbols
 cython_debug/
 
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
 
 # substiify custom
-bot/core/version.toml
-bot/core/config.py
+core/version.toml
+config.py
 postgres-data
 
 logs/

diff --git a/Dockerfile b/Dockerfile
@@ -8,4 +8,4 @@ RUN pip install --no-cache-dir -r requirements.txt
 
 COPY . .
 
-CMD ["python", "bot/main.py"]
+CMD ["python", "main.py"]
diff --git a/bot/core/version.py b/bot/core/version.py
diff --git a/bot/main.py b/bot/main.py
diff --git a/bot/start.sh b/bot/start.sh
diff --git a/bot/utils/art.txt b/bot/utils/art.txt
diff --git a/bot/utils/db.py b/bot/utils/db.py
diff --git a/bot/utils/util.py b/bot/utils/util.py
diff --git a/compose.yaml b/compose.yaml
@@ -32,6 +32,6 @@ services:
       - postgres
     restart: unless-stopped
     volumes:
-      - ./bot/logs:/bot/logs
-      - ./bot/core/version.toml:/bot/core/version.toml
+      - ./logs:/bot/logs
+      - ./core/version.toml:/bot/core/version.toml
       - /etc/localtime:/etc/localtime:ro
diff --git a/core/__init__.py b/core/__init__.py
@@ -0,0 +1,6 @@
+from .bot import Substiify
+from .config import *
+from .constants import *
+
+__version__ = "0.96"
+__author__ = "jackra1n"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@ RUN pip install --no-cache-dir -r requirements.txt

		COPY . .

		CMD ["python", "bot/main.py"]
		CMD ["python", "main.py"]