From e68b0efceceff66e0b6f6390d342f9c925005134 Mon Sep 17 00:00:00 2001 From: Sheppy Date: Mon, 23 Oct 2017 05:28:46 +0200 Subject: [PATCH] genocide --- herbstluftwm/autostart | 3 --- herbstluftwm/hl_status_deamon.py | 16 +++++++++++++--- herbstluftwm/test_cal.py | 11 ----------- 3 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 herbstluftwm/test_cal.py diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart index 858e4cc..9b3d701 100755 --- a/herbstluftwm/autostart +++ b/herbstluftwm/autostart @@ -245,6 +245,3 @@ for monitor in $(herbstclient list_monitors | cut -d: -f1) ; do # start it on each monitor "$panel" $monitor & done - -touch ~/.config/cip_logins -echo $HOST >> ~/.config/cip_logins diff --git a/herbstluftwm/hl_status_deamon.py b/herbstluftwm/hl_status_deamon.py index d09cd24..fe6f0b5 100755 --- a/herbstluftwm/hl_status_deamon.py +++ b/herbstluftwm/hl_status_deamon.py @@ -4,9 +4,11 @@ import sys import time import sys import subprocess +from datetime import datetime from hl_panel_content import color_panel, get_color from hl_utils import error, is_cip, shexec, color_remove, hlpath, is_laptop import re +import socket RED = 0xff0000 GREEN = 0x32CD32 @@ -71,7 +73,7 @@ def battery(): return color_panel(str(e),RED) def battery_status(): - if is_laptop: + if is_laptop(): with open(hlpath("battery.log"),'w') as g: g.write(battery()) @@ -85,6 +87,15 @@ def ip_status(): g.write(tmp) +def trace_login(): + if is_cip(): + try: + tmp = shexec("wget --timeout=3 -O- --quiet 'https://atlantishq.de/ciplog/"+socket.gethostname()+"&active&"+str(datetime.now())+"'") + except: + tmp = "Service Unreachable" + with open(hlpath("cip_logins.log"),'w') as f: + f.write(tmp) + if __name__ == '__main__': #print('"'+sys.argv[-1]+'"') while(True): @@ -92,8 +103,7 @@ if __name__ == '__main__': pr_acct_status() battery_status() ip_status() + trace_login() if sys.argv[-1]=='--refresh': break time.sleep(30) - - diff --git a/herbstluftwm/test_cal.py b/herbstluftwm/test_cal.py deleted file mode 100644 index c697d43..0000000 --- a/herbstluftwm/test_cal.py +++ /dev/null @@ -1,11 +0,0 @@ -import urllib3 -import socket - -http = urllib3.PoolManager() -socket.setdefaulttimeout(5) -url = 'https://squarez.fauiwg.de:7001/radicale/testuser/cal.ics/' -headers = urllib3.util.make_headers(basic_auth='testuser:test') -r = http.request('GET', url, headers=headers) -f = open(test.log,'w') -f.write(r) -f.close()