diff --git a/bot.py b/bot.py index f52dfb4..2a76889 100755 --- a/bot.py +++ b/bot.py @@ -7,9 +7,9 @@ from dotenv import load_dotenv from disnake import OptionType, Option from disnake.ext import commands from __init__ import version_info as ver -from lib import work_with_cogs, cog_list -from lib import determine_prefix -from lib import logger +from lib.CogsPrep import work_with_cogs, cog_list +from lib.Comands import determine_prefix +from lib.Logger import logger load_dotenv() if not os.path.isfile('.env') or not os.getenv('CONF_FILE'): diff --git a/cogs/admin.py b/cogs/admin.py index dc9b29e..c94edf9 100644 --- a/cogs/admin.py +++ b/cogs/admin.py @@ -6,9 +6,9 @@ from disnake import Option, OptionType, OptionChoice from disnake.ext import commands, tasks -from lib import read_json, write_json -from lib import fill_bd, prepare_db, work_with_db -from lib import logger +from lib.Comands import read_json, write_json +from lib.DB_Worker import fill_bd, prepare_db, work_with_db +from lib.Logger import logger class Admin(commands.Cog, name='Admin'): diff --git a/cogs/audio.py b/cogs/audio.py index 3f1b735..b6e167b 100644 --- a/cogs/audio.py +++ b/cogs/audio.py @@ -4,9 +4,10 @@ import disnake from disnake import OptionChoice, Option, OptionType, Member, VoiceState from disnake.ext import commands -from lib import logger, ListGenerator -from lib import read_db -from lib import play_audio +from lib.Logger import logger +from lib.DB_Worker import read_db +from lib.Player import play_audio +from lib.ListGenerator import ListGenerator class Audio(commands.Cog, name='Audio'): diff --git a/cogs/disabled/funny.py b/cogs/disabled/funny.py index 367e7c2..5519168 100644 --- a/cogs/disabled/funny.py +++ b/cogs/disabled/funny.py @@ -1,5 +1,5 @@ from disnake.ext import commands -from lib import logger +from lib.Logger import logger class Fun(commands.Cog, name='Fun'): diff --git a/cogs/disabled/test.py b/cogs/disabled/test.py index 9959c02..ef3a99e 100644 --- a/cogs/disabled/test.py +++ b/cogs/disabled/test.py @@ -1,7 +1,7 @@ import disnake from disnake import Option from disnake.ext import commands -from lib import logger +from lib.Logger import logger class Testing(commands.Cog, name='Testing'): diff --git a/cogs/general.py b/cogs/general.py index 9e36b4a..92c4ac8 100644 --- a/cogs/general.py +++ b/cogs/general.py @@ -2,8 +2,8 @@ import disnake from disnake import Option, OptionType, Colour from disnake.ext import commands -from lib import DBReader -from lib import logger +from lib.DB_Worker import DBReader +from lib.Logger import logger class General(commands.Cog): diff --git a/cogs/info.py b/cogs/info.py index e4f3de6..8d0d8b0 100644 --- a/cogs/info.py +++ b/cogs/info.py @@ -5,8 +5,8 @@ import psutil from disnake.ext import commands from __init__ import version_info as ver -from lib import determine_prefix -from lib import logger +from lib.Comands import determine_prefix +from lib.Logger import logger class BotInfo(commands.Cog, name='Bot Info'): diff --git a/lib/DB_Worker.py b/lib/DB_Worker.py index aad41f3..e0ee720 100644 --- a/lib/DB_Worker.py +++ b/lib/DB_Worker.py @@ -1,6 +1,6 @@ import sqlite3 -from lib import logger +from lib.Logger import logger class DBReader: diff --git a/lib/Logger.py b/lib/Logger.py index 24300bb..f1f98be 100644 --- a/lib/Logger.py +++ b/lib/Logger.py @@ -7,14 +7,14 @@ class _CustomFormatter(logging.Formatter): red = "\x1b[31;20m" bold_red = "\x1b[31;1m" reset = "\x1b[0m" - fmt = "%(asctime)s - [%(levelname)s] -%(module)s- %(message)s" + format = "%(asctime)s - [%(levelname)s] -%(module)s- %(message)s" FORMATS = { - logging.DEBUG: grey + fmt + reset, - logging.INFO: grey + fmt + reset, - logging.WARNING: yellow + fmt + reset, - logging.ERROR: red + fmt + reset, - logging.CRITICAL: bold_red + fmt + reset + logging.DEBUG: grey + format + reset, + logging.INFO: grey + format + reset, + logging.WARNING: yellow + format + reset, + logging.ERROR: red + format + reset, + logging.CRITICAL: bold_red + format + reset } old_factory = logging.getLogRecordFactory() diff --git a/lib/__init__.py b/lib/__init__.py index 92e4610..4e95927 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -3,9 +3,9 @@ lib ~~~~~~~~~~~~~ Some libs for the bot which help him """ -from .ListGenerator import * -from .Logger import * -from .Comands import * -from .Player import * -from .DB_Worker import * -from .CogsPrep import * +# from .ListGenerator import * +# from .Logger import * +# from .Comands import * +# from .Player import * +# from .DB_Worker import * +# from .CogsPrep import *