From 5a965bbc7a0d49edf2712b3af554af50191d413a Mon Sep 17 00:00:00 2001
From: klemek <klemek@outlook.fr>
Date: Fri, 8 Jan 2021 12:57:23 +0100
Subject: [PATCH] code into packages

---
 src/{composition_scanner.py => __init__.py}               | 0
 src/main.py                                               | 4 ++--
 src/scanners/__init__.py                                  | 1 +
 .../composition_scanner.py}                               | 0
 src/{ => scanners}/emotes_scanner.py                      | 8 ++++----
 src/{other_scanner.py => scanners/frequency_scanner.py}   | 0
 src/scanners/other_scanner.py                             | 0
 src/{ => scanners}/scanner.py                             | 6 +++---
 src/utils/__init__.py                                     | 0
 src/{ => utils}/data_types.py                             | 2 +-
 src/{ => utils}/emoji.json                                | 0
 src/{ => utils}/emojis.py                                 | 0
 src/{ => utils}/log_manager.py                            | 2 +-
 src/{ => utils}/utils.py                                  | 0
 14 files changed, 12 insertions(+), 11 deletions(-)
 rename src/{composition_scanner.py => __init__.py} (100%)
 create mode 100644 src/scanners/__init__.py
 rename src/{frequency_scanner.py => scanners/composition_scanner.py} (100%)
 rename src/{ => scanners}/emotes_scanner.py (96%)
 rename src/{other_scanner.py => scanners/frequency_scanner.py} (100%)
 create mode 100644 src/scanners/other_scanner.py
 rename src/{ => scanners}/scanner.py (96%)
 create mode 100644 src/utils/__init__.py
 rename src/{ => utils}/data_types.py (98%)
 rename src/{ => utils}/emoji.json (100%)
 rename src/{ => utils}/emojis.py (100%)
 rename src/{ => utils}/log_manager.py (99%)
 rename src/{ => utils}/utils.py (100%)

diff --git a/src/composition_scanner.py b/src/__init__.py
similarity index 100%
rename from src/composition_scanner.py
rename to src/__init__.py
diff --git a/src/main.py b/src/main.py
index 1cedc02..b271528 100644
--- a/src/main.py
+++ b/src/main.py
@@ -1,8 +1,8 @@
 from miniscord import Bot
 import logging
 
-import emojis
-from emotes_scanner import EmotesScanner
+from utils import emojis
+from scanners import EmotesScanner
 
 logging.basicConfig(
     format="[%(asctime)s][%(levelname)s][%(module)s] %(message)s", level=logging.INFO
diff --git a/src/scanners/__init__.py b/src/scanners/__init__.py
new file mode 100644
index 0000000..f44b017
--- /dev/null
+++ b/src/scanners/__init__.py
@@ -0,0 +1 @@
+from .emotes_scanner import EmotesScanner
diff --git a/src/frequency_scanner.py b/src/scanners/composition_scanner.py
similarity index 100%
rename from src/frequency_scanner.py
rename to src/scanners/composition_scanner.py
diff --git a/src/emotes_scanner.py b/src/scanners/emotes_scanner.py
similarity index 96%
rename from src/emotes_scanner.py
rename to src/scanners/emotes_scanner.py
index b11819a..3569432 100644
--- a/src/emotes_scanner.py
+++ b/src/scanners/emotes_scanner.py
@@ -4,10 +4,10 @@ import discord
 
 # Custom libs
 
-from log_manager import ChannelLogs, MessageLog
-from data_types import Emote
-from scanner import Scanner
-import emojis
+from utils.log_manager import ChannelLogs, MessageLog
+from utils.data_types import Emote
+from .scanner import Scanner
+from utils import emojis
 
 
 class EmotesScanner(Scanner):
diff --git a/src/other_scanner.py b/src/scanners/frequency_scanner.py
similarity index 100%
rename from src/other_scanner.py
rename to src/scanners/frequency_scanner.py
diff --git a/src/scanners/other_scanner.py b/src/scanners/other_scanner.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/scanner.py b/src/scanners/scanner.py
similarity index 96%
rename from src/scanner.py
rename to src/scanners/scanner.py
index 6045260..0685025 100644
--- a/src/scanner.py
+++ b/src/scanners/scanner.py
@@ -3,9 +3,9 @@ from typing import List
 from collections import defaultdict
 import discord
 
-from utils import no_duplicate, get_intro
-from log_manager import GuildLogs, ChannelLogs, MessageLog
-from data_types import Emote
+from utils.utils import no_duplicate, get_intro
+from utils.log_manager import GuildLogs, ChannelLogs, MessageLog
+from utils.data_types import Emote
 
 
 class Scanner(ABC):
diff --git a/src/utils/__init__.py b/src/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/data_types.py b/src/utils/data_types.py
similarity index 98%
rename from src/data_types.py
rename to src/utils/data_types.py
index d2e0a46..006f8e6 100644
--- a/src/data_types.py
+++ b/src/utils/data_types.py
@@ -5,7 +5,7 @@ import discord
 
 # Custom libs
 
-from utils import mention, plural, day_interval
+from .utils import mention, plural, day_interval
 
 
 class Emote:
diff --git a/src/emoji.json b/src/utils/emoji.json
similarity index 100%
rename from src/emoji.json
rename to src/utils/emoji.json
diff --git a/src/emojis.py b/src/utils/emojis.py
similarity index 100%
rename from src/emojis.py
rename to src/utils/emojis.py
diff --git a/src/log_manager.py b/src/utils/log_manager.py
similarity index 99%
rename from src/log_manager.py
rename to src/utils/log_manager.py
index 4a96aed..c3c126b 100644
--- a/src/log_manager.py
+++ b/src/utils/log_manager.py
@@ -6,7 +6,7 @@ import gzip
 from datetime import datetime
 import logging
 
-from utils import code_message, is_extension
+from .utils import code_message, is_extension
 
 LOG_DIR = "logs"
 
diff --git a/src/utils.py b/src/utils/utils.py
similarity index 100%
rename from src/utils.py
rename to src/utils/utils.py