diff --git a/src/addons/__init__.py b/src/addons/__init__.py new file mode 100644 index 0000000..ddac5cd --- /dev/null +++ b/src/addons/__init__.py @@ -0,0 +1,6 @@ +import sys +sys.path.append('..') + +from src.addons.date_time_helper import DateTimeHelper +from src.addons.programmer_excuses import ProgrammerExcuses +from src.addons.xkcd import XKCD diff --git a/src/addons/date_time_helper.py b/src/addons/date_time_helper.py new file mode 100644 index 0000000..50feed8 --- /dev/null +++ b/src/addons/date_time_helper.py @@ -0,0 +1,19 @@ +import datetime +import time + + +class DateTimeHelper: + @staticmethod + def get_time_now(): + date_now = datetime.datetime.now() + return str(date_now).split(" ")[0] + + @staticmethod + def get_unix_time(): + return time.time() + + @staticmethod + def get_date(): + date_now = datetime.datetime.now() + return str(date_now).split(" ") + diff --git a/src/models/redditPost.py b/src/addons/models/__init__.py similarity index 100% rename from src/models/redditPost.py rename to src/addons/models/__init__.py diff --git a/src/models/xkcdComic.py b/src/addons/models/xkcdComic.py similarity index 100% rename from src/models/xkcdComic.py rename to src/addons/models/xkcdComic.py diff --git a/src/addons/programmer_excuses.py b/src/addons/programmer_excuses.py new file mode 100644 index 0000000..d771247 --- /dev/null +++ b/src/addons/programmer_excuses.py @@ -0,0 +1,15 @@ +import requests + + +class ProgrammerExcuses: + def __init__(self) -> None: + self.url = "http://programmingexcuses.com" + + def get_excuse(self): + page = requests.get(url=self.url) + content = page.content.decode().split("\n") + for html in content: + if 'href="/"' in html: + start_index = html.find('3;">') + end_index = html.find("") + return html[start_index + 4:end_index] diff --git a/src/addons.py b/src/addons/xkcd.py similarity index 54% rename from src/addons.py rename to src/addons/xkcd.py index a179a22..d7181a7 100644 --- a/src/addons.py +++ b/src/addons/xkcd.py @@ -1,39 +1,9 @@ import requests import json -import datetime -import time +import sys +sys.path.append('..') -from models.xkcdComic import Comic - - -class DateTimeHelper: - @staticmethod - def get_time_now(): - date_now = datetime.datetime.now() - return str(date_now).split(" ")[0] - - @staticmethod - def get_unix_time(): - return time.time() - - @staticmethod - def get_date(): - date_now = datetime.datetime.now() - return str(date_now).split(" ") - - -class ProgrammerExcuses: - def __init__(self) -> None: - self.url = "http://programmingexcuses.com" - - def get_excuse(self): - page = requests.get(url=self.url) - content = page.content.decode().split("\n") - for html in content: - if 'href="/"' in html: - start_index = html.find('3;">') - end_index = html.find("") - return html[start_index + 4:end_index] +from src.addons.models.xkcdComic import Comic class XKCD: diff --git a/src/bot.py b/src/bot.py index 7773fd6..1d12877 100644 --- a/src/bot.py +++ b/src/bot.py @@ -1,14 +1,13 @@ import logging import asyncio import os -import secret_handler import discord from discord import app_commands from discord import Interaction -from discord.ext import commands -import addons + from client import Client +import secret_handler bot_info = {'version': '1.1.0', 'date': '20.02.2024'} @@ -18,8 +17,6 @@ logger.setLevel(logging.DEBUG) logging.getLogger('discord.http').setLevel(logging.INFO) handler = logging.FileHandler(filename='data/log/discord.log', encoding='utf-8', mode='a') -# dt_fmt = '%Y-%m-%d %H:%M:%S' -# formatter = logging.Formatter('[{asctime}] [{levelname:<8}] {name}: {message}', dt_fmt, style='{') formatter = logging.Formatter('%(asctime)s|%(levelname)s|%(name)s|:%(message)s') handler.setFormatter(formatter)