Refactor project structure

.gitignore

@@ -1,2 +1,3 @@
+__pycache__/
 config.json
 db.sqlite

Dockerfile

@@ -12,4 +12,4 @@ RUN pip install --no-cache-dir pipenv \
 
 VOLUME "/data"
 
-CMD [ "python", "-m", "pipenv", "run", "./webhook-bridge.py" ]
+CMD [ "python", "-m", "pipenv", "run", "python", "-m", "minecraft-discord-bridge" ]

minecraft-discord-bridge/__main__.py

@@ -0,0 +1,3 @@
+if __name__ == "__main__":
+    from . import minecraft_discord_bridge
+    minecraft_discord_bridge.main()

minecraft-discord-bridge/auth_server.py

@@ -1,9 +1,9 @@
-from datetime import datetime, timezone
+from datetime import datetime
 
 from quarry.net.server import ServerFactory, ServerProtocol
 
-from database import AccountLinkToken, MinecraftAccount, DiscordAccount
-import database_session
+from .database import AccountLinkToken, MinecraftAccount, DiscordAccount
+from . import database_session
 
 
 class AuthProtocol(ServerProtocol):

minecraft-discord-bridge/database.py

@@ -3,7 +3,7 @@ from datetime import datetime, timedelta, timezone
 from sqlalchemy import Column, String, Integer, DateTime, ForeignKey
 from sqlalchemy.orm import relationship
 
-from database_session import Base
+from .database_session import Base
 
 
 class DiscordChannel(Base):

minecraft-discord-bridge/minecraft_discord_bridge.py

@@ -14,12 +14,12 @@ import random
 import string
 import uuid
 from threading import Thread
-from config import Configuration
-from database import DiscordChannel, AccountLinkToken, DiscordAccount
-import database_session
+from .config import Configuration
+from .database import DiscordChannel, AccountLinkToken, DiscordAccount
+from . import database_session
 
 from datetime import datetime, timedelta, timezone
-import elasticsearch_logger as el
+from . import elasticsearch_logger as el
 from minecraft import authentication
 from minecraft.exceptions import YggdrasilError
 from minecraft.networking.connection import Connection
@@ -138,7 +138,7 @@ def run_auth_server(port):
     # We need to import twisted after setting up the logger because twisted hijacks our logging
     # TODO: Fix this in a cleaner way
     from twisted.internet import reactor
-    from auth_server import AuthFactory
+    from .auth_server import AuthFactory
 
     # Create factory
     factory = AuthFactory()