X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendingMachine.py;h=7a06111732531f9b6bc1037d97531878856d54a6;hp=edc593c7844e40738d5fc547aba43bef2eb0765f;hb=5769169657fae81bc68c88c9fa19313acbb9e83f;hpb=8b524700d029ce8cf29130f5b9be24fa2f7e6ffe

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index edc593c..7a06111 100644
--- a/sql-edition/servers/VendingMachine.py
+++ b/sql-edition/servers/VendingMachine.py
@@ -2,6 +2,8 @@
 import re
 from CRC import do_crc
 from select import select
+import socket, logging
+from time import time, sleep
 
 asynchronous_responses = [	'400', '401', # door open/closed
 				'610',        # switches changed
@@ -11,6 +13,9 @@ asynchronous_responses = [	'400', '401', # door open/closed
 DOOR = 1
 SWITCH = 2
 KEY = 3
+TICK = 4
+
+class VendingException(Exception): pass
 
 class VendingMachine:
 	def __init__(self, rfh, wfh):
@@ -27,7 +32,7 @@ class VendingMachine:
 		self.wfh.write('PING\n')
 		code = ''
 		while code != '000':
-			(code, _) = self.get_response()
+			code = self.get_response()[0]
 		self.get_switches()
 
 	def await_prompt(self):
@@ -36,8 +41,12 @@ class VendingMachine:
 		prefix = ''
 		s = ''
 		while True:
-			s = self.rfh.read(1)
-			if s == '': raise Exception('nothing read!')
+			try:
+				s = self.rfh.read(1)
+			except socket.error:
+				raise VendingException('failed to read input from vending machine')
+			if s == '': raise VendingException('nothing read!')
+			if (s != '#' and s != '%') and state == 1: prefix += s
 			if s == '\n' or s == '\r':
 				state = 1
 				prefix = ''
@@ -56,7 +65,8 @@ class VendingMachine:
 			s = ''
 			while s == '':
 				s = self.rfh.readline()
-				if s == '': return None
+				if s == '':
+					raise VendingException('Input socket has closed!')
 				s = s.strip('\r\n')
 			code = s[0:3]
 			text = s[4:]
@@ -80,16 +90,16 @@ class VendingMachine:
 
 	def handle_event(self, code, text):
 		if code == '400':
-			self.events.append((DOOR, 0))
-		elif code == '401':
 			self.events.append((DOOR, 1))
+		elif code == '401':
+			self.events.append((DOOR, 0))
 		elif code == '610':
 			self.events.append((SWITCH, None))
 			self.interpret_switches(text)
 		elif code[0] == '2':
 			self.events.append((KEY, int(code[1:3])))
 		else:
-			sys.stderr.write('WARNING: Unhandled event! (%s %s)\n'%(code,text))
+			logging.warning('Unhandled event! (%s %s)\n'%(code,text))
 
 	def authed_message(self, message):
 		if self.challenge == None:
@@ -107,7 +117,7 @@ class VendingMachine:
 	def vend(self, item):
 		if not re.search('^[0-9][0-9]$', item):
 			return (False, 'Invalid item requested (%s)'%item)
-		self.wfh.write(self.authed_message(('V%s\n'%item)+'\n'))
+		self.wfh.write(self.authed_message(('V%s'%item))+'\n')
 		(code, string) = self.get_response()
 		return (code == '100', code, string)
 
@@ -136,6 +146,7 @@ class VendingMachine:
 	def display(self, string):
 		if len(string) > 10:
 			string = string[0:10]
+		string = re.sub('(.)\.', lambda match: '.'+match.group(1), string)
 		self.wfh.write('D'+string+'\n')
 		(code, string) = self.get_response()
 		return (code == '300', code, string)
@@ -151,7 +162,7 @@ class VendingMachine:
 				timeout = 0
 			else:
 				break
-		if len(self.events) == 0: return None
+		if len(self.events) == 0: return (TICK, time())
 		ret = self.events[0]
 		del self.events[0]
 		return ret