ledticker ported, now in use

Author: basti2342

README

@@ -6,11 +6,17 @@ Overview
 * room status (for SpaceAPI etc.)
 * extended information about our hackspace
 * audio announcement system via long polling
-* LED ticker via long polling (still to come)
+* LED ticker via long polling
 * Mate-O-Meter (still to come)
 * MUC (xmpp) status
 * Wiki status (just redirects)
 
+Dependencies
+============
+
+* flask
+* [ledticker.py](https://github.com/hickerspace/ledticker/blob/master/ledticker.py)
+
 Notes
 =====
 * Enable WSGIPassAuthorization to pass through authorisation headers:

README.md

@@ -2,6 +2,7 @@
 from logger import log
 import os
 import time
+import ledticker
 from conf import *
 
 """
@@ -37,11 +38,16 @@ def serveAnnouncement():
 possible, because of the inability to create port forwardings.
 """
 def longPolling():
-	# ledticker check belongs here
-	while not os.path.exists(API_PATH+'/'+ESPEAK_FILE):
+	ticker = ledticker.LedTicker(API_PATH + "/data/ledticker.txt")
+
+	while not os.path.exists(API_PATH+'/'+ESPEAK_FILE) and ticker.items_available() == 0:
 		time.sleep(1)
 
-	if os.path.exists(API_PATH+'/'+ESPEAK_FILE):
+	if ticker.items_available() != 0:
+		# return new ticker messages if available
+		return ticker.get_output()
+
+	elif os.path.exists(API_PATH+'/'+ESPEAK_FILE):
+		# return new announcements (as mp3s) if available
 		return serveAnnouncement()
 
-	# ..and here