From 1b89a3542cc78f12cafa04497cc7913b0cb59140 Mon Sep 17 00:00:00 2001
From: stephenmk <stephenmk@users.noreply.github.com>
Date: Tue, 11 Apr 2023 12:01:23 -0500
Subject: [PATCH] Reorganize file structure

---
 crawlers.py => bot/crawlers.py               | 8 ++++----
 {entries => bot/entries}/jitenon.py          | 4 ++--
 {entries => bot/entries}/jitenon_kotowaza.py | 4 ++--
 {entries => bot/entries}/jitenon_yoji.py     | 2 +-
 scraper.py => bot/scraper.py                 | 0
 util.py => bot/util.py                       | 0
 {yomichan => bot/yomichan}/export.py         | 0
 {yomichan => bot/yomichan}/grammar.py        | 0
 {yomichan => bot/yomichan}/html_gloss.py     | 0
 jitenbot.py                                  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
 rename crawlers.py => bot/crawlers.py (92%)
 rename {entries => bot/entries}/jitenon.py (98%)
 rename {entries => bot/entries}/jitenon_kotowaza.py (94%)
 rename {entries => bot/entries}/jitenon_yoji.py (96%)
 rename scraper.py => bot/scraper.py (100%)
 rename util.py => bot/util.py (100%)
 rename {yomichan => bot/yomichan}/export.py (100%)
 rename {yomichan => bot/yomichan}/grammar.py (100%)
 rename {yomichan => bot/yomichan}/html_gloss.py (100%)

diff --git a/crawlers.py b/bot/crawlers.py
similarity index 92%
rename from crawlers.py
rename to bot/crawlers.py
index f923a46..b705a02 100644
--- a/crawlers.py
+++ b/bot/crawlers.py
@@ -1,10 +1,10 @@
 import re
 from bs4 import BeautifulSoup
 
-import scraper as Scraper
-import yomichan.export as YomichanExport
-from entries.jitenon_kotowaza import JitenonKotowaza
-from entries.jitenon_yoji import JitenonYoji
+import bot.scraper as Scraper
+import bot.yomichan.export as YomichanExport
+from bot.entries.jitenon_kotowaza import JitenonKotowaza
+from bot.entries.jitenon_yoji import JitenonYoji
 
 
 def run_all():
diff --git a/entries/jitenon.py b/bot/entries/jitenon.py
similarity index 98%
rename from entries/jitenon.py
rename to bot/entries/jitenon.py
index 44740e7..aac1929 100644
--- a/entries/jitenon.py
+++ b/bot/entries/jitenon.py
@@ -2,8 +2,8 @@ import re
 from datetime import datetime, date
 from bs4 import BeautifulSoup
 
-import yomichan.html_gloss as YomichanGloss
-import util as Util
+import bot.yomichan.html_gloss as YomichanGloss
+import bot.util as Util
 
 
 class Jitenon:
diff --git a/entries/jitenon_kotowaza.py b/bot/entries/jitenon_kotowaza.py
similarity index 94%
rename from entries/jitenon_kotowaza.py
rename to bot/entries/jitenon_kotowaza.py
index bcf608e..9f4b8d8 100644
--- a/entries/jitenon_kotowaza.py
+++ b/bot/entries/jitenon_kotowaza.py
@@ -1,5 +1,5 @@
-from entries.jitenon import Jitenon
-import yomichan.grammar as Grammar
+from bot.entries.jitenon import Jitenon
+import bot.yomichan.grammar as Grammar
 
 
 class JitenonKotowaza(Jitenon):
diff --git a/entries/jitenon_yoji.py b/bot/entries/jitenon_yoji.py
similarity index 96%
rename from entries/jitenon_yoji.py
rename to bot/entries/jitenon_yoji.py
index 286d44e..1dc9792 100644
--- a/entries/jitenon_yoji.py
+++ b/bot/entries/jitenon_yoji.py
@@ -1,4 +1,4 @@
-from entries.jitenon import Jitenon
+from bot.entries.jitenon import Jitenon
 
 
 class JitenonYoji(Jitenon):
diff --git a/scraper.py b/bot/scraper.py
similarity index 100%
rename from scraper.py
rename to bot/scraper.py
diff --git a/util.py b/bot/util.py
similarity index 100%
rename from util.py
rename to bot/util.py
diff --git a/yomichan/export.py b/bot/yomichan/export.py
similarity index 100%
rename from yomichan/export.py
rename to bot/yomichan/export.py
diff --git a/yomichan/grammar.py b/bot/yomichan/grammar.py
similarity index 100%
rename from yomichan/grammar.py
rename to bot/yomichan/grammar.py
diff --git a/yomichan/html_gloss.py b/bot/yomichan/html_gloss.py
similarity index 100%
rename from yomichan/html_gloss.py
rename to bot/yomichan/html_gloss.py
diff --git a/jitenbot.py b/jitenbot.py
index 1a6503a..aaf213a 100644
--- a/jitenbot.py
+++ b/jitenbot.py
@@ -17,7 +17,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
 import argparse
-import crawlers as Crawlers
+import bot.crawlers as Crawlers
 
 
 choices = {