Merge lp:open-leaderboard-app/1.2 into lp:open-leaderboard-app

[James-Robert Corken Knight]

Merge with 1.2

Version 1.2 is complete.

[James-Robert Corken Knight (nexxusdrako)]

review: Approve

=== modified file 'openleaderboardapp.py'
--- openleaderboardapp.py	2013-03-21 02:43:32 +0000
+++ openleaderboardapp.py	2013-03-21 05:45:43 +0000
@@ -1,5 +1,12 @@
 leaderboard = {}
 import cPickle as pickle
+import os
+def clearScreen():
+	""" Clears the screen """
+	if os.name == "nt":
+		os.system("cls")      # Works in w2k
+	else:
+		os.system("clear")   # Works in cygwin's Bash 
 
 def average(values):
     """ Return the average of the values in the list. """
@@ -38,7 +45,7 @@
 	for key, v in sorted(leaderboard.iteritems(), key=lambda item: -item[1]):
 		for key in leaderboard:
 			if leaderboard[ key ] == v:
-				print key, v
+				print key + str(v)
 				break
 				
 def saveLeaderboard():
@@ -54,36 +61,63 @@
 	return avg
 
 def getStandardDeviation():
+	""" Gets the standard deviation """
 	stdDev = 0
 	stdDev = standardDeviation(valuesList)
 	return stdDev
 	
+def exportLeaderboard():
+	""" Exports the leaderboard to a text file """
+	f = open("leaderboard.txt", "wb")
+	for key, v in sorted(leaderboard.iteritems(), key=lambda item: -item[1]):
+		for key in leaderboard:
+			if leaderboard[ key ] == v:
+				file.write(f, key + str(v) + "\n")
+				break
 choice = 0
 
 # Main menu
-while choice != "7":
+while choice != "8":
 	valuesList = leaderboard.values()
-	choice = str(raw_input("1. Add Score\n2. Show Leaderboard\n3. Save Leaderboard\n4. Load Leaderboard\n5. Delete Leaderboard\n6. Show Statistics\n7. Quit\nEnter choice: "))
-	if choice == "1":
+	clearScreen()
+	choice = str(raw_input("1. Add Score\n2. Show Leaderboard\n3. Save Leaderboard\n4. Load Leaderboard\n5. Delete Leaderboard\n6. Show Statistics\n7. Export Leaderboard\n8. Quit\nEnter choice: "))
+	if choice == "1": # Add Score
+		clearScreen()
 		askScore()
+		raw_input("Press enter to continue.")
 		continue
-	elif choice == "2":
+	elif choice == "2":# Show Leaderboard
+		clearScreen()
+		print "Leaderboard:"
 		printLeaderboard()
+		raw_input("Press enter to continue.")
 		continue
-	elif choice == "3":
+	elif choice == "3": # Save Leaderboard
 		saveLeaderboard()
 		continue
-	elif choice == "4":
+	elif choice == "4": # Load Leaderboard
 		f = open("leaderboard.ola", "rb")
 		leaderboard = pickle.load(f)
 		f.close()
-	elif choice == "5":
+	elif choice == "5": # Delete Leaderboard
 		leaderboard = {}
 		saveLeaderboard()
-	elif choice == "6":
+	elif choice == "6": # Show Statistics
+		clearScreen()
 		print "Average:" + str(getAverage()) + "\nStandard Deviation:" + str(getStandardDeviation())
-	elif choice == "7":
+		raw_input("Press enter to continue.")
+		continue
+	elif choice == "7": # Export Leaderboard
+		exportLeaderboard()
+		continue
+	elif choice == "8": # Quit
+		clearScreen()
 		print "See you soon!"
-	else:
+		raw_input("Press enter to exit.")
+		break
+	else: # Incorrect Input
+		clearScreen()
 		print "Sorry, I couldn't understand you."
+		raw_input("Press enter to continue.")
+		continue