all modules: update format

parent c2d5c196
...@@ -7,6 +7,7 @@ from altrepo import altrepo ...@@ -7,6 +7,7 @@ from altrepo import altrepo
from database.models import User from database.models import User
from database.func import DB from database.func import DB
from data.keyboards import bugs_keyboards from data.keyboards import bugs_keyboards
from services.utils import _bold
from config import BUGS_URL from config import BUGS_URL
...@@ -42,7 +43,7 @@ async def bugs_handler(m: Message, user: User | None, maintainer: str | None = N ...@@ -42,7 +43,7 @@ async def bugs_handler(m: Message, user: User | None, maintainer: str | None = N
) )
return return
bugs_message = "Ошибки:\n\n" bugs_message = _bold("Ошибки:\n\n")
for i, bug in enumerate(unresolved_bugs): for i, bug in enumerate(unresolved_bugs):
if i == 20: if i == 20:
......
...@@ -5,6 +5,7 @@ from altrepo import altrepo ...@@ -5,6 +5,7 @@ from altrepo import altrepo
from database.models import User from database.models import User
from database.func import DB from database.func import DB
from services.utils import _bold
dp = Dispatch() dp = Dispatch()
...@@ -34,10 +35,10 @@ async def ftbfs_handler(m: Message, user: User | None, _maintainer: str | None = ...@@ -34,10 +35,10 @@ async def ftbfs_handler(m: Message, user: User | None, _maintainer: str | None =
package for package in ftbfs_data if maintainer in package.maintainers] package for package in ftbfs_data if maintainer in package.maintainers]
if not len(maintainer_ftbfs): if not len(maintainer_ftbfs):
await m.answer("Нет не пересобирающихся пакетов") await m.answer("Нет ошибок пересборки")
return return
ftbfs_message = "Ошибки пересборки:\n\n" ftbfs_message = _bold("Ошибки пересборки:\n\n")
for package in maintainer_ftbfs: for package in maintainer_ftbfs:
ftbfs_message += f"{package.name} | {package.ftbfs_weeks} | {", ".join(package.maintainers)}\n" ftbfs_message += f"{package.name} | {package.ftbfs_weeks} | {", ".join(package.maintainers)}\n"
......
...@@ -9,7 +9,7 @@ from data.keyboards import profile_keyboards ...@@ -9,7 +9,7 @@ from data.keyboards import profile_keyboards
from altrepo import altrepo from altrepo import altrepo
from services.menu import send_menu from services.menu import send_menu
from services.utils import _bold
from database.models import User from database.models import User
dp = Dispatch() dp = Dispatch()
...@@ -40,7 +40,7 @@ async def profile_handler(m: Message, user: User | None) -> None: ...@@ -40,7 +40,7 @@ async def profile_handler(m: Message, user: User | None) -> None:
unresolved_bugs = [] unresolved_bugs = []
await m.answer( await m.answer(
"Профиль:\n\n" f"{_bold("Профиль:\n\n")}"
f"Сопровождающий: {user.maintainer.name_ru or user.maintainer.name} ({user.maintainer.nickname})\n" f"Сопровождающий: {user.maintainer.name_ru or user.maintainer.name} ({user.maintainer.nickname})\n"
f"Исходные пакеты: {count_source_pkg}\n" f"Исходные пакеты: {count_source_pkg}\n"
f"Устаревшие пакеты: {len(watch)}\n" f"Устаревшие пакеты: {len(watch)}\n"
......
...@@ -4,6 +4,7 @@ from telegrinder.tools.formatting import HTMLFormatter, link, bold ...@@ -4,6 +4,7 @@ from telegrinder.tools.formatting import HTMLFormatter, link, bold
from aiohttp import ClientResponseError from aiohttp import ClientResponseError
from services.utils import _bold
from database.models import User from database.models import User
from collections import defaultdict from collections import defaultdict
...@@ -30,7 +31,7 @@ async def search_file_handler(m: Message, user: User | None, file_name: str, bra ...@@ -30,7 +31,7 @@ async def search_file_handler(m: Message, user: User | None, file_name: str, bra
await m.answer("Ничего не найдено.") await m.answer("Ничего не найдено.")
return return
search_file_message = "Пакеты:\n\n" search_file_message = _bold("Пакеты:\n\n")
for package in search_file_data.packages: for package in search_file_data.packages:
search_file_message += f"{package.arch} | {package.name} | {package.version}-{package.release}\n" search_file_message += f"{package.arch} | {package.name} | {package.version}-{package.release}\n"
......
...@@ -2,11 +2,11 @@ from telegrinder import MESSAGE_FROM_USER, Dispatch, Message, WaiterMachine, Cal ...@@ -2,11 +2,11 @@ from telegrinder import MESSAGE_FROM_USER, Dispatch, Message, WaiterMachine, Cal
from telegrinder.rules import Command, Text, IsPrivate, Argument from telegrinder.rules import Command, Text, IsPrivate, Argument
from datetime import datetime from datetime import datetime
import locale
from altrepo import altrepo from altrepo import altrepo
from database.models import User from database.models import User
from services.utils import _bold
dp = Dispatch() dp = Dispatch()
wm = WaiterMachine(dp) wm = WaiterMachine(dp)
...@@ -39,7 +39,7 @@ async def statistics_handler(m: Message, user: User | None, branch: str | None = ...@@ -39,7 +39,7 @@ async def statistics_handler(m: Message, user: User | None, branch: str | None =
else: else:
branch = statistics_data.branch branch = statistics_data.branch
statistics_message = f"{branch.capitalize()} ({statistics_date})\n\n" statistics_message = _bold(f"{branch.capitalize()} ({statistics_date})\n\n")
for packages in statistics_data.packages_count: for packages in statistics_data.packages_count:
statistics_message += f"Архитектура: {packages.arch} ({packages.component})\n" statistics_message += f"Архитектура: {packages.arch} ({packages.component})\n"
......
...@@ -7,6 +7,7 @@ from altrepo import altrepo ...@@ -7,6 +7,7 @@ from altrepo import altrepo
from database.models import User from database.models import User
from database.func import DB from database.func import DB
from data.keyboards import watch_keyboards from data.keyboards import watch_keyboards
from services.utils import _bold
dp = Dispatch() dp = Dispatch()
...@@ -40,7 +41,7 @@ async def watch_test_handler( ...@@ -40,7 +41,7 @@ async def watch_test_handler(
await m.answer("Нет устаревших пакетов") await m.answer("Нет устаревших пакетов")
return return
watch_message = "Отслеживание:\n\n" watch_message = _bold("Отслеживание:\n\n")
packages = {} packages = {}
for package in watch_data: for package in watch_data:
......
from telegrinder.tools.formatting import HTMLFormatter, bold
import asyncio import asyncio
from database.func import DB from database.func import DB
...@@ -49,3 +50,6 @@ async def translate_maintainer(nick): ...@@ -49,3 +50,6 @@ async def translate_maintainer(nick):
def chunk_list(lst, size): def chunk_list(lst, size):
return [lst[i:i + size] for i in range(0, len(lst), size)] return [lst[i:i + size] for i in range(0, len(lst), size)]
def _bold(text: str):
return HTMLFormatter(bold(text))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment