X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=update-web-status.py;h=78e3d71e33a5de4b072a9ed68e230cc9c5da8a23;hb=0515535ca45f18e584c4748d34e942f5d7b7d048;hp=10114617c44903a12dcdc13d9179cb05e0d28165;hpb=3a65dac5066d908f5a2c869a349e12164f57aab4;p=svn42.git
diff --git a/update-web-status.py b/update-web-status.py
index 1011461..78e3d71 100755
--- a/update-web-status.py
+++ b/update-web-status.py
@@ -31,6 +31,7 @@ class UWSConfig:
self.config_parser.set('web','cgiuri','https://www.realraum.at/cgi/status.cgi?pass=jako16&set=')
#~ self.config_parser.set('web','htmlopen','Tür ist Offen')
#~ self.config_parser.set('web','htmlclosed','Tür ist Geschlossen')
+ self.config_parser.set('web','htmlbored','Panic! Present&Bored')
self.config_parser.set('web','htmlopen','Leute Anwesend')
self.config_parser.set('web','htmlclosed','Keiner Da')
self.config_parser.add_section('debug')
@@ -165,7 +166,10 @@ def displayOpen():
def displayClosed():
setRealraumHtmlStatus(uwscfg.web_htmlclosed)
-
+
+def displayPanic():
+ setRealraumHtmlStatus(uwscfg.web_htmlbored)
+
def exitHandler(signum, frame):
logging.info("Update-Web-Status stopping")
try:
@@ -191,8 +195,8 @@ else:
uwscfg = UWSConfig()
#socket.setdefaulttimeout(10.0) #affects all new Socket Connections (urllib as well)
-#RE_STATUS = re.compile(r'Status: (\w+), idle')
-RE_PRESENCE = re.compile(r'Presence: (yes|no)')
+RE_PRESENCE = re.compile(r'Presence: (yes|no)(?:, (opened|closed), (.+))?')
+RE_BUTTON = re.compile(r'PanicButton|button\d?')
while True:
try:
if not os.path.exists(uwscfg.tracker_socket):
@@ -204,6 +208,8 @@ while True:
conn = os.fdopen(sockhandle.fileno())
#sockhandle.send("listen\n")
#sockhandle.send("status\n")
+ last_status=None
+ unixts_panic_button=None
while True:
line = conn.readline()
logging.debug("Got Line: " + line)
@@ -216,10 +222,28 @@ while True:
m = RE_PRESENCE.match(line)
if not m is None:
status = m.group(1)
- if status == "yes":
+ last_status=(status == "yes")
+ unixts_panic_button=None
+ if last_status:
+ displayOpen()
+ else:
+ displayClosed()
+ continue
+
+ m = RE_BUTTON.match(line)
+ if not m is None:
+ displayPanic()
+ unixts_panic_button=time.time()
+ continue
+
+ if not last_status is None and not unixts_panic_button is None and time.time() - unixts_panic_button > 3600:
+ unixts_panic_button=None
+ if last_status:
displayOpen()
else:
displayClosed()
+ continue
+
except Exception, ex:
logging.error("main: "+str(ex))
try: