notes for later

[uccvend-vendserver.git] / sql-edition / servers / VendingMachine.py

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index e242df8..26dc0f2 100644 (file)
--- a/sql-edition/servers/VendingMachine.py
+++ b/sql-edition/servers/VendingMachine.py
@@ -1,7 +1,8 @@
 # vim:ts=4
-import re, pg
+import re
 from CRC import do_crc
 from select import select
+import socket, logging
 
 asynchronous_responses = [     '400', '401', # door open/closed
                                '610',        # switches changed
@@ -12,6 +13,8 @@ DOOR = 1
 SWITCH = 2
 KEY = 3
 
+class VendingException(Exception): pass
+
 class VendingMachine:
        def __init__(self, rfh, wfh):
                self.events = []
@@ -27,7 +30,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 +39,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 +63,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 +88,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 +115,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 +144,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)