X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=c82dda8bc48798baf8a0f9923e7ceacf6f6dcf84;hp=f7bd1cdf642f2bc713998b291fcf80a25a312bd0;hb=8aea36faae28e284eb49bdb57b0251eaf5c2ea1a;hpb=1de3e93582147de8caa7ae47ef0f0664a585219d

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index f7bd1cd..c82dda8 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -4,7 +4,7 @@
 USE_DB = 0
 
 import ConfigParser
-import sys, os, string, re, pwd, signal
+import sys, os, string, re, pwd, signal, math
 import logging, logging.handlers
 from traceback import format_tb
 if USE_DB: import pg
@@ -12,12 +12,29 @@ from time import time, sleep
 from popen2 import popen2
 from LATClient import LATClient, LATClientException
 from VendingMachine import VendingMachine, VendingException
+from MessageKeeper import MessageKeeper
 from HorizScroll import HorizScroll
 from random import random, seed
-from Idler import TrainIdler,GrayIdler
+from Idler import TrainIdler,GrayIdler,StringIdler
 import socket
 from posix import geteuid
 
+CREDITS="""
+This vending machine software brought to you by:
+Bernard Blackham
+Mark Tearle
+Nick Bannon
+Cameron Patrick
+and a collective of hungry alpacas.
+
+
+
+For a good time call +61 8 6488 3901
+
+
+
+"""
+
 GREETING = 'UCC SNACKS'
 PIN_LENGTH = 4
 
@@ -164,50 +181,37 @@ def center(str):
 	LEN = 10
 	return ' '*((LEN-len(str))/2)+str
 
-class MessageKeeper:
-	def __init__(self, vendie):
-		# Each element of scrolling_message should be a 3-tuple of
-		# ('message', True/False if it is to be repeated, time to display)
-		self.scrolling_message = []
-		self.v = vendie
-		self.next_update = None
-
-	def set_message(self, string):
-		self.scrolling_message = [(string, False, None)]
-		self.update_display(True)
-
-	def set_messages(self, strings):
-		self.scrolling_message = strings
-		self.update_display(True)
-
-	def update_display(self, forced = False):
-		if not forced and self.next_update != None and time() < self.next_update:
-			return
-		if len(self.scrolling_message) > 0:
-			if len(self.scrolling_message[0][0]) > 10:
-				(m, r, t) = self.scrolling_message[0]
-				a = []
-				exp = HorizScroll(m).expand(padding = 0, wraparound = True)
-				if t == None:
-					t = 0.1
-				else:
-					t = t / len(exp)
-				for x in exp:
-					a.append((x, r, t))
-				del self.scrolling_message[0]
-				self.scrolling_message = a + self.scrolling_message
-			newmsg = self.scrolling_message[0]
-			if newmsg[2] != None:
-				self.next_update = time() + newmsg[2]
-			else:
-				self.next_update = None
-			self.v.display(self.scrolling_message[0][0])
-			if self.scrolling_message[0][1]:
-				self.scrolling_message.append(self.scrolling_message[0])
-			del self.scrolling_message[0]
 
-	def done(self):
-		return len(self.scrolling_message) == 0
+
+idlers = []
+idler = None
+
+def setup_idlers(v):
+	global idlers, idler
+	idlers = [
+		StringIdler(v),
+		StringIdler(v, text=CREDITS),
+		StringIdler(v, text=str(math.pi) + "            "),
+		StringIdler(v, text=str(math.e) + "            "),
+		GrayIdler(v),
+		TrainIdler(v),
+		GrayIdler(v,one="*",zero="-"),
+		GrayIdler(v,one="/",zero="\\"),
+		GrayIdler(v,one="X",zero="O"),
+		GrayIdler(v,one="*",zero="-",reorder=1),
+		GrayIdler(v,one="/",zero="\\",reorder=1),
+		GrayIdler(v,one="X",zero="O",reorder=1),
+		]
+	idler = choose_idler()
+
+def choose_idler():
+	global idler
+	idler = idlers[int(random()*len(idlers))]
+	idler.reset()
+
+def idle_step():
+	global idler
+	idler.next()
 
 def run_forever(rfh, wfh, options, cf):
 	v = VendingMachine(rfh, wfh)
@@ -221,9 +225,7 @@ def run_forever(rfh, wfh, options, cf):
 	mk = MessageKeeper(v)
 	mk.set_message(GREETING)
 	time_to_autologout = None
-	#idler = TrainIdler(v)
-	#idler = GrayIdler(v)
-	idler = GrayIdler(v,one="*",zero="-")
+	setup_idlers(v)
 	time_to_idle = None
 	last_timeout_refresh = None
 
@@ -254,15 +256,20 @@ def run_forever(rfh, wfh, options, cf):
 			# start autologout
 			time_to_autologout = time() + 15
 
-		if time_to_idle == None and cur_user == '': time_to_idle = time() + 60
-		if time_to_idle != None and cur_user != '': time_to_idle = None
-		if time_to_idle is not None and time() > time_to_idle: idler.next()
+		if time_to_idle == None and cur_user == '':
+			time_to_idle = time() + 5
+			choose_idler()
+		if time_to_idle is not None and cur_user != '': time_to_idle = None
+		if time_to_idle is not None and time() > time_to_idle: idle_step()
+		if time_to_idle is not None and time() > time_to_idle + 300:
+			time_to_idle = time()
+			choose_idler()
 
 		mk.update_display()
 
 		e = v.next_event(0)
 		if e == None:
-			e = v.next_event(0.1)
+			e = v.next_event(0.05)
 			if e == None:
 				continue
 		time_to_idle = None
@@ -556,6 +563,8 @@ if __name__ == '__main__':
 			clean_up_nicely(options, config_opts)
 			logging.warning("Vend Server stopped")
 			break
+		except SystemExit:
+			break
 		except:
 			(exc_type, exc_value, exc_traceback) = sys.exc_info()
 			tb = format_tb(exc_traceback, 20)