X-Git-Url: https://git.realraum.at/?p=svn42.git;a=blobdiff_plain;f=update-web-status.py;h=e1e24126eb068e6da95cf45d5a765569b7423388;hp=8bdd4aa40c6f8930bb6586c4e83bdfd05f787604;hb=9b57ad36fa772a94f8f38321a88f2b1df1818a51;hpb=9209277c08273f6f949c44cdae0f290fcf2bc7e1

diff --git a/update-web-status.py b/update-web-status.py
index 8bdd4aa..e1e2412 100755
--- a/update-web-status.py
+++ b/update-web-status.py
@@ -194,9 +194,18 @@ if len(sys.argv) > 1:
 else:
   uwscfg = UWSConfig()
 
+if len(sys.argv) > 2:
+  if sys.argv[2] == "open":
+    displayOpen()
+  elif sys.argv[2] == "closed":
+    displayClosed()
+  elif sys.argv[2] == "panic":
+    displayPanic()
+  print "Satus submitted to Web, now exiting..."
+  sys.exit(0)
+
 #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:
@@ -209,6 +218,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)
@@ -221,16 +232,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: