From fff1a5c0c7889673f9159e86d0f81bf32e6ba0a1 Mon Sep 17 00:00:00 2001 From: bacon Date: Mon, 18 Mar 2024 01:49:40 +0300 Subject: [PATCH] fixed start after move --- bot/bot.py | 9 ++++---- bot/cogs/admin.py | 6 ++--- bot/cogs/audio.py | 8 +++---- bot/cogs/disabled/funny.py | 4 ++-- bot/cogs/disabled/test.py | 4 ++-- bot/cogs/general.py | 2 +- bot/cogs/info.py | 4 ++-- bot/{lib => integral_lib}/CogsPrep.py | 8 +++---- bot/{lib => integral_lib}/Comands.py | 2 +- bot/{lib => integral_lib}/DB_Worker.py | 0 bot/{lib => integral_lib}/ListGenerator.py | 0 bot/{lib => integral_lib}/Logger.py | 0 bot/{lib => integral_lib}/Player.py | 0 bot/{lib => integral_lib}/YandexPlayer.py | 0 bot/{lib => integral_lib}/__init__.py | 2 +- tests/test_lib_Cog.py | 27 ++++------------------ 16 files changed, 29 insertions(+), 47 deletions(-) rename bot/{lib => integral_lib}/CogsPrep.py (91%) rename bot/{lib => integral_lib}/Comands.py (98%) rename bot/{lib => integral_lib}/DB_Worker.py (100%) rename bot/{lib => integral_lib}/ListGenerator.py (100%) rename bot/{lib => integral_lib}/Logger.py (100%) rename bot/{lib => integral_lib}/Player.py (100%) rename bot/{lib => integral_lib}/YandexPlayer.py (100%) rename bot/{lib => integral_lib}/__init__.py (81%) diff --git a/bot/bot.py b/bot/bot.py index 2f50262..cb4ee1f 100644 --- a/bot/bot.py +++ b/bot/bot.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -import asyncio from os import getenv from os.path import isfile @@ -7,9 +6,9 @@ from disnake import OptionType, Option, Localized, ApplicationCommandInteraction from disnake.ext.commands import Bot, is_owner from dotenv import load_dotenv -from lib.CogsPrep import work_with_cogs, cog_list -from lib.Comands import determine_prefix -from lib.Logger import logger +from integral_lib.CogsPrep import work_with_cogs, cog_list +from integral_lib.Comands import determine_prefix +from integral_lib.Logger import logger load_dotenv() if not isfile('.env') or not getenv('CONF_FILE'): @@ -36,7 +35,7 @@ bot = Bot(command_prefix=determine_prefix, bot.i18n.load("locale/") -asyncio.run(work_with_cogs('load', bot, cog_list())) +work_with_cogs('load', bot, cog_list()) @bot.event diff --git a/bot/cogs/admin.py b/bot/cogs/admin.py index 5be1e4d..7d3a912 100644 --- a/bot/cogs/admin.py +++ b/bot/cogs/admin.py @@ -4,9 +4,9 @@ import disnake from disnake import Option, OptionType, Localized from disnake.ext import tasks -from lib.Comands import * -from lib.DB_Worker import fill_bd, prepare_db, work_with_db -from lib.Logger import logger +from integral_lib.Comands import * +from integral_lib.DB_Worker import fill_bd, prepare_db, work_with_db +from integral_lib.Logger import logger class Admin(commands.Cog, name='Admin'): diff --git a/bot/cogs/audio.py b/bot/cogs/audio.py index f07dacf..2fd64d6 100644 --- a/bot/cogs/audio.py +++ b/bot/cogs/audio.py @@ -4,9 +4,9 @@ import disnake from disnake import OptionChoice, Option, OptionType, Member, VoiceState from disnake.ext import commands -from lib.ListGenerator import ListGenerator -from lib.Logger import logger -from lib.Player import play_audio +from integral_lib.ListGenerator import ListGenerator +from integral_lib.Logger import logger +from integral_lib.Player import play_audio class Audio(commands.Cog, name='Audio'): @@ -27,7 +27,7 @@ class Audio(commands.Cog, name='Audio'): logger.info('Skip playing by Game') else: # Prepare list of audio - from bot.lib.Comands import read_json + from bot.integral_lib.Comands import read_json _role = await read_json(member.guild.id, 'tigger_role') audio: list = [] for _a in ListGenerator('audio'): diff --git a/bot/cogs/disabled/funny.py b/bot/cogs/disabled/funny.py index 80a5413..f88037b 100644 --- a/bot/cogs/disabled/funny.py +++ b/bot/cogs/disabled/funny.py @@ -4,8 +4,8 @@ import disnake from disnake import OptionChoice from disnake.ext import commands -from lib.Comands import write_json -from lib.Logger import logger +from integral_lib.Comands import write_json +from integral_lib.Logger import logger class Fun(commands.Cog, name='Fun'): diff --git a/bot/cogs/disabled/test.py b/bot/cogs/disabled/test.py index e835b45..cfd6cbc 100644 --- a/bot/cogs/disabled/test.py +++ b/bot/cogs/disabled/test.py @@ -2,8 +2,8 @@ import disnake from disnake import Option from disnake.ext import commands -from lib import YandexPlayer -from lib.Logger import logger +from integral_lib import YandexPlayer +from integral_lib.Logger import logger class Testing(commands.Cog, name='Testing'): diff --git a/bot/cogs/general.py b/bot/cogs/general.py index ed1ebdf..7b59ef7 100644 --- a/bot/cogs/general.py +++ b/bot/cogs/general.py @@ -2,7 +2,7 @@ import disnake from disnake import Option, OptionType, Colour from disnake.ext import commands -from lib.Logger import logger +from integral_lib.Logger import logger class General(commands.Cog): diff --git a/bot/cogs/info.py b/bot/cogs/info.py index 4cbe854..207ff74 100644 --- a/bot/cogs/info.py +++ b/bot/cogs/info.py @@ -6,8 +6,8 @@ from disnake import ApplicationCommandInteraction from disnake.ext import commands from __init__ import version_info as ver -from lib.Comands import determine_prefix -from lib.Logger import logger +from integral_lib.Comands import determine_prefix +from integral_lib.Logger import logger class BotInfo(commands.Cog, name='Bot Info'): diff --git a/bot/lib/CogsPrep.py b/bot/integral_lib/CogsPrep.py similarity index 91% rename from bot/lib/CogsPrep.py rename to bot/integral_lib/CogsPrep.py index a6c102d..a30d6f9 100644 --- a/bot/lib/CogsPrep.py +++ b/bot/integral_lib/CogsPrep.py @@ -1,5 +1,5 @@ """ -lib.CogsPrepare +integral_lib.CogsPrepare ~~~~~~~~~~~~~ Loads, unloads Cogs files cog_list: return list of cog filenames @@ -22,9 +22,9 @@ def cog_list(fold: str = './cogs') -> List[str]: return cogs_list -async def work_with_cogs(what_do: str, - bot: InteractionBotBase, - cog: str | list): +def work_with_cogs(what_do: str, + bot: InteractionBotBase, + cog: str | list): if isinstance(cog, str): cog = cog.split() for _filename in cog: diff --git a/bot/lib/Comands.py b/bot/integral_lib/Comands.py similarity index 98% rename from bot/lib/Comands.py rename to bot/integral_lib/Comands.py index 59b8b52..517693d 100644 --- a/bot/lib/Comands.py +++ b/bot/integral_lib/Comands.py @@ -1,5 +1,5 @@ """ -lib.Commands +integral_lib.Commands ~~~~~~~~~~~~~~ Some prepare for commands diff --git a/bot/lib/DB_Worker.py b/bot/integral_lib/DB_Worker.py similarity index 100% rename from bot/lib/DB_Worker.py rename to bot/integral_lib/DB_Worker.py diff --git a/bot/lib/ListGenerator.py b/bot/integral_lib/ListGenerator.py similarity index 100% rename from bot/lib/ListGenerator.py rename to bot/integral_lib/ListGenerator.py diff --git a/bot/lib/Logger.py b/bot/integral_lib/Logger.py similarity index 100% rename from bot/lib/Logger.py rename to bot/integral_lib/Logger.py diff --git a/bot/lib/Player.py b/bot/integral_lib/Player.py similarity index 100% rename from bot/lib/Player.py rename to bot/integral_lib/Player.py diff --git a/bot/lib/YandexPlayer.py b/bot/integral_lib/YandexPlayer.py similarity index 100% rename from bot/lib/YandexPlayer.py rename to bot/integral_lib/YandexPlayer.py diff --git a/bot/lib/__init__.py b/bot/integral_lib/__init__.py similarity index 81% rename from bot/lib/__init__.py rename to bot/integral_lib/__init__.py index 25364c5..0f3186d 100644 --- a/bot/lib/__init__.py +++ b/bot/integral_lib/__init__.py @@ -1,5 +1,5 @@ """ -lib +integral_lib ~~~~~~~~~~~~~ Some libs for the bot which help him """ diff --git a/tests/test_lib_Cog.py b/tests/test_lib_Cog.py index d12d2eb..f35a27d 100644 --- a/tests/test_lib_Cog.py +++ b/tests/test_lib_Cog.py @@ -1,34 +1,24 @@ -import tracemalloc - -tracemalloc.start() - import pytest from disnake.ext.commands.common_bot_base import CommonBotBase from mock import mock -import os -import sys - -sys.path.append(os.path.join(os.path.dirname(__file__), '..')) - -from bot.lib.CogsPrep import cog_list, work_with_cogs +from integral_lib.CogsPrep import cog_list, work_with_cogs def test_cog_list(): - with mock.patch('bot.lib.CogsPrep.listdir') as MockClass: + with mock.patch('integral_lib.CogsPrep.listdir') as MockClass: MockClass.return_value = ['cog1.py', 'cog2.py'] result = cog_list() assert result == ['cog1', 'cog2'] -@pytest.mark.asyncio @pytest.mark.parametrize("cog", ["cog1.py", "cog2"]) @pytest.mark.parametrize("what_do", ['load', 'unload', 'reload', 'disable', 'enable']) -async def test_work_with_cogs(what_do, cog): - with mock.patch('bot.lib.CogsPrep.rename') as mock_rename: +def test_work_with_cogs(what_do, cog): + with mock.patch('integral_lib.CogsPrep.rename') as mock_rename: mock_rename.return_value = None mock_bot = mock.MagicMock(spec=CommonBotBase) - result = await work_with_cogs(what_do, mock_bot, cog) + result = work_with_cogs(what_do, mock_bot, cog) if what_do in ['load', 'enable']: assert mock_bot.load_extension.called elif what_do in ['unload', 'disable']: @@ -36,10 +26,3 @@ async def test_work_with_cogs(what_do, cog): elif what_do == 'reload': assert mock_bot.reload_extension.called - -snapshot = tracemalloc.take_snapshot() -top_stats = snapshot.statistics('lineno') - -print("[ Top 10 ]") -for stat in top_stats[:10]: - print(stat)