optimised imports
This commit is contained in:
@@ -6,11 +6,11 @@ cog_list: return list of cog filenames
|
||||
work_with_cogs: loads, reloads and unloads cogs files
|
||||
|
||||
"""
|
||||
import os
|
||||
from os import listdir
|
||||
from os import listdir, rename
|
||||
from typing import List
|
||||
|
||||
from disnake.ext import commands
|
||||
|
||||
from .Logger import logger
|
||||
|
||||
|
||||
@@ -37,9 +37,9 @@ async def work_with_cogs(what_do, bot: commands.Bot, cog):
|
||||
logger.info(f'Cog {_filename} reloaded')
|
||||
elif what_do == 'disable':
|
||||
bot.unload_extension(f'cogs.{_filename}')
|
||||
os.rename(f'cogs/{_filename}.py', f'cogs/disabled/{_filename}.py')
|
||||
rename(f'cogs/{_filename}.py', f'cogs/disabled/{_filename}.py')
|
||||
logger.info(f'Cog {_filename} stopped and disabled')
|
||||
elif what_do == 'enable':
|
||||
os.rename(f'cogs/disabled/{_filename}.py', f'cogs/{_filename}.py')
|
||||
rename(f'cogs/disabled/{_filename}.py', f'cogs/{_filename}.py')
|
||||
bot.load_extension(f'cogs.{_filename}')
|
||||
logger.info(f'Cog {_filename} started and enabled')
|
||||
|
||||
@@ -3,8 +3,9 @@ lib.Commands
|
||||
~~~~~~~~~~~~~~
|
||||
Some prepare for commands
|
||||
"""
|
||||
import json
|
||||
import os
|
||||
from json import load, decoder, dump, JSONDecodeError
|
||||
from os import getenv
|
||||
|
||||
from disnake.ext import commands
|
||||
|
||||
|
||||
@@ -16,10 +17,10 @@ async def read_json(guild: int, _param: str):
|
||||
:return: value of parameter.
|
||||
"""
|
||||
parameter = None
|
||||
with open(os.getenv('CONF_FILE'), encoding='utf-8') as f: # Open the JSON
|
||||
with open(getenv('CONF_FILE'), encoding='utf-8') as f: # Open the JSON
|
||||
try:
|
||||
_json = json.load(f) # Load the custom prefixes
|
||||
except json.decoder.JSONDecodeError:
|
||||
_json = load(f) # Load the custom prefixes
|
||||
except decoder.JSONDecodeError:
|
||||
_json = {}
|
||||
if guild: # If the guild exists
|
||||
try:
|
||||
@@ -34,10 +35,10 @@ async def read_json(guild: int, _param: str):
|
||||
|
||||
|
||||
async def write_json(guild: int, param_name: str, param: str or int):
|
||||
with open(os.getenv('CONF_FILE'), encoding='utf-8') as f:
|
||||
with open(getenv('CONF_FILE'), encoding='utf-8') as f:
|
||||
try:
|
||||
_json = json.load(f)
|
||||
except json.decoder.JSONDecodeError:
|
||||
_json = load(f)
|
||||
except decoder.JSONDecodeError:
|
||||
_json = {}
|
||||
try:
|
||||
_guild = _json[f'{guild}']
|
||||
@@ -45,8 +46,8 @@ async def write_json(guild: int, param_name: str, param: str or int):
|
||||
_json.update({f'{guild}': {}})
|
||||
_guild = _json[f'{guild}']
|
||||
_guild.update({f'{param_name}': f'{param}'})
|
||||
with open(os.getenv('CONF_FILE'), 'w', encoding='utf-8') as f:
|
||||
json.dump(_json, f, indent=4)
|
||||
with open(getenv('CONF_FILE'), 'w', encoding='utf-8') as f:
|
||||
dump(_json, f, indent=4)
|
||||
|
||||
|
||||
def determine_prefix(bot: commands.Bot, msg):
|
||||
@@ -57,10 +58,10 @@ def determine_prefix(bot: commands.Bot, msg):
|
||||
:return: prefix for server, default is $
|
||||
"""
|
||||
parameter = '$'
|
||||
with open(os.getenv('CONF_FILE'), encoding='utf-8') as f: # Open the JSON
|
||||
with open(getenv('CONF_FILE'), encoding='utf-8') as f: # Open the JSON
|
||||
try:
|
||||
_json = json.load(f) # Load the custom prefixes
|
||||
except json.JSONDecodeError:
|
||||
_json = load(f) # Load the custom prefixes
|
||||
except JSONDecodeError:
|
||||
_json = {}
|
||||
try:
|
||||
parameter = _json[f"{msg.guild.id}"]["prefix"] # Read prefix from json if is setted up
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import sqlite3
|
||||
from sqlite3 import connect, Error
|
||||
|
||||
from lib.Logger import logger
|
||||
|
||||
@@ -16,13 +16,13 @@ class DBReader:
|
||||
@classmethod
|
||||
def _read_db(cls, guildid: int) -> list:
|
||||
try:
|
||||
sql_con = sqlite3.connect("user.db")
|
||||
sql_con = connect("user.db")
|
||||
cursor = sql_con.cursor()
|
||||
cursor.execute("""SELECT * FROM "(guildid)" """,
|
||||
{'guildid': guildid})
|
||||
record = cursor.fetchall()
|
||||
return record
|
||||
except sqlite3.Error as _e:
|
||||
except Error as _e:
|
||||
logger.info(f'Error reading DB\n{_e}')
|
||||
|
||||
def __iter__(self):
|
||||
@@ -84,13 +84,13 @@ class _ListGenerationIter:
|
||||
|
||||
async def prepare_db(guild: int):
|
||||
try:
|
||||
connect = sqlite3.connect('user.db')
|
||||
cursor = connect.cursor()
|
||||
_connect = connect('user.db')
|
||||
cursor = _connect.cursor()
|
||||
cursor.execute(f'''CREATE TABLE IF NOT EXISTS "{guild}"
|
||||
([userid] INTEGER PRIMARY KEY, [username] TEXT,
|
||||
[nick] TEXT, [isbot] BOOL, [defaulttracks] TEXT, [usertracks] TEXT)''')
|
||||
cursor.close()
|
||||
except sqlite3.Error as _error:
|
||||
except Error as _error:
|
||||
logger.info(_error)
|
||||
|
||||
|
||||
@@ -101,12 +101,12 @@ async def work_with_db(db_func: str, data_turple: tuple):
|
||||
:param data_turple:
|
||||
"""
|
||||
try:
|
||||
connect = sqlite3.connect('user.db')
|
||||
cursor = connect.cursor()
|
||||
_connect = connect('user.db')
|
||||
cursor = _connect.cursor()
|
||||
cursor.execute(db_func, data_turple)
|
||||
connect.commit()
|
||||
_connect.commit()
|
||||
cursor.close()
|
||||
except sqlite3.Error as _error:
|
||||
except Error as _error:
|
||||
logger.critical(_error)
|
||||
|
||||
|
||||
@@ -126,10 +126,10 @@ async def read_db(guild: int, user: int, column: str):
|
||||
'defaulttracks': 4,
|
||||
'usertracks': 5}
|
||||
try:
|
||||
sql_con = sqlite3.connect("user.db")
|
||||
sql_con = connect("user.db")
|
||||
cursor = sql_con.cursor()
|
||||
cursor.execute(f"""SELECT * FROM "{guild}" where userid = {user}""")
|
||||
record = cursor.fetchone()
|
||||
return record[_col_dict[column]]
|
||||
except sqlite3.Error as _error:
|
||||
except Error as _error:
|
||||
logger.critical(_error)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import mimetypes
|
||||
import os
|
||||
from mimetypes import guess_type
|
||||
from os import walk
|
||||
|
||||
|
||||
class ListGenerator:
|
||||
@@ -19,7 +19,7 @@ class ListGenerator:
|
||||
def _lister(cls, path) -> list:
|
||||
_list: list = []
|
||||
try:
|
||||
for f in os.walk(path):
|
||||
for f in walk(path):
|
||||
_list.extend(f)
|
||||
break
|
||||
return sorted(_list[2])
|
||||
@@ -63,7 +63,7 @@ class _ListGenerationIter:
|
||||
|
||||
@property
|
||||
def type(self) -> str:
|
||||
guess = mimetypes.guess_type(f'{self._path}/{self._list[self._current_index]}')[0]
|
||||
guess = guess_type(f'{self._path}/{self._list[self._current_index]}')[0]
|
||||
return guess
|
||||
|
||||
@property
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
from .Logger import logger
|
||||
from asyncio import sleep
|
||||
|
||||
from disnake import FFmpegOpusAudio
|
||||
|
||||
from .Logger import logger
|
||||
|
||||
|
||||
async def play_audio(audio, bot, vc):
|
||||
if not bot.voice_clients:
|
||||
logger.error(f'Playing: {audio}')
|
||||
vp = await vc.connect()
|
||||
if not vp.is_playing():
|
||||
vp.play(FFmpegOpusAudio(f'{audio}'))
|
||||
vp.play(FFmpegOpusAudio(f'{audio}', ))
|
||||
while vp.is_playing():
|
||||
await sleep(0.5)
|
||||
await sleep(1)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import os
|
||||
from os import getenv
|
||||
|
||||
from yandex_music import Client
|
||||
|
||||
client = Client(os.getenv('YANDEX_TOKEN')).init()
|
||||
client = Client(getenv('YANDEX_TOKEN')).init()
|
||||
|
||||
|
||||
def search(_str: str, _type: str = 'all') -> dict:
|
||||
|
||||
Reference in New Issue
Block a user