Fixed VPN status

This commit is contained in:
Sheppy
2017-05-22 18:06:48 +02:00
parent d81c63bbe3
commit 9b7c4585e4
2 changed files with 13 additions and 10 deletions

View File

@@ -76,7 +76,8 @@ def vpn():
if not hl_utils.is_cip():
tmp = -1
with open(hl_utils.hlpath("vpn_status.log")) as f:
tmp = float(f.read());
tmp = f.read()
tmp = ' '+tmp
return tmp;
def battery():
@@ -95,7 +96,7 @@ def battery():
if bat.startswith("Charging"):
return color_panel("Charging",GREEN,seper=False) + color_panel(bat.lstrip("Charging ,").strip('\n'),get_color(plain,0,100))
elif bat.startswith("Full"):
elif bat.startswith("Full") or bat.startswith('Unknown'):
return color_panel("On Supply and fully charged",GREEN)
elif plain <= 1:
return color_panel(">>>>>>>>>>>>>>>> --------------- WARNING BATTER FAILURE IMMINENT --------------- <<<<<<<<<<<<<",RED)
@@ -132,5 +133,5 @@ def irc():
pass
else:
return ''
print(vpn(),guthaben(),battery(),sep='')
if __name__ == "__main__":
print(vpn(),guthaben(),battery(),sep='')

View File

@@ -3,7 +3,7 @@ import os
import sys
import time
import subprocess
from hl_panel_content.py import color_panel
from hl_panel_content import color_panel
from hl_utils import error, is_cip, shexec, color_remove, hlpath
RED = 0xff0000
@@ -27,12 +27,14 @@ while(True):
ret += 1;
print(ret)
if ret <= 1:
out_vpn = color_panel("VPN DEACTIVATED",GREEN)
if ret == 2:
out_vpn = color_panel("VPN CONNECTED",RED)
if ret >= 3:
out_vpn = color_panel("VPN DEACTIVATED",RED)
elif ret <= 3:
out_vpn = color_panel("VPN CONNECTED",GREEN)
elif ret >= 4:
out_vpn = color_panel("multiple VPNs connected",YELLOW)
print(out_vpn)
else:
out_vpn = color_panel("WTF VPN STATUS BROKEN",RED)
#print(out_vpn)
with open(vpn_path,'w+') as g:
g.write(out_vpn)
time.sleep(30)