X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=ccee841fbdde3a0ceb5ed5bafd57f7a01a5aa742;hp=12ebe5b1282f3642e9e9d1555fa7109414021045;hb=ea5f5224005877c134376f0470d20e257f3dde4e;hpb=1532e6ecbe484e7d181b12d200f4819d160accde diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index 12ebe5b..ccee841 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -16,7 +16,8 @@ from VendingMachine import VendingMachine, VendingException from MessageKeeper import MessageKeeper from HorizScroll import HorizScroll from random import random, seed -from Idler import TrainIdler,GrayIdler,StringIdler,ClockIdler,FortuneIdler,FileIdler,PipeIdler +from Idler import GreetingIdler,TrainIdler,GrayIdler,StringIdler,ClockIdler,FortuneIdler,FileIdler,PipeIdler +from SnackConfig import get_snacks, get_snack import socket from posix import geteuid @@ -36,7 +37,6 @@ For a good time call +61 8 6488 3901 """ -GREETING = 'UCC SNACKS' PIN_LENGTH = 4 DOOR = 1 @@ -54,7 +54,7 @@ STATE_GET_SELECTION = 6 STATE_GRANDFATHER_CLOCK = 7 TEXT_SPEED = 0.8 -IDLE_SPEED = 0.02 +IDLE_SPEED = 0.05 class DispenseDatabaseException(Exception): pass @@ -105,9 +105,20 @@ def scroll_options(username, mk, welcome = False): c = c.strip() (slot_num, price, slot_name) = c.split(' ', 2) if slot_name == 'dead': continue - choices += '%s8-%s (%sc) '%(slot_num, slot_name, price) + choices += '%s-(%sc)-%s8'%(slot_name, price, slot_num) + +# we don't want to print snacks for now since it'll be too large +# and there's physical bits of paper in the machine anyway - matt +# try: +# snacks = get_snacks() +# except: +# snacks = {} +# +# for slot, ( name, price ) in snacks.items(): +# choices += '%s8-%s (%sc) ' % ( slot, name, price ) + choices += '55-DOOR ' - choices += 'OR A SNACK. ' + choices += 'OR ANOTHER SNACK. ' choices += '99 TO READ AGAIN. ' choices += 'CHOICE? ' msg.append((choices, False, None)) @@ -127,8 +138,8 @@ def get_pin(uid): logging.info('getting pin for uid %d: .pin not found in home directory'%uid) return None if s.st_mode & 077: - logging.info('getting pin for uid %d: .pin has wrong permissions'%uid) - return None + logging.info('getting pin for uid %d: .pin has wrong permissions. Fixing.'%uid) + os.chmod(pinfile, 0600) try: f = file(pinfile) except IOError: @@ -197,15 +208,15 @@ def setup_idlers(v): GrayIdler(v,one="/",zero="\\"), ClockIdler(v), GrayIdler(v,one="X",zero="O"), - FileIdler(v, '/usr/share/common-licenses/GPL-2'), + FileIdler(v, '/usr/share/common-licenses/GPL-2',affinity=2), GrayIdler(v,one="*",zero="-",reorder=1), StringIdler(v, text=str(math.pi) + " "), ClockIdler(v), GrayIdler(v,one="/",zero="\\",reorder=1), StringIdler(v, text=str(math.e) + " "), GrayIdler(v,one="X",zero="O",reorder=1), - StringIdler(v, text=" I want some pizza - please call Pizza Hut Shenton Park on +61 8 9381 9979 - and order as Quinn - I am getting really hungry", repeat=False), - PipeIdler(v, "/usr/bin/ypcat", "passwd"), + StringIdler(v, text=" I want some pizza - please call Pizza Hut Shenton Park on +61 8 9381 9979 [now closed? - MSH] - and order as Quinn - I am getting really hungry", repeat=False), + PipeIdler(v, "/usr/bin/getent", "passwd"), FortuneIdler(v), ClockIdler(v), StringIdler(v), @@ -213,31 +224,43 @@ def setup_idlers(v): ] disabled = [ ] - idler = choose_idler() + +def reset_idler(v, vstatus, t = None): + global idlers, idler + idler = GreetingIdler(v, t) + vstatus.time_of_next_idlestep = time()+idler.next() + vstatus.time_of_next_idler = None + vstatus.change_state(STATE_IDLE, 1) def choose_idler(): global idlers, idler iiindex = 0 + average_affinity = 10 # guessing here... - if idler: + if idler and idler.__class__ != GreetingIdler: iiindex = idlers.index(idler) iilen = len(idlers) - move = int(random()*len(idlers)) + 1 + move = int(random()*len(idlers)*average_affinity) + 1 while move >= 0: - idler = idlers[( (iiindex + 1) % iilen)] - move = move - idler.affinity() + iiindex += 1 + iiindex %= iilen + idler = idlers[iiindex] + move -= idler.affinity() idler.reset() -def idle_step(): +def idle_step(vstatus): global idler if idler.finished(): choose_idler() - sleep(IDLE_SPEED) - idler.next() + vstatus.time_of_next_idler = time() + 30 + nextidle = idler.next() + if nextidle is None: + nextidle = IDLE_SPEED + vstatus.time_of_next_idlestep = time()+nextidle class VendState: def __init__(self,v): @@ -252,8 +275,6 @@ class VendState: self.cur_selection = '' self.time_to_autologout = None - self.time_to_idle = None - self.last_timeout_refresh = None def change_state(self,newstate,newcounter=None): @@ -311,10 +332,7 @@ def handle_get_selection_idle(state, event, params, v, vstatus): vstatus.cur_pin = '' vstatus.cur_selection = '' - idle_in(vstatus,2) - vstatus.change_state(STATE_IDLE) - - vstatus.mk.set_message(GREETING) + reset_idler(v, vstatus) ### State fully logged out ... reset variables if vstatus.time_to_autologout and not vstatus.mk.done(): @@ -328,12 +346,6 @@ def handle_get_selection_idle(state, event, params, v, vstatus): vstatus.time_to_autologout = time() + 15 vstatus.last_timeout_refresh = None - ### State logged out ... after normal logout?? - # perhaps when logged in? - if vstatus.time_to_idle is not None and vstatus.cur_user != '': - vstatus.time_to_idle = None - - ## FIXME - this may need to be elsewhere..... # need to check vstatus.mk.update_display() @@ -348,12 +360,8 @@ def handle_get_selection_key(state, event, params, v, vstatus): vstatus.cur_user = '' vstatus.cur_selection = '' - idle_in(vstatus,2) - vstatus.change_state(STATE_IDLE) - - vstatus.mk.set_messages( - [(center('BYE!'), False, 1.5), - (GREETING, False, None)]) + vstatus.mk.set_messages([(center('BYE!'), False, 1.5)]) + reset_idler(v, vstatus, 2) return vstatus.cur_selection += chr(key + ord('0')) vstatus.mk.set_message('SELECT: '+vstatus.cur_selection) @@ -400,8 +408,14 @@ def make_selection(v, vstatus): else: v.display('GOT COKE!') else: - v.display(vstatus.cur_selection+' - $1.00') - if ((os.system('su - "%s" -c "dispense snack"'%(vstatus.username)) >> 8) == 0): + # first see if it's a named slot + try: + price, shortname, name = get_snack( vstatus.cur_selection ) + except: + price, shortname, name = get_snack( '--' ) + dollarprice = "$%.2f" % ( price / 100.0 ) + v.display(vstatus.cur_selection+' - %s'%dollarprice) + if ((os.system('su - "%s" -c "dispense %s"'%(vstatus.username, shortname)) >> 8) == 0): v.vend(vstatus.cur_selection) v.display('THANK YOU') else: @@ -416,10 +430,7 @@ def handle_getting_pin_key(state, event, params, v, vstatus): if key == 11: if vstatus.cur_pin == '': vstatus.cur_user = '' - vstatus.mk.set_message(GREETING) - - idle_in(vstatus,5) - vstatus.change_state(STATE_IDLE) + reset_idler(v, vstatus) return vstatus.cur_pin = '' @@ -439,13 +450,11 @@ def handle_getting_pin_key(state, event, params, v, vstatus): v.beep(40, False) vstatus.mk.set_messages( [(center('BAD PIN'), False, 1.0), - (center('SORRY'), False, 0.5), - (GREETING, False, None)]) + (center('SORRY'), False, 0.5)]) vstatus.cur_user = '' vstatus.cur_pin = '' - idle_in(vstatus,5) - vstatus.change_state(STATE_IDLE) + reset_idler(v, vstatus, 2) return @@ -457,10 +466,8 @@ def handle_getting_uid_key(state, event, params, v, vstatus): if len(vstatus.cur_user) < 5: if key == 11: vstatus.cur_user = '' - vstatus.mk.set_message(GREETING) - idle_in(vstatus,5) - vstatus.change_state(STATE_IDLE) + reset_idler(v, vstatus) return vstatus.cur_user += chr(key + ord('0')) @@ -468,16 +475,54 @@ def handle_getting_uid_key(state, event, params, v, vstatus): if len(vstatus.cur_user) == 5: uid = int(vstatus.cur_user) + if uid == 0: + logging.info('user '+vstatus.cur_user+' has a bad PIN') + pfalken=""" +CARRIER DETECTED + +CONNECT 128000 + +Welcome to Picklevision Sytems, Sunnyvale, CA + +Greetings Professor Falken. + + + + +Shall we play a game? + + +Please choose from the following menu: + +1. Tic-Tac-Toe +2. Chess +3. Checkers +4. Backgammon +5. Poker +6. Toxic and Biochemical Warfare +7. Global Thermonuclear War + +7 [ENTER] + +Wouldn't you prefer a nice game of chess? + +""".replace('\n',' ') + vstatus.mk.set_messages([(pfalken, False, 10)]) + vstatus.cur_user = '' + vstatus.cur_pin = '' + + reset_idler(v, vstatus, 10) + + return + if not has_good_pin(uid): logging.info('user '+vstatus.cur_user+' has a bad PIN') vstatus.mk.set_messages( - [(' '*10+'INVALID PIN SETUP'+' '*10, False, 3), - (GREETING, False, None)]) + [(' '*10+'INVALID PIN SETUP'+' '*11, False, 3)]) vstatus.cur_user = '' vstatus.cur_pin = '' - idle_in(vstatus,5) - vstatus.change_state(STATE_IDLE) + reset_idler(v, vstatus, 3) return @@ -496,9 +541,7 @@ def handle_idle_key(state, event, params, v, vstatus): if key == 11: vstatus.cur_user = '' - vstatus.mk.set_message(GREETING) - idle_in(vstatus,5) - choose_idler() + reset_idler(v, vstatus) return vstatus.change_state(STATE_GETTING_UID) @@ -506,18 +549,12 @@ def handle_idle_key(state, event, params, v, vstatus): def handle_idle_tick(state, event, params, v, vstatus): - ### State logged out ... initiate idler in 5 (first start?) - if vstatus.time_to_idle == None and vstatus.cur_user == '': - vstatus.time_to_idle = time() + 5 - choose_idler() - ### State idling + if vstatus.mk.done(): + idle_step(vstatus) - if vstatus.time_to_idle is not None and time() > vstatus.time_to_idle: - idle_step() - - if vstatus.time_to_idle is not None and time() > vstatus.time_to_idle + 30: - vstatus.time_to_idle = time() + if vstatus.time_of_next_idler and time() > vstatus.time_of_next_idler: + vstatus.time_of_next_idler = time() + 30 choose_idler() ### @@ -637,8 +674,6 @@ def handle_door_idle(state, event, params, v, vstatus): pass def handle_door_event(state, event, params, v, vstatus): - vstatus.time_to_idle = None - if params == 1: #door open vstatus.change_state(STATE_DOOR_OPENING) logging.warning("Entering open door mode") @@ -648,23 +683,13 @@ def handle_door_event(state, event, params, v, vstatus): vstatus.cur_pin = '' elif params == 0: #door closed vstatus.change_state(STATE_DOOR_CLOSING) - idle_in(vstatus, 5) + reset_idler(v, vstatus, 3) logging.warning('Leaving open door mode') v.display("-YUM YUM!-") -def idle_in(vstatus,seconds): - vstatus.time_to_idle = time() + seconds - def return_to_idle(state,event,params,v,vstatus): - if vstatus.time_to_idle is not None and time() > vstatus.time_to_idle: - vstatus.mk.set_message(GREETING) - vstatus.change_state(STATE_IDLE) - return - if not vstatus.time_to_idle: - vstatus.mk.set_message(GREETING) - vstatus.change_state(STATE_IDLE) - return + reset_idler(v, vstatus) def create_state_table(vstatus): vstatus.state_table[(STATE_IDLE,TICK,1)] = handle_idle_tick @@ -701,6 +726,14 @@ def create_state_table(vstatus): def get_state_table_handler(vstatus, state, event, counter): return vstatus.state_table[(state,event,counter)] +def time_to_next_update(vstatus): + idle_update = vstatus.time_of_next_idlestep - time() + if not vstatus.mk.done() and vstatus.mk.next_update is not None: + mk_update = vstatus.mk.next_update - time() + if mk_update < idle_update: + idle_update = mk_update + return idle_update + def run_forever(rfh, wfh, options, cf): v = VendingMachine(rfh, wfh) vstatus = VendState(v) @@ -710,11 +743,8 @@ def run_forever(rfh, wfh, options, cf): if USE_DB: db = DispenseDatabase(v, cf.DBServer, cf.DBName, cf.DBUser, cf.DBPassword) - vstatus.mk.set_message(GREETING) setup_idlers(v) - choose_idler() - vstatus.mk.set_message("Booted") - + reset_idler(v, vstatus) # This main loop was hideous and the work of the devil. # This has now been fixed (mostly) - mtearle @@ -727,8 +757,6 @@ def run_forever(rfh, wfh, options, cf): # # ( return state - not currently implemented ) - vstatus.change_state(STATE_IDLE,1) - while True: if USE_DB: try: @@ -737,7 +765,8 @@ def run_forever(rfh, wfh, options, cf): logging.error('Database error: '+str(e)) - e = v.next_event(0) + timeout = time_to_next_update(vstatus) + e = v.next_event(timeout) (event, params) = e run_handler(event, params, v, vstatus)