Skip to content

Now width default terminal size 80 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fox0 wants to merge 1 commit into from
Closed

Now width default terminal size 80 #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions src/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@

__version__ = "2.1"

os.system("")
if sys.platform == "win32":
os.system("")


class ConnectionInfo:
Expand Down Expand Up @@ -414,6 +415,12 @@ def update_speeds(self) -> None:
def get_stats_display(self) -> str:
"""Get formatted statistics display"""

if sys.stdout.isatty():
console_width = os.get_terminal_size().columns
else:
console_width = 80
# self.logger.debug("console_width=", console_width)

col_width = 30

conns_stat = f"\033[97mTotal: \033[93m{self.total_connections}\033[0m".ljust(
Expand Down Expand Up @@ -470,13 +477,13 @@ def get_stats_display(self) -> str:
)
)

title = "STATISTICS"
title = " STATISTICS "

top_border = f"\033[92m{'═' * 36} {title} {'═' * 36}\033[0m"
line_conns = f"\033[92m {'Conns'.ljust(8)}:\033[0m {conns_stat}\033[0m"
line_traffic = f"\033[92m {'Traffic'.ljust(8)}:\033[0m {traffic_stat}\033[0m"
line_speed = f"\033[92m {'Speed'.ljust(8)}:\033[0m {speed_stat}\033[0m"
bottom_border = f"\033[92m{'═' * (36*2+len(title)+2)}\033[0m"
top_border = f"\033[92m{title:═^{console_width}}\033[0m"
line_conns = f"\033[92m{'Conns'.ljust(8)}:\033[0m {conns_stat}\033[0m"
line_traffic = f"\033[92m{'Traffic'.ljust(8)}:\033[0m {traffic_stat}\033[0m"
line_speed = f"\033[92m{'Speed'.ljust(8)}:\033[0m {speed_stat}\033[0m"
bottom_border = f"\033[92m{'═' * console_width}\033[0m"

return (
f"{top_border}\n{line_conns}\n{line_traffic}\n{line_speed}\n{bottom_border}"
Expand Down Expand Up @@ -1018,10 +1025,10 @@ async def print_banner(self) -> None:
░░░░░ ░░░░░ ░░░░░░ ░░░░░░░░░░ ░░░░░ ░░░░░\033[0m
"""
)
self.logger.info(f"\033[92mVersion: {__version__}".center(50))
self.logger.info(f"\033[92mVersion: {__version__}".center(console_width))
self.logger.info(
"\033[97m" +
"Enjoy watching! / Наслаждайтесь просмотром!".center(50)
"Enjoy watching! / Наслаждайтесь просмотром!".center(console_width)
)

self.logger.info("\n")
Expand Down Expand Up @@ -1294,6 +1301,9 @@ def parse_args():
"""Parse command line arguments"""

parser = argparse.ArgumentParser()
parser.add_argument(
"-q", "--quiet", action="store_true", help="Remove UI output"
)
parser.add_argument("--host", default="127.0.0.1", help="Proxy host")
parser.add_argument("--port", type=int,
default=8881, help="Proxy port")
Expand Down Expand Up @@ -1332,9 +1342,6 @@ def parse_args():
parser.add_argument(
"--log-error", required=False, help="Path to log file for errors"
)
parser.add_argument(
"-q", "--quiet", action="store_true", help="Remove UI output"
)

autostart_group = parser.add_mutually_exclusive_group()
autostart_group.add_argument(
Expand Down
Loading