diff --git a/dotfiles/i3/scripts/protonvpn b/dotfiles/i3/scripts/protonvpn index 294fcbe..bd5451d 100755 --- a/dotfiles/i3/scripts/protonvpn +++ b/dotfiles/i3/scripts/protonvpn @@ -5,15 +5,18 @@ from protonvpn_cli import utils as pvpn_utils IP_ADDR = pvpn_utils.get_ip_info()[0] -CONNECTED_SERVER = pvpn_utils.get_config_value("metadata", "connected_server") -SERVERS = pvpn_utils.get_servers() -COUNTRY_CODE = pvpn_utils.get_server_value(CONNECTED_SERVER, "ExitCountry", SERVERS) -COUNTRY = pvpn_utils.get_country_name(COUNTRY_CODE) -CITY = pvpn_utils.get_server_value(CONNECTED_SERVER, "City", SERVERS) if not pvpn_utils.is_connected(): - OUTPUT = os.environ['LABEL'] + " OFF" + OUTPUT = "{}".format(os.environ['LABEL']) + OUTPUT += " {}".format(IP_ADDR) + else: - OUTPUT = "{} {} - {}, {}".format(os.environ['LABEL'], IP_ADDR, CITY, COUNTRY) + CONNECTED_SERVER = pvpn_utils.get_config_value("metadata", "connected_server") + SERVERS = pvpn_utils.get_servers() + COUNTRY_CODE = pvpn_utils.get_server_value(CONNECTED_SERVER, "ExitCountry", SERVERS) + COUNTRY = pvpn_utils.get_country_name(COUNTRY_CODE) + CITY = pvpn_utils.get_server_value(CONNECTED_SERVER, "City", SERVERS) + OUTPUT = "{}".format(os.environ['LABEL']) + OUTPUT += " {} - {}, {}".format(IP_ADDR, CITY, COUNTRY) print(OUTPUT)