From f1db4d46c1f2b8b79c1d1d8116f99765ddf068eb Mon Sep 17 00:00:00 2001 From: Progyan Date: Sun, 8 May 2022 16:27:15 +0530 Subject: [PATCH 1/3] run: Add platform information on startup. --- zulipterminal/cli/run.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zulipterminal/cli/run.py b/zulipterminal/cli/run.py index 12425cfff3..6c38446b28 100755 --- a/zulipterminal/cli/run.py +++ b/zulipterminal/cli/run.py @@ -20,6 +20,7 @@ ) from zulipterminal.core import Controller from zulipterminal.model import ServerConnectionFailure +from zulipterminal.platform_code import PLATFORM from zulipterminal.version import ZT_VERSION @@ -439,6 +440,10 @@ def main(options: Optional[List[str]] = None) -> None: if args.notify: zterm["notify"] = (args.notify, "on command line") + if PLATFORM: + print("Detected Platform: " + PLATFORM) + else: + print("Running on undetected platform.") print("Loading with:") print(" theme '{}' specified {}.".format(*theme_to_use)) complete, incomplete = complete_and_incomplete_themes() From e405fbd58203e34208d9e75af96662a281e634d2 Mon Sep 17 00:00:00 2001 From: Progyan Date: Sun, 8 May 2022 16:37:38 +0530 Subject: [PATCH 2/3] views: Add platform information to the About Pop-Up. Shows PLATFORM from platform_code.py on the About Pop-Up. --- zulipterminal/ui_tools/views.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/zulipterminal/ui_tools/views.py b/zulipterminal/ui_tools/views.py index 50bc0b3aaf..19a14b2b5d 100644 --- a/zulipterminal/ui_tools/views.py +++ b/zulipterminal/ui_tools/views.py @@ -38,6 +38,7 @@ match_stream, match_user, ) +from zulipterminal.platform_code import PLATFORM from zulipterminal.server_url import near_message_url from zulipterminal.ui_tools.boxes import MessageBox, PanelSearchBox from zulipterminal.ui_tools.buttons import ( @@ -1113,7 +1114,13 @@ def __init__( else [] ) contents = [ - ("Application", [("Zulip Terminal", zt_version)]), + ( + "Application", + [ + ("Zulip Terminal", zt_version), + ("Platform detected", PLATFORM if PLATFORM else "Invalid platform"), + ], + ), ("Server", [("Version", server_version)] + self.feature_level_content), ( "Application Configuration", From 9857ec095e931b0eaa785fd4b07f2f3133ee0841 Mon Sep 17 00:00:00 2001 From: Progyan Date: Sun, 8 May 2022 17:02:59 +0530 Subject: [PATCH 3/3] test: Add tests for detected platform. Adds tests for checking what platform is detected. --- tests/cli/test_run.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/cli/test_run.py b/tests/cli/test_run.py index 1452cfd395..8e822eb2a8 100644 --- a/tests/cli/test_run.py +++ b/tests/cli/test_run.py @@ -17,6 +17,7 @@ parse_args, ) from zulipterminal.model import ServerConnectionFailure +from zulipterminal.platform_code import PLATFORM from zulipterminal.version import ZT_VERSION @@ -132,6 +133,7 @@ def test_valid_zuliprc_but_no_connection( lines = captured.out.strip().split("\n") expected_lines = [ + "Detected Platform: " + PLATFORM, "Loading with:", " theme 'zt_dark' specified with no config.", " autohide setting 'no_autohide' specified with no config.", @@ -182,6 +184,7 @@ def test_warning_regarding_incomplete_theme( lines = captured.out.strip().split("\n") expected_lines = [ + "Detected Platform: " + PLATFORM, "Loading with:", f" theme '{bad_theme}' specified on command line.", "\x1b[93m WARNING: Incomplete theme; results may vary!", @@ -395,6 +398,7 @@ def test_successful_main_function_with_config( captured = capsys.readouterr() lines = captured.out.strip().split("\n") expected_lines = [ + f"Detected Platform: {PLATFORM}", "Loading with:", " theme 'zt_dark' specified in zuliprc file (by alias 'default').", " autohide setting 'autohide' specified in zuliprc file.",