StNicolay/PassManager
Archived
1
1
Fork 0
Code Pull Requests Releases 8 Activity

Renamed functions in db.get

Browse Source 
get_accounts -> get_account_names
get_all_accounts -> get_accounts
This commit is contained in:
StNicolay 2023-01-03 12:08:06 +03:00
parent 9ec66a3521
commit f9d163361a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bot/message_handlers.py
View File

@ -36,7 +36,7 @@ async def get_accounts(
mes: Message, mes: Message,
) -> None: ) -> None:
await base_handler(bot, mes) await base_handler(bot, mes)
accounts = db.get.get_accounts( accounts = db.get.get_account_names(
engine, engine,
mes.from_user.id, mes.from_user.id,
to_sort=True, to_sort=True,
@ -210,7 +210,7 @@ async def _add_account2(
mes.chat.id, mes.chat.id,
"Не корректное название аккаунта", "Не корректное название аккаунта",
) )
if text in db.get.get_accounts(engine, mes.from_user.id): if text in db.get.get_account_names(engine, mes.from_user.id):
return await send_tmp_message( return await send_tmp_message(
bot, mes.chat.id, "Аккаунт с таким именем уже существует" bot, mes.chat.id, "Аккаунт с таким именем уже существует"
) )
@ -332,7 +332,7 @@ async def get_account(bot: AsyncTeleBot, engine: Engine, mes: Message) -> None:
if master_pass is None: if master_pass is None:
return await send_tmp_message(bot, mes.chat.id, "Нет мастер пароля") return await send_tmp_message(bot, mes.chat.id, "Нет мастер пароля")
accounts = db.get.get_accounts( accounts = db.get.get_account_names(
engine, engine,
mes.from_user.id, mes.from_user.id,
to_sort=True, to_sort=True,
@ -355,7 +355,7 @@ async def _get_account2(
if text == "/cancel": if text == "/cancel":
return await send_tmp_message(bot, mes.chat.id, "Успешная отмена") return await send_tmp_message(bot, mes.chat.id, "Успешная отмена")
if text not in db.get.get_accounts(engine, mes.from_user.id): if text not in db.get.get_account_names(engine, mes.from_user.id):
return await send_tmp_message(bot, mes.chat.id, "Нет такого аккаунта") return await send_tmp_message(bot, mes.chat.id, "Нет такого аккаунта")
bot_mes = await bot.send_message(mes.chat.id, "Отправьте мастер пароль") bot_mes = await bot.send_message(mes.chat.id, "Отправьте мастер пароль")
@ -414,7 +414,7 @@ async def delete_account(
if master_pass is None: if master_pass is None:
return await send_tmp_message(bot, mes.chat.id, "Нет мастер пароля") return await send_tmp_message(bot, mes.chat.id, "Нет мастер пароля")
accounts = db.get.get_accounts( accounts = db.get.get_account_names(
engine, engine,
mes.from_user.id, mes.from_user.id,
to_sort=True, to_sort=True,
@ -443,7 +443,7 @@ async def _delete_account2(
if text == "/cancel": if text == "/cancel":
return await send_tmp_message(bot, mes.chat.id, "Успешная отмена") return await send_tmp_message(bot, mes.chat.id, "Успешная отмена")
if text not in db.get.get_accounts(engine, mes.from_user.id): if text not in db.get.get_account_names(engine, mes.from_user.id):
return await send_tmp_message(bot, mes.chat.id, "Нет такого аккаунта") return await send_tmp_message(bot, mes.chat.id, "Нет такого аккаунта")
bot_mes = await bot.send_message( bot_mes = await bot.send_message(
@ -502,7 +502,7 @@ async def export(bot: AsyncTeleBot, engine: Engine, mes: Message) -> None:
if master_password_from_db is None: if master_password_from_db is None:
return await send_tmp_message(bot, mes.chat.id, "Нет мастер пароля") return await send_tmp_message(bot, mes.chat.id, "Нет мастер пароля")
if not db.get.get_accounts(engine, mes.from_user.id): if not db.get.get_account_names(engine, mes.from_user.id):
return await send_tmp_message(bot, mes.chat.id, "Нет аккаунтов") return await send_tmp_message(bot, mes.chat.id, "Нет аккаунтов")
bot_mes = await bot.send_message(mes.chat.id, "Отправьте мастер пароль") bot_mes = await bot.send_message(mes.chat.id, "Отправьте мастер пароль")
@ -529,7 +529,7 @@ async def _export2(
"Не подходит мастер пароль", "Не подходит мастер пароль",
) )
accounts = db.get.get_all_accounts(engine, mes.from_user.id) accounts = db.get.get_accounts(engine, mes.from_user.id)
with ProcessPoolExecutor() as pool: with ProcessPoolExecutor() as pool:
loop = asyncio.get_running_loop() loop = asyncio.get_running_loop()
tasks = [] tasks = []

4
src/db/get.py
View File

@ -17,7 +17,7 @@ def get_master_pass(
return result return result
def get_accounts( def get_account_names(
engine: Engine, engine: Engine,
user_id: int, user_id: int,
*, *,
@ -34,7 +34,7 @@ def get_accounts(
return result return result
def get_all_accounts(engine: Engine, user_id: int) -> list[models.Account]: def get_accounts(engine: Engine, user_id: int) -> list[models.Account]:
"""Returns a list of accounts of a user""" """Returns a list of accounts of a user"""
statement = sqlmodel.select(models.Account).where( statement = sqlmodel.select(models.Account).where(
models.Account.user_id == user_id, models.Account.user_id == user_id,