X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=6d79b512e4dd11752afc15e05d241339cda2a27b;hp=184546cf1185190e5657ac5dbb002aa672629ad4;hb=c8fdfd50de52c0f4ffd98a1960398dd02ee42a61;hpb=e462ec5b3bed1437b58a6fa88652089dcd0c70d4

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 184546c..6d79b51 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -12,6 +12,7 @@ from VendingMachine import VendingMachine
 from ConfigParser import ConfigParser
 from HorizScroll import HorizScroll
 from random import random, seed
+from Idler import TrainIdler,GrayIdler
 
 GREETING = 'UCC SNACKS'
 PIN_LENGTH = 4
@@ -122,68 +123,9 @@ def door_open_mode(vending_machine):
 				sleep(1)
 				return
 
-class Idler:
-	def __init__(self, v):
-		self.idle_state = 0
-		self.v = v
-
-	def put_shark(self, s, l):
-		if self.s[l] == ' ':
-			self.s[l] = s
-		elif self.s[l] == 'X':
-			self.s[l] = '*'
-		else:
-			self.s[l] = 'X'
-
-	def next(self):
-		# does the next stage of a dance
-		self.s = [' ']*10
-		shark1 = self.idle_state % 18
-		if shark1 < 9:
-			self.put_shark('^', shark1)
-		else:
-			self.put_shark('^', 18-shark1)
-
-		shark2 = ((self.idle_state+4) % 36)/2
-		if shark2 < 9:
-			self.put_shark('<', shark2)
-		else:
-			self.put_shark('<', 18-shark2)
-
-		shark3 = ((self.idle_state+7) % 54)/3
-		if shark3 < 9:
-			self.put_shark('>', 9-shark3)
-		else:
-			self.put_shark('>', 9-(18-shark3))
-
-		train1 = ((self.idle_state%(18*36)))
-		train1_start = 122
-		if train1 > train1_start and train1 < train1_start+(10*2):
-			for i in range(5):
-				ptr = i+train1-train1_start-5
-				if ptr >= 0 and ptr < 10: self.s[ptr] = '#'
-
-		train2 = ((self.idle_state%(18*36)))
-		train2_start = 400
-		if train2 > train2_start and train2 < train2_start+(10*2):
-			for i in range(5):
-				ptr = i+train2-train2_start-5
-				if ptr >= 0 and ptr < 10: self.s[9-ptr] = '#'
-
-		train3 = ((self.idle_state%(18*36)))
-		train3_start = 230
-		if train3 > train3_start and train3 < train3_start+(10*2):
-			for i in range(10):
-				ptr = i+train3-train3_start-10
-				if ptr >= 0 and ptr < 10: self.s[ptr] = '-'
-
-		self.v.display(string.join(self.s, ''))
-		self.idle_state += 1
-		self.idle_state %= 18*36*54
-
 def cookie(v):
 	seed(time())
-	messages = ['  WASSUP! ', 'PINK FISH ', ' SECRETS ']
+	messages = ['  WASSUP! ', 'PINK FISH ', ' SECRETS ', '  ESKIMO  ', ' FORTUNES ', 'MORE MONEY']
 	choice = int(random()*len(messages))
 	msg = messages[choice]
 	left = range(len(msg))
@@ -199,10 +141,10 @@ def cookie(v):
 					s += msg[i]
 				else:
 					s += chr(int(random()*26)+ord('A'))
+				reveal += 1
+				reveal %= 17
 			else:
 				s += msg[i]
-			reveal += 1
-			reveal %= 173
 		v.display(s)
 
 def center(str):
@@ -286,7 +228,9 @@ if __name__ == '__main__':
 	mk = MessageKeeper(v)
 	mk.set_message(GREETING)
 	time_to_autologout = None
-	idler = Idler(v)
+	#idler = TrainIdler(v)
+	#idler = GrayIdler(v)
+	idler = GrayIdler(v,one="*",zero="-")
 	time_to_idle = None
 	last_timeout_refresh = None
 
@@ -295,7 +239,7 @@ if __name__ == '__main__':
 
 		if time_to_autologout != None:
 			time_left = time_to_autologout - time()
-			if time_left < 5 and (last_timeout_refresh is None or last_timeout_refresh > time_left):
+			if time_left < 6 and (last_timeout_refresh is None or last_timeout_refresh > time_left):
 				mk.set_message('LOGOUT: '+str(int(time_left)))
 				last_timeout_refresh = int(time_left)
 				cur_selection = ''
@@ -324,6 +268,7 @@ if __name__ == '__main__':
 			e = v.next_event(0.1)
 			if e == None:
 				continue
+		time_to_idle = None
 		(event, params) = e
 		print e
 		if event == DOOR:
@@ -348,10 +293,13 @@ if __name__ == '__main__':
 				if len(cur_user) == 5:
 					uid = int(cur_user)
 					if not has_good_pin(uid):
+						#mk.set_messages(
+							#[(center('INVALID'), False, 0.7),
+							 #(center('PIN'), False, 0.7),
+							 #(center('SETUP'), False, 1.0),
+							 #(GREETING, False, None)])
 						mk.set_messages(
-							[(center('INVALID'), False, 0.7),
-							 (center('PIN'), False, 0.7),
-							 (center('SETUP'), False, 1.0),
+							[(' '*10+'INVALID PIN SETUP'+' '*10, False, 3),
 							 (GREETING, False, None)])
 						cur_user = ''
 						cur_pin = ''
@@ -391,9 +339,9 @@ if __name__ == '__main__':
 					cur_pin = ''
 					cur_user = ''
 					cur_selection = ''
-					v.display('BYE!')
-					sleep(0.5)
-					mk.set_message(GREETING)
+					mk.set_messages(
+						[(center('BYE!'), False, 1.5),
+						 (GREETING, False, None)])
 					continue
 				cur_selection += chr(key + ord('0'))
 				mk.set_message('SELECT: '+cur_selection)
@@ -409,8 +357,13 @@ if __name__ == '__main__':
 					#make_selection(cur_selection)
 					# XXX this should move somewhere else:
 					if cur_selection == '55':
-						v.display('GOT DOOR?')
-						os.system('su - "%s" -c "dispense door"'%username)
+						mk.set_message('OPENSESAME')
+						ret = os.system('su - "%s" -c "dispense door"'%username)
+						if ret == 0:
+							mk.set_message(center('DOOR OPEN'))
+						else:
+							mk.set_message(center('BAD DOOR'))
+						sleep(1)
 					elif cur_selection == '91':
 						cookie(v)
 					elif cur_selection == '99':
@@ -427,4 +380,4 @@ if __name__ == '__main__':
 					v.display('THANK YOU')
 					sleep(0.5)
 					cur_selection = ''
-					time_to_autologout = time() + 10
+					time_to_autologout = time() + 8