From e7aa6b062c67e72f6bcc06ebf013088cf806e9cb Mon Sep 17 00:00:00 2001
From: jsl12 <32917998+jsl12@users.noreply.github.com>
Date: Fri, 28 Jan 2022 00:22:33 -0600
Subject: [PATCH] reorg to make better use of volumes

---
 .gitignore                                 | 2 +-
 Dockerfile                                 | 3 +--
 docker-compose.yml                         | 7 ++++++-
 {kwaylon => src/kwaylon}/__init__.py       | 2 +-
 {kwaylon => src/kwaylon}/jokes/__init__.py | 0
 {kwaylon => src/kwaylon}/jokes/base.py     | 0
 {kwaylon => src/kwaylon}/jokes/helpers.py  | 0
 {kwaylon => src/kwaylon}/kwaylon.py        | 7 ++++---
 {kwaylon => src/kwaylon}/msg.py            | 0
 {kwaylon => src/kwaylon}/reactions.py      | 0
 main.py => src/main.py                     | 0
 11 files changed, 13 insertions(+), 8 deletions(-)
 rename {kwaylon => src/kwaylon}/__init__.py (100%)
 rename {kwaylon => src/kwaylon}/jokes/__init__.py (100%)
 rename {kwaylon => src/kwaylon}/jokes/base.py (100%)
 rename {kwaylon => src/kwaylon}/jokes/helpers.py (100%)
 rename {kwaylon => src/kwaylon}/kwaylon.py (96%)
 rename {kwaylon => src/kwaylon}/msg.py (100%)
 rename {kwaylon => src/kwaylon}/reactions.py (100%)
 rename main.py => src/main.py (100%)

diff --git a/.gitignore b/.gitignore
index bdfff9b..0be4cf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 __pycache__
-.env
+src/.env
 .idea
 .ipynb_checkpoints
 discord.py
diff --git a/Dockerfile b/Dockerfile
index 022bca3..02aa751 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,6 @@ RUN pip install nextcord
 
 RUN pip install beautifulsoup4 requests lxml
 
-WORKDIR /usr/src/app
-COPY ./ ./
+WORKDIR /usr/app/src
 
 CMD [ "python", "main.py" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 621cc31..c2686ea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,8 +4,13 @@ services:
     container_name: kwaylon
     image: kwaylon:latest
     build: ./
+    restart: unless-stopped
     network_mode: host
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
-    restart: unless-stopped
+      - /mnt/dietpi_userdata/kwaylon/src:/usr/app/src
+      - /mnt/dietpi_userdata/kwaylon/data:/usr/app/data
+#      - type: bind
+#        source: /mnt/dietpi_userdata/kwaylon/messages.db
+#        target: /usr/src/app/messages.db
diff --git a/kwaylon/__init__.py b/src/kwaylon/__init__.py
similarity index 100%
rename from kwaylon/__init__.py
rename to src/kwaylon/__init__.py
index b010db6..4a05064 100644
--- a/kwaylon/__init__.py
+++ b/src/kwaylon/__init__.py
@@ -1,3 +1,3 @@
+from .jokes import Joke, GifJoke
 from .kwaylon import Kwaylon
 from .reactions import ReactionData
-from .jokes import Joke, GifJoke
diff --git a/kwaylon/jokes/__init__.py b/src/kwaylon/jokes/__init__.py
similarity index 100%
rename from kwaylon/jokes/__init__.py
rename to src/kwaylon/jokes/__init__.py
diff --git a/kwaylon/jokes/base.py b/src/kwaylon/jokes/base.py
similarity index 100%
rename from kwaylon/jokes/base.py
rename to src/kwaylon/jokes/base.py
diff --git a/kwaylon/jokes/helpers.py b/src/kwaylon/jokes/helpers.py
similarity index 100%
rename from kwaylon/jokes/helpers.py
rename to src/kwaylon/jokes/helpers.py
diff --git a/kwaylon/kwaylon.py b/src/kwaylon/kwaylon.py
similarity index 96%
rename from kwaylon/kwaylon.py
rename to src/kwaylon/kwaylon.py
index 0c74eed..0669680 100644
--- a/kwaylon/kwaylon.py
+++ b/src/kwaylon/kwaylon.py
@@ -7,8 +7,7 @@ from typing import List
 
 import pandas as pd
 from nextcord import Client, Message, TextChannel
-from nextcord import Emoji
-from nextcord import RawReactionActionEvent
+from nextcord import RawReactionActionEvent, Emoji
 from nextcord import utils
 
 from . import jokes
@@ -20,10 +19,12 @@ LOGGER = logging.getLogger(__name__)
 
 
 class Kwaylon(Client):
-    db_path: Path = Path('./messages.db')
+    # db_path: Path = Path(r'../data/messages.db')
 
     def __init__(self, limit: int = 5000, days: int = 30, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.db_path = Path.cwd().parents[0] / 'data' / 'messages.db'
+
         self.limit, self.days = limit, days
         self.jokes = list(jokes.collect_jokes())
         self.lock = asyncio.Lock()
diff --git a/kwaylon/msg.py b/src/kwaylon/msg.py
similarity index 100%
rename from kwaylon/msg.py
rename to src/kwaylon/msg.py
diff --git a/kwaylon/reactions.py b/src/kwaylon/reactions.py
similarity index 100%
rename from kwaylon/reactions.py
rename to src/kwaylon/reactions.py
diff --git a/main.py b/src/main.py
similarity index 100%
rename from main.py
rename to src/main.py