updated structure

.gitignore

@@ -1,12 +1,10 @@
 /tmp/
-/audio/*/
+audio/*/
 /.idea
-/user.db
+user.db
 *.pyc
 /.run/
-/.env
+.env
 *.exe
 /venv/
-/fun_and_admin_bot.egg-info/
-/.YMcache/
 config.json

.gitlab-ci.yml

@@ -24,8 +24,12 @@ unittest:
     - test
   before_script:
     - cd $CI_PROJECT_DIR
+    - pip install python-venv
+    - python -m venv venv
+    - chmod u+x venv/bin/activate
+    - source venv/bin/activate
     - pip install -r requirements.txt
-    - pip install pytest-asyncio
+    - cd tests
   script:
     - pytest -v
 

bot/bot.py

@@ -139,14 +139,14 @@ async def reload(inter: ApplicationCommandInteraction, cog: str):
 @reload.autocomplete('cog')
 async def _cog_opt(inter: ApplicationCommandInteraction, current: str):
     current = current.lower()
-    _list = await cog_list(fold='./cogs/')
+    _list = cog_list(fold='./cogs/')
     return [choice for choice in _list if current in choice.lower()]
 
 
 @enable.autocomplete('cog')
 async def _cog_opt(inter: ApplicationCommandInteraction, current: str):
     current = current.lower()
-    _list = await cog_list(fold='./cogs/disabled/')
+    _list = cog_list(fold='./cogs/disabled/')
     return [choice for choice in _list if current in choice.lower()]
 
 

bot/cogs/admin.py

@@ -4,9 +4,9 @@ import disnake
 from disnake import Option, OptionType, Localized
 from disnake.ext import commands, tasks
 
-from lib.Comands import read_json, write_json
+from bot.lib.Comands import read_json, write_json
-from lib.DB_Worker import fill_bd, prepare_db, work_with_db
+from bot.lib.DB_Worker import fill_bd, prepare_db, work_with_db
-from lib.Logger import logger
+from bot.lib.Logger import logger
 
 
 class Admin(commands.Cog, name='Admin'):

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.Logger import logger
+from bot.lib.ListGenerator import ListGenerator
-from lib.Player import play_audio
+from bot.lib.Logger import logger
-from lib.ListGenerator import ListGenerator
+from bot.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 lib.Comands import read_json
+                from bot.lib.Comands import read_json
                 _role = await read_json(member.guild.id, 'tigger_role')
                 audio: list = []
                 for _a in ListGenerator('audio'):

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 bot.lib import logger
-from lib.Logger import logger
+from bot.lib import write_json
 
 
 class Fun(commands.Cog, name='Fun'):

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 bot.lib import YandexPlayer
-from lib.Logger import logger
+from bot.lib import logger
 
 
 class Testing(commands.Cog, name='Testing'):

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 bot.lib.Logger import logger
 
 
 class General(commands.Cog):

bot/cogs/info.py

@@ -5,9 +5,9 @@ import psutil
 from disnake import ApplicationCommandInteraction
 from disnake.ext import commands
 
-from __init__ import version_info as ver
+from bot.__init__ import version_info as ver
-from lib.Comands import determine_prefix
+from bot.lib.Comands import determine_prefix
-from lib.Logger import logger
+from bot.lib.Logger import logger
 
 
 class BotInfo(commands.Cog, name='Bot Info'):

bot/lib/DB_Worker.py

@@ -1,6 +1,6 @@
 from sqlite3 import connect, Error
 
-from lib.Logger import logger
+from .Logger import logger
 
 
 class DBReader:

tests/test_lib_Cog.py

@@ -1,8 +1,13 @@
+import os
+import sys
+
 import pytest
 from disnake.ext.commands.common_bot_base import CommonBotBase
 from mock import mock
 
-from lib.CogsPrep import cog_list, work_with_cogs
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+
+from bot.lib.CogsPrep import cog_list, work_with_cogs
 
 
 def test_cog_list():