git.ucc.asn.au
/
zanchey
/
dispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* DoorClient.py; cleaned up and has an alarm timeout in case of
[zanchey/dispense2.git]
/
sql-edition
/
servers
/
VendingMachine.py
diff --git
a/sql-edition/servers/VendingMachine.py
b/sql-edition/servers/VendingMachine.py
index
4a40922
..
26dc0f2
100644
(file)
--- a/
sql-edition/servers/VendingMachine.py
+++ b/
sql-edition/servers/VendingMachine.py
@@
-44,6
+44,7
@@
class VendingMachine:
except socket.error:
raise VendingException('failed to read input from vending machine')
if s == '': raise VendingException('nothing read!')
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 = ''
if s == '\n' or s == '\r':
state = 1
prefix = ''
@@
-87,9
+88,9
@@
class VendingMachine:
def handle_event(self, code, text):
if code == '400':
def handle_event(self, code, text):
if code == '400':
- self.events.append((DOOR, 0))
- elif code == '401':
self.events.append((DOOR, 1))
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 == '610':
self.events.append((SWITCH, None))
self.interpret_switches(text)
@@
-114,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)
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)
(code, string) = self.get_response()
return (code == '100', code, string)
@@
-143,6
+144,7
@@
class VendingMachine:
def display(self, string):
if len(string) > 10:
string = string[0:10]
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)
self.wfh.write('D'+string+'\n')
(code, string) = self.get_response()
return (code == '300', code, string)
UCC
git Repository :: git.ucc.asn.au