Added iter for DB

This commit is contained in:
2022-09-02 09:47:18 +03:00
parent 646008e4d8
commit 99bf0769e5
7 changed files with 46 additions and 26 deletions

View File

@@ -1,6 +1,5 @@
import sqlite3
import disnake
from lib import logger
@@ -8,12 +7,12 @@ from lib import logger
class DB_Reader:
def __init__(self, guildid: int = None):
self.guildid = guildid
self.list = self._read_db(self.guildid)
self._guildid = guildid
self.list = self._read_db(self._guildid)
self._current_index = 0
def __str__(self) -> str:
return str(self.guildid)
return str(self._guildid)
@classmethod
def _read_db(cls, guildid: int) -> list:
@@ -32,12 +31,12 @@ class DB_Reader:
class _DBAttrs:
def __init__(self,
userid,
username,
nick,
isbot,
defaulttracks,
usertracks):
userid: int,
username: str,
nick: str,
isbot: bool,
defaulttracks: None or list,
usertracks: None or list):
self.userid = userid
self.username = username
self.nick = nick
@@ -68,7 +67,7 @@ class _ListGenerationIter:
_userid = self._list[self._current_index][0]
_username = self._list[self._current_index][1]
_nick = self._list[self._current_index][2]
_isbot = self._list[self._current_index][3]
_isbot = bool(self._list[self._current_index][3])
_defaulttracks = self._list[self._current_index][4]
_usertracks = self._list[self._current_index][5]

View File

@@ -2,13 +2,12 @@ import logging
class _CustomFormatter(logging.Formatter):
grey = "\x1b[38;20m"
yellow = "\x1b[33;20m"
red = "\x1b[31;20m"
bold_red = "\x1b[31;1m"
reset = "\x1b[0m"
format = "%(asctime)s - %(levelname)s - %(module)s \t- %(message)s"
format = f"%(asctime)s - [%(levelname)s] -%(module)s- %(message)s"
FORMATS = {
logging.DEBUG: grey + format + reset,
@@ -18,9 +17,28 @@ class _CustomFormatter(logging.Formatter):
logging.CRITICAL: bold_red + format + reset
}
old_factory = logging.getLogRecordFactory()
def _record_factory(*args, **kwargs):
record = _CustomFormatter.old_factory(*args, **kwargs)
_module = record.module
_levelname = record.levelname
if len(record.module) % 2 == 0 and len(record.module) < 12:
_module = ' ' * ((12 - len(record.module)) // 2) + record.module + ' ' * ((12 - len(record.module)) // 2)
elif len(record.module) % 2 == 1 and len(record.module) <12:
_module = ' ' * ((12 - len(record.module)) // 2) + record.module + ' ' * ((12 - len(record.module)) // 2 + 1)
if len(record.levelname) % 2 == 0 and len(record.levelname) < 8:
_levelname = ' ' * ((8 - len(record.levelname)) // 2) + record.levelname + ' ' * ((8 - len(record.levelname)) // 2)
elif len(record.levelname) % 2 == 1 and len(record.module) < 8:
_levelname = ' ' * ((8 - len(record.levelname)) // 2) + record.levelname + ' ' * ((8 - len(record.levelname)) // 2 + 1)
record.module = _module
record.levelname = _levelname
return record
logging.setLogRecordFactory(_record_factory)
def format(self, record):
log_fmt = self.FORMATS.get(record.levelno)
formatter = logging.Formatter(log_fmt)
formatter = logging.Formatter(log_fmt, "%d-%m-%Y %H:%M:%S")
return formatter.format(record)