YAY

db.py

@@ -17,7 +17,7 @@ class User(Base):
 
 	name_re = r"[a-z]+"
 	card_re = r"(([Nn][Tt][Nn][Uu])?[0-9]+)?"
-	rfid_re = r"[0-9]+"
+	rfid_re = r"[0-9]*"
 
 	def __init__(self, name, card, rfid, credit=0):
 		self.name = name

text_based.py

@@ -195,12 +195,16 @@ class Menu():
 	def invalid_menu_choice(self, str):
 		print 'Please enter a valid choice.'
 
-	def input_int(self, prompt=None, allowed_range=(None,None), null_allowed=False):
+	def input_int(self, prompt=None, allowed_range=(None,None), null_allowed=False, default=None):
 		if prompt == None:
 			prompt = self.prompt
+		if default:
+			prompt += ("[%s] " % default)
 		while True:
 			result = self.input_str(prompt)
-			if null_allowed and result == '':
+			if default:
+				return default
+			elif null_allowed and result == '':
 				return False
 			try:
 				value = int(result)
@@ -286,7 +290,7 @@ class Menu():
 			type_guess = guess_data_type(search_str)
 			if type_guess != None and thing_for_type[type_guess] in add_nonexisting:
 				return self.search_add(search_str)
-			print 'No match found for "%s".' % search_str
+			#print 'No match found for "%s".' % search_str
 			return None
 		return self.search_ui2(search_str, results[selected_thing], selected_thing)
 
@@ -1178,52 +1182,60 @@ class AddStockMenu(Menu):
 Enter what you have bought for PVVVV here, along with your user name and how
 much money you're due in credits for the purchase when prompted.
 		'''
-		self.price = False
+		self.price = None
 
 	def _execute(self):
-		self.user=False
+		questions = {
+				(False,False): 'Enter user id or a string of the form "<number> <product>"',
+				(False,True): 'Enter user id or more strings of the form "<number> <product>"',
+				(True,False): 'Enter a string of the form "<number> <product>"',
+				(True,True): 'Enter more strings of the form "<number> <product>", or an empty line to confirm'
+		}
+
+		self.user = None
 		self.products = {}
-		self.price = self.input_int('Total amount to be credited for purchase> ', (1,100000))
+        #self.price = self.input_int('Total amount to be credited for purchase> ', (1,100000)) # TODO: calculate this and remove
+
 		while True:
 			self.print_info()
-			self.printc({(False,False): 'Enter user id or a string of the form "<number> <product>"',
+			self.printc(questions[bool(self.user), bool(len(self.products))])
-				     (False,True): 'Enter user id or more strings of the form "<number> <product>"',
-				     (True,False): 'Enter a string of the form "<number> <product>"',
-				     (True,True): 'Enter more strings of the form "<number> <product>", or an empty line to confirm'
-				     }[not not self.user,len(self.products) > 0])
 
 			# Read in a 'thing' (product or user):
-			tres = self.input_multiple(add_nonexisting=('user','product'),
+			line = self.input_multiple(add_nonexisting=('user','product'), empty_input_permitted=True)
-						   empty_input_permitted=True)
+
-			if tres:
+			if line:
-				(thing, amount) = tres
+				(thing, amount) = line
-			else:
+				
-				thing = None
+				if isinstance(thing, Product):
-			# Possibly exit from the menu:
+					self.printc("%d of %s registered" % (amount, thing.name, thing.price))
-			if thing == None:
+					self.price = self.input_int('Price a piece? ', (1,100000), default=thing.price) * amount
-				if not self.complete_input():
+
-					if self.confirm('Not enough information entered.  Abort transaction?',
-							default=True):
-						return False
-					continue
-				break
-			else:
 				# once we get something in the
 				# purchase, we want to protect the
 				# user from accidentally killing it
 				self.exit_confirm_msg='Abort transaction?'
+			else:
+				thing = None
 
+				if not self.complete_input():
+					if self.confirm('Not enough information entered. Abort transaction?', default=True):
+						return False
+					continue
+
+				break
 
 			# Add the thing to the pending adjustments:
 			self.add_thing_to_pending(thing,amount)
+
 		self.perform_transaction()
         
 	def complete_input(self):
-		return ((not not self.user) and len(self.products) and self.price)
+		return (bool(self.user) and len(self.products) and self.price)
 
 	def print_info(self):
 		print (6+Product.name_length)*'-'
-		print ("Amount to be credited: %"+str(Product.name_length-17)+"i") % (self.price)
+		if self.price:
+			print ("Amount to be credited: %"+str(Product.name_length-17)+"i") % (self.price)
 		if self.user:
 			print ("User to credit: %"+str(Product.name_length-10)+"s") % (self.user.name)
 		print ('\n%-'+str(Product.name_length-1)+'s Amount') % ("Product")