X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=ad972ca76d4e03026aee1024ed280bad0b422628;hp=861f7c95c1542ba315f742ecf8e9d1a00a5d23cc;hb=b740ff0b251e29a03db4471062edc45fa6734735;hpb=4743f13254a4cbdfd266b36f8bb451c292e6278a diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index 861f7c9..ad972ca 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -7,11 +7,13 @@ import sys, os, string, re, pwd if USE_DB: import pg from time import time, sleep from popen2 import popen2 -from LATClient import LATClient -from VendingMachine import VendingMachine -from ConfigParser import ConfigParser +from LATClient import LATClient, LATClientException +from VendingMachine import VendingMachine, VendingException from HorizScroll import HorizScroll from random import random, seed +from Idler import TrainIdler,GrayIdler +import socket +from traceback import print_tb GREETING = 'UCC SNACKS' PIN_LENGTH = 4 @@ -109,7 +111,7 @@ def verify_user_pin(uid, pin): else: return None -def door_open_mode(vending_machine): +def door_open_mode(v): print "Entering open door mode" v.display("-FEED ME-") while True: @@ -122,68 +124,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)) @@ -200,7 +143,7 @@ def cookie(v): else: s += chr(int(random()*26)+ord('A')) reveal += 1 - reveal %= 53 + reveal %= 17 else: s += msg[i] v.display(s) @@ -254,27 +197,7 @@ class MessageKeeper: def done(self): return len(self.scrolling_message) == 0 -if __name__ == '__main__': - cp = ConfigParser() - cp.read('/etc/dispense/servers.conf') - DBServer = cp.get('Database', 'Server') - DBName = cp.get('Database', 'Name') - DBUser = cp.get('VendingMachine', 'DBUser') - DBPassword = cp.get('VendingMachine', 'DBPassword') - - ServiceName = cp.get('VendingMachine', 'ServiceName') - ServicePassword = cp.get('VendingMachine', 'Password') - # Open vending machine via LAT - if 0: - latclient = LATClient(service = ServiceName, password = ServicePassword) - (rfh, wfh) = latclient.get_fh() - else: - #(rfh, wfh) = popen2('../../virtualvend/vvend.py') - import socket - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) - sock.connect(('localhost', 5150)) - rfh = sock.makefile('r') - wfh = sock.makefile('w') +def run_forever(rfh, wfh): v = VendingMachine(rfh, wfh) print 'PING is', v.ping() @@ -286,7 +209,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 +220,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 +249,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 +274,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 +320,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 +338,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 +361,65 @@ if __name__ == '__main__': v.display('THANK YOU') sleep(0.5) cur_selection = '' - time_to_autologout = time() + 10 + time_to_autologout = time() + 8 + +# FIXME: a less ugly way of passing all these options would be nice +def connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword): + # Open vending machine via LAT + if options.use_lat: + latclient = LATClient(service = ServiceName, password = ServicePassword, server_name = ServerName, connect_password = ConnectPassword, priv_password = PrivPassword) + rfh, wfh = latclient.get_fh() + else: + #(rfh, wfh) = popen2('../../virtualvend/vvend.py') + import socket + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) + sock.connect((options.host, options.port)) + rfh = sock.makefile('r') + wfh = sock.makefile('w') + + return rfh, wfh + +if __name__ == '__main__': + from ConfigParser import ConfigParser + from optparse import OptionParser + + op = OptionParser(usage="%prog [OPTION]...") + op.add_option('-f', '--config-file', default='/etc/dispense/servers.conf', metavar='FILE', dest='config_file', help='use the specified config file instead of /etc/dispense/servers.conf') + op.add_option('-v', '--virtualvend', action='store_false', default=True, dest='use_lat', help='use the virtual vending server instead of LAT') + op.add_option('-n', '--hostname', dest='host', default='localhost', help='the hostname to connect to for virtual vending machine mode (default: localhost)') + op.add_option('-p', '--port', dest='port', default=5150, type='int', help='the port number to connect to (default: 5150)') + options, args = op.parse_args() + + if len(args) != 0: + op.error('extra command line arguments: ' + ' '.join(args)) + + cp = ConfigParser() + cp.read(options.config_file) + DBServer = cp.get('Database', 'Server') + DBName = cp.get('Database', 'Name') + DBUser = cp.get('VendingMachine', 'DBUser') + DBPassword = cp.get('VendingMachine', 'DBPassword') + + ServiceName = cp.get('VendingMachine', 'ServiceName') + ServicePassword = cp.get('VendingMachine', 'Password') + + ServerName = cp.get('DecServer', 'Name') + ConnectPassword = cp.get('DecServer', 'ConnectPassword') + PrivPassword = cp.get('DecServer', 'PrivPassword') + + while True: + try: + rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword) + except (LATClientException, socket.error): + (exc_type, exc_value, exc_traceback) = sys.exc_info() + print "Connection error ("+str(exc_type)+"):" + print_tb(exc_traceback) + del exc_traceback + print "Trying again in 5 seconds." + sleep(5) + continue + try: + run_forever(rfh, wfh) + except VendingException: + print "Connection died, trying again..." +