matu
/
Heroku
mirror of https://github.com/coddrago/Heroku
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: os name in info

pull/68/head
Rilliat 2025-01-15 23:02:13 +03:00
parent 54cf1f0995
commit bea897ff43
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hikka/modules/heroku_info.py
View File

@ -11,7 +11,6 @@ import psutil
from hikkatl.tl.types import Message from hikkatl.tl.types import Message
from hikkatl.utils import get_display_name from hikkatl.utils import get_display_name
from .. import loader, utils, version from .. import loader, utils, version
from ..inline.types import InlineQuery
import subprocess import subprocess
import platform as lib_platform import platform as lib_platform
@ -47,6 +46,16 @@ class HerokuInfoMod(loader.Module):
), ),
) )
def _get_os_name(self):
try:
with open("/etc/os-release", "r") as f:
for line in f:
if line.startswith("PRETTY_NAME"):
return line.split("=")[1].strip().strip('"')
except FileNotFoundError:
return self.strings['non_detectable']
def _render_info(self, inline: bool, start: float) -> str: def _render_info(self, inline: bool, start: float) -> str:
try: try:
repo = git.Repo(search_parent_directories=True) repo = git.Repo(search_parent_directories=True)
@ -87,10 +96,6 @@ class HerokuInfoMod(loader.Module):
("🐧", "<emoji document_id=5361541227604878624>🐧</emoji>") ("🐧", "<emoji document_id=5361541227604878624>🐧</emoji>")
]: ]:
platform = platform.replace(emoji, icon) platform = platform.replace(emoji, icon)
try: os = lib_platform.freedesktop_os_release()["PRETTY_NAME"] or self.strings('non_detectable')
except Exception: os = self.strings('non_detectable')
return ( return (
( (
"<b>🪐 Heroku</b>\n" "<b>🪐 Heroku</b>\n"
@ -110,9 +115,9 @@ class HerokuInfoMod(loader.Module):
branch=version.branch, branch=version.branch,
hostname=lib_platform.node(), hostname=lib_platform.node(),
user=subprocess.run(['whoami'], stdout=subprocess.PIPE).stdout.decode().strip(), user=subprocess.run(['whoami'], stdout=subprocess.PIPE).stdout.decode().strip(),
os=os, os=self._get_os_name() or self.strings('non_detectable'),
kernel=lib_platform.release(), kernel=lib_platform.release(),
cpu=f"{psutil.cpu_count(logical=False)} ({psutil.cpu_count()}) core(-s); {psutil.cpu_percent()}%", cpu=f"{psutil.cpu_count(logical=False)} ({psutil.cpu_count()}) core(-s); {psutil.cpu_percent()}% total",
ping=round((time.perf_counter_ns() - start) / 10**6, 3) ping=round((time.perf_counter_ns() - start) / 10**6, 3)
) )
if self.config["custom_message"] if self.config["custom_message"]