flyingscorpio/setup-cockpit
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change output formatting

Browse source
This commit is contained in:
flyingscorpio@arch-desktop 2020-04-21 18:20:09 +02:00
parent 33e5bdc14e
commit 4cec6f22ef
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dotfiles/i3/blocks
View file

@ -51,7 +51,7 @@ interval=1800
[protonvpn]
interval=5
LABEL=VPN
LABEL=
[rofi-calendar]
interval=60

23
dotfiles/i3/scripts/protonvpn
View file

@ -1,20 +1,19 @@
#!/usr/bin/python3
import os
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)
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():
print("VPN - OFF")
OUTPUT = os.environ['LABEL'] + " OFF"
else:
print(
"VPN - {} - {}, {}".format(
ip_addr, city, country
)
)
OUTPUT = "{} {} - {}, {}".format(os.environ['LABEL'], IP_ADDR, CITY, COUNTRY)
print(OUTPUT)