X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=2133f37e9c927ea957c2439cf8e10a6543770ba5;hp=d8122aa0507af0b8a218fed5b399db2f40be6c95;hb=8e83c2139979faba9cdb8f7c252fe9e9f90c5fca;hpb=f14c215ea165a9a5d66229f59993e4d6263629b7

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index d8122aa..2133f37 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -197,11 +197,11 @@ class MessageKeeper:
 	def done(self):
 		return len(self.scrolling_message) == 0
 
-def run_forever(rfh, wfh):
+def run_forever(rfh, wfh, options, cf):
 	v = VendingMachine(rfh, wfh)
 	print 'PING is', v.ping()
 
-	if USE_DB: db = DispenseDatabase(v, DBServer, DBName, DBUser, DBPassword)
+	if USE_DB: db = DispenseDatabase(v, cf.DBServer, cf.DBName, cf.DBUser, cf.DBPassword)
 	cur_user = ''
 	cur_pin = ''
 	cur_selection = ''
@@ -363,11 +363,10 @@ def run_forever(rfh, wfh):
 					cur_selection = ''
 					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
+def connect_to_vend(options, cf):
+	# Open vending machine via LAT?
 	if options.use_lat:
-		latclient = LATClient(service = ServiceName, password = ServicePassword, server_name = ServerName, connect_password = ConnectPassword, priv_password = PrivPassword)
+		latclient = LATClient(service = cf.ServiceName, password = cf.ServicePassword, server_name = cf.ServerName, connect_password = cf.ConnectPassword, priv_password = cf.PrivPassword)
 		rfh, wfh = latclient.get_fh()
 	else:
 		#(rfh, wfh) = popen2('../../virtualvend/vvend.py')
@@ -379,8 +378,7 @@ def connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName,
 		
 	return rfh, wfh
 
-if __name__ == '__main__':
-	from ConfigParser import ConfigParser
+def parse_args():
 	from optparse import OptionParser
 
 	op = OptionParser(usage="%prog [OPTION]...")
@@ -393,23 +391,47 @@ if __name__ == '__main__':
 	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')
+	return options
+
+config_options = {
+	'DBServer': ('Database', 'Server'),
+	'DBName': ('Database', 'Name'),
+	'DBUser': ('VendingMachine', 'DBUser'),
+	'DBPassword': ('VendingMachine', 'DBPassword'),
+	
+	'ServiceName': ('VendingMachine', 'ServiceName'),
+	'ServicePassword': ('VendingMachine', 'Password'),
+	
+	'ServerName': ('DecServer', 'Name'),
+	'ConnectPassword': ('DecServer', 'ConnectPassword'),
+	'PrivPassword': ('DecServer', 'PrivPassword'),
+	}
+
+class VendConfigFile:
+	def __init__(self, config_file, options):
+		try:
+			cp = ConfigParser.ConfigParser()
+			cp.read(config_file)
+
+			for option in options:
+				section, name = options[option]
+				value = cp.get(section, name)
+				self.__dict__[option] = value
+		
+		except ConfigParser.Error, e:
+			print "Error reading config file "+config_file+": " + str(e)
+			sys.exit(1)
+
 
-	ServiceName = cp.get('VendingMachine', 'ServiceName')
-	ServicePassword = cp.get('VendingMachine', 'Password')
+if __name__ == '__main__':
+	import ConfigParser
 
-	ServerName = cp.get('DecServer', 'Name')
-	ConnectPassword = cp.get('DecServer', 'ConnectPassword')
-	PrivPassword = cp.get('DecServer', 'PrivPassword')
+	options = parse_args()
+	config_opts = VendConfigFile(options.config_file, config_options)
 
 	while True:
 		try:
-			rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword)
+			rfh, wfh = connect_to_vend(options, config_opts)
 		except (LATClientException, socket.error), e:
 			(exc_type, exc_value, exc_traceback) = sys.exc_info()
 			print
@@ -420,7 +442,7 @@ if __name__ == '__main__':
 			sleep(5)
 			continue
 		try:
-			run_forever(rfh, wfh)
+			run_forever(rfh, wfh, options, config_opts)
 		except VendingException:
 			print
 			print "Connection died, trying again..."