Skip to content

Commit 690a964

Browse files
committed
Now width default terminal size 80
1 parent e3d13b3 commit 690a964

1 file changed

Lines changed: 19 additions & 12 deletions

File tree

src/main.py

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232

3333
__version__ = "2.1"
3434

35-
os.system("")
35+
if sys.platform == "win32":
36+
os.system("")
3637

3738

3839
class ConnectionInfo:
@@ -414,6 +415,12 @@ def update_speeds(self) -> None:
414415
def get_stats_display(self) -> str:
415416
"""Get formatted statistics display"""
416417

418+
if sys.stdout.isatty():
419+
console_width = os.get_terminal_size().columns
420+
else:
421+
console_width = 80
422+
# self.logger.debug("console_width=", console_width)
423+
417424
col_width = 30
418425

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

473-
title = "STATISTICS"
480+
title = " STATISTICS "
474481

475-
top_border = f"\033[92m{'═' * 36} {title} {'═' * 36}\033[0m"
476-
line_conns = f"\033[92m {'Conns'.ljust(8)}:\033[0m {conns_stat}\033[0m"
477-
line_traffic = f"\033[92m {'Traffic'.ljust(8)}:\033[0m {traffic_stat}\033[0m"
478-
line_speed = f"\033[92m {'Speed'.ljust(8)}:\033[0m {speed_stat}\033[0m"
479-
bottom_border = f"\033[92m{'═' * (36*2+len(title)+2)}\033[0m"
482+
top_border = f"\033[92m{title:═^{console_width}}\033[0m"
483+
line_conns = f"\033[92m{'Conns'.ljust(8)}:\033[0m {conns_stat}\033[0m"
484+
line_traffic = f"\033[92m{'Traffic'.ljust(8)}:\033[0m {traffic_stat}\033[0m"
485+
line_speed = f"\033[92m{'Speed'.ljust(8)}:\033[0m {speed_stat}\033[0m"
486+
bottom_border = f"\033[92m{'═' * console_width}\033[0m"
480487

481488
return (
482489
f"{top_border}\n{line_conns}\n{line_traffic}\n{line_speed}\n{bottom_border}"
@@ -1018,10 +1025,10 @@ async def print_banner(self) -> None:
10181025
░░░░░ ░░░░░ ░░░░░░ ░░░░░░░░░░ ░░░░░ ░░░░░\033[0m
10191026
"""
10201027
)
1021-
self.logger.info(f"\033[92mVersion: {__version__}".center(50))
1028+
self.logger.info(f"\033[92mVersion: {__version__}".center(console_width))
10221029
self.logger.info(
10231030
"\033[97m" +
1024-
"Enjoy watching! / Наслаждайтесь просмотром!".center(50)
1031+
"Enjoy watching! / Наслаждайтесь просмотром!".center(console_width)
10251032
)
10261033

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

12961303
parser = argparse.ArgumentParser()
1304+
parser.add_argument(
1305+
"-q", "--quiet", action="store_true", help="Remove UI output"
1306+
)
12971307
parser.add_argument("--host", default="127.0.0.1", help="Proxy host")
12981308
parser.add_argument("--port", type=int,
12991309
default=8881, help="Proxy port")
@@ -1332,9 +1342,6 @@ def parse_args():
13321342
parser.add_argument(
13331343
"--log-error", required=False, help="Path to log file for errors"
13341344
)
1335-
parser.add_argument(
1336-
"-q", "--quiet", action="store_true", help="Remove UI output"
1337-
)
13381345

13391346
autostart_group = parser.add_mutually_exclusive_group()
13401347
autostart_group.add_argument(

0 commit comments

Comments
 (0)