diff --git a/main.py b/bin/hrochobot similarity index 61% rename from main.py rename to bin/hrochobot index 6a58355..2bbc8f1 100755 --- a/main.py +++ b/bin/hrochobot @@ -1,11 +1,15 @@ #!/usr/bin/env python3 from discord.ext import commands -import utils.data as data +import hrochobot.utils.data as data import logging +import os -logger = logging.getLogger('discord') +data.DATA_FOLDER = os.environ.get("HROCHOBOT_DATA", 'data') +LOG_FOLDER = os.environ.get("HROCHOBOT_LOG", '.') + +logger = logging.getLogger('hrochobot') logger.setLevel(logging.INFO) -handler = logging.FileHandler(filename='discord.log', encoding='utf-8', mode='w') +handler = logging.FileHandler(filename=f'{LOG_FOLDER}/hrochobot.log', encoding='utf-8', mode='w') handler.setFormatter(logging.Formatter('%(asctime)s:%(levelname)s:%(name)s: %(message)s')) logger.addHandler(handler) @@ -20,7 +24,7 @@ cogs_list = [ ] for cog in cogs_list: - bot.load_extension(f'cogs.{cog}') + bot.load_extension(f'hrochobot.cogs.{cog}') @bot.listen('on_interaction') async def statistics(interaction): diff --git a/cogs/basic.py b/hrochobot/cogs/basic.py similarity index 100% rename from cogs/basic.py rename to hrochobot/cogs/basic.py diff --git a/cogs/ksp.py b/hrochobot/cogs/ksp.py similarity index 96% rename from cogs/ksp.py rename to hrochobot/cogs/ksp.py index e452dda..b47eaff 100644 --- a/cogs/ksp.py +++ b/hrochobot/cogs/ksp.py @@ -1,6 +1,6 @@ import discord from discord.ext import commands -from utils.ksp_utils import * +from hrochobot.utils.ksp_utils import * class Ksp(commands.Cog): def __init__(self, bot): diff --git a/cogs/roles.py b/hrochobot/cogs/roles.py similarity index 98% rename from cogs/roles.py rename to hrochobot/cogs/roles.py index e0c87a0..4710ecd 100644 --- a/cogs/roles.py +++ b/hrochobot/cogs/roles.py @@ -1,5 +1,5 @@ import discord -import utils.data as data +import hrochobot.utils.data as data from discord.ext import commands from discord.utils import get diff --git a/utils/data.py b/hrochobot/utils/data.py similarity index 95% rename from utils/data.py rename to hrochobot/utils/data.py index fab173f..d73d1e7 100644 --- a/utils/data.py +++ b/hrochobot/utils/data.py @@ -2,7 +2,7 @@ from typing import Any import json import os.path -DATA_FOLDER = "data" +DATA_FOLDER = "TODO" def load_json(filename: str): with open(filename + ".json") as f: diff --git a/utils/ksp_utils.py b/hrochobot/utils/ksp_utils.py similarity index 100% rename from utils/ksp_utils.py rename to hrochobot/utils/ksp_utils.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..390bd3f --- /dev/null +++ b/setup.py @@ -0,0 +1,19 @@ +#!/usr/bin/env python3 + +import setuptools + +setuptools.setup( + name='hrochbot', + version='1.0', + description='DiscordovĂ˝ robot pro KSP', + packages=['hrochobot', 'hrochobot/cogs', 'hrochobot/utils'], + scripts=[ + 'bin/hrochobot', + ], + include_package_data=True, + zip_safe=False, + install_requires=[ + 'py-cord', + 'requests', + ], +)