Merge branch 'exp'

pyfpdb/EverleafToFpdb.py

@@ -58,23 +58,28 @@ from HandHistoryConverter import *
 # smaragdar calls [$ 34.50 USD]
 # ** Dealing Turn ** [ 2d ]
 # ** Dealing River ** [ 6c ]
+# dogge shows [ 9h, 9c ]a pair of nines
+# spicybum shows [ 5d, 6d ]a straight, eight high
+# harrydebeng does not show cards
 # smaragdar wins $ 102 USD from main pot with a pair of aces [ ad, ah, qs, 8h, 6c ]
 
 class Everleaf(HandHistoryConverter):
     def __init__(self, config, file):
         print "Initialising Everleaf converter class"
-		HandHistoryConverter.__init__(self, config, file, "Everleaf") # Call super class init.
+        HandHistoryConverter.__init__(self, config, file, sitename="Everleaf") # Call super class init.
         self.sitename = "Everleaf"
-		self.setFileType("text")
+        self.setFileType("text", "cp1252")
         self.rexx.setGameInfoRegex('.*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)')
-		self.rexx.setSplitHandRegex('\n\n\n\n')
+        self.rexx.setSplitHandRegex('\n\n+')
         self.rexx.setHandInfoRegex('.*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<YEAR>[0-9]+)/(?P<MON>[0-9]+)/(?P<DAY>[0-9]+) - (?P<HR>[0-9]+):(?P<MIN>[0-9]+):(?P<SEC>[0-9]+)\nTable (?P<TABLE>[ a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)')
-		self.rexx.setPlayerInfoRegex('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(  \$ (?P<CASH>[.0-9]+) USD \)')
+        self.rexx.setPlayerInfoRegex('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)')
         self.rexx.setPostSbRegex('.*\n(?P<PNAME>.*): posts small blind \[\$? (?P<SB>[.0-9]+)')
         self.rexx.setPostBbRegex('.*\n(?P<PNAME>.*): posts big blind \[\$? (?P<BB>[.0-9]+)')
         # mct : what about posting small & big blinds simultaneously?
         self.rexx.setHeroCardsRegex('.*\nDealt\sto\s(?P<PNAME>.*)\s\[ (?P<HOLE1>\S\S), (?P<HOLE2>\S\S) \]')
-		self.rexx.setActionStepRegex('.*\n(?P<PNAME>.*) (?P<ATYPE>bets|checks|raises|calls|folds)(\s\[\$ (?P<BET>[.\d]+) USD\])?')
+        self.rexx.setActionStepRegex('.*\n(?P<PNAME>.*)(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[\$ (?P<BET>[.\d]+) USD\])?')
+        self.rexx.setShowdownActionRegex('.*\n(?P<PNAME>.*) shows \[ (?P<CARDS>.*) \]')
+        self.rexx.setCollectPotRegex('.*\n(?P<PNAME>.*) wins \$ (?P<POT>[.\d]+) USD.*')
         self.rexx.compileRegexes()
 
     def readSupportedGames(self):
@@ -113,20 +118,31 @@ class Everleaf(HandHistoryConverter):
     def readPlayerStacks(self, hand):
         m = self.rexx.player_info_re.finditer(hand.string)
         players = []
-
         for a in m:
-			hand.addPlayer(a.group('SEAT'), a.group('PNAME'), a.group('CASH'))
+            hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
-			#players = players + [[a.group('SEAT'), a.group('PNAME'), a.group('CASH')]]
-
-		#hand.players = players
 
     def markStreets(self, hand):
         # PREFLOP = ** Dealing down cards **
-		m = re.search('(\*\* Dealing down cards \*\*\n)(?P<PREFLOP>.*?\n\*\*)?( Dealing Flop \*\* \[ (?P<FLOP1>\S\S), (?P<FLOP2>\S\S), (?P<FLOP3>\S\S) \])?(?P<FLOP>.*?\*\*)?( Dealing Turn \*\* \[ (?P<TURN1>\S\S) \])?(?P<TURN>.*?\*\*)?( Dealing River \*\* \[ (?P<RIVER1>\S\S) \])?(?P<RIVER>.*)', hand.string,re.DOTALL)
+        # This re fails if,  say, river is missing; then we don't get the ** that starts the river.
-#		for street in m.groupdict():
+        #m = re.search('(\*\* Dealing down cards \*\*\n)(?P<PREFLOP>.*?\n\*\*)?( Dealing Flop \*\* \[ (?P<FLOP1>\S\S), (?P<FLOP2>\S\S), (?P<FLOP3>\S\S) \])?(?P<FLOP>.*?\*\*)?( Dealing Turn \*\* \[ (?P<TURN1>\S\S) \])?(?P<TURN>.*?\*\*)?( Dealing River \*\* \[ (?P<RIVER1>\S\S) \])?(?P<RIVER>.*)', hand.string,re.DOTALL)
-#			print "DEBUG: Street: %s\tspan: %s" %(street, str(m.span(street)))
+
+        m =  re.search(r"\*\* Dealing down cards \*\*(?P<PREFLOP>.+(?=\*\* Dealing Flop \*\*)|.+)"
+                       r"(\*\* Dealing Flop \*\* \[ \S\S, \S\S, \S\S \](?P<FLOP>.+(?=\*\* Dealing Turn \*\*)|.+))?"
+                       r"(\*\* Dealing Turn \*\* \[ \S\S \](?P<TURN>.+(?=\*\* Dealing River \*\*)|.+))?"
+                       r"(\*\* Dealing River \*\* \[ \S\S \](?P<RIVER>.+))?", hand.string,re.DOTALL)
+
         hand.streets = m
 
+    def readCommunityCards(self, hand):
+        # currently regex in wrong place pls fix my brain's fried
+        re_board = re.compile('\*\* Dealing (?P<STREET>.*) \*\* \[ (?P<CARDS>.*) \]')
+        m = re_board.finditer(hand.string)
+        for street in m:
+            #print street.groups()
+            re_card = re.compile('(?P<CARD>[0-9tjqka][schd])') # look that's weird, hole cards have a capital rank but board cards are lower case?
+            cardsmatch = re_card.finditer(street.group('CARDS'))
+            hand.setCommunityCards(street.group('STREET'), [card.group('CARD') for card in cardsmatch])
+
     def readBlinds(self, hand):
         try:
             m = self.rexx.small_blind_re.search(hand.string)
@@ -147,7 +163,7 @@ class Everleaf(HandHistoryConverter):
             hand.involved = False
         else:
             hand.hero = m.group('PNAME')
-			hand.addHoleCards(m.group('HOLE1'), m.group('HOLE2'))
+            hand.addHoleCards([m.group('HOLE1'), m.group('HOLE2')], m.group('PNAME'))
 
     def readAction(self, hand, street):
         m = self.rexx.action_re.finditer(hand.streets.group(street))
@@ -157,19 +173,38 @@ class Everleaf(HandHistoryConverter):
                 hand.addRaiseTo( street, action.group('PNAME'), action.group('BET') )
             elif action.group('ATYPE') == ' calls':
                 hand.addCall( street, action.group('PNAME'), action.group('BET') )
-			elif action.group('ATYPE') == 'bets':
+            elif action.group('ATYPE') == ': bets':
                 hand.addBet( street, action.group('PNAME'), action.group('BET') )
-			# mct: do we need to keep bet distinct from raise?
+            elif action.group('ATYPE') == ' folds':
-			#	hand.actions[street] += [[action.group('PNAME'), action.group('ATYPE'), action.group('BET')]]
+                hand.addFold( street, action.group('PNAME'))
+            elif action.group('ATYPE') == ' checks':
+                hand.addCheck( street, action.group('PNAME'))
             else:
                 print "DEBUG: unimplemented readAction: %s %s" %(action.group('PNAME'),action.group('ATYPE'),)
-				hand.actions[street] += [[action.group('PNAME'), action.group('ATYPE')]]
+                #hand.actions[street] += [[action.group('PNAME'), action.group('ATYPE')]]
-		#print "DEBUG: readAction: %s " %(hand.actions)
 
 
+    def readShowdownActions(self, hand):
+        for shows in self.rexx.showdown_action_re.finditer(hand.string):
+            print shows.groups()
+            re_card = re.compile('(?P<CARD>[0-9tjqka][schd])')  # copied from earlier
+            cards = [card.group('CARD') for card in re_card.finditer(shows.group('CARDS'))]
+            print cards
+            hand.addShownCards(cards, shows.group('PNAME'))
+
+    def readCollectPot(self,hand):
+        m = self.rexx.collect_pot_re.search(hand.string)
+        if m is not None:
+            hand.addCollectPot(player=m.group('PNAME'),pot=m.group('POT'))
+        else:
+            print "WARNING: Unusual, no one collected; can happen if it's folded to big blind with a dead small blind."
+
+    def getRake(self, hand):
+        hand.rake = hand.totalpot * Decimal('0.05') # probably not quite right
+
 if __name__ == "__main__":
     c = Configuration.Config()
-	e = Everleaf(c, "Speed_Kuala.txt")
+    e = Everleaf(c, "Speed_Kuala_full.txt")
     e.processFile()
     print str(e)
     

pyfpdb/HandHistoryConverter.py

@@ -23,17 +23,56 @@ import traceback
 import os
 import os.path
 import xml.dom.minidom
+import codecs
 from decimal import Decimal
 import operator
 from xml.dom.minidom import Node
+from pokereval import PokerEval
+from time import time
+#from pokerengine.pokercards import *
+# provides letter2name{}, letter2names{}, visible_card(), not_visible_card(), is_visible(), card_value(), class PokerCards
+# but it's probably not installed so here are the ones we may want:
+letter2name = {
+    'A': 'Ace',
+    'K': 'King',
+    'Q': 'Queen',
+    'J': 'Jack',
+    'T': 'Ten',
+    '9': 'Nine',
+    '8': 'Eight',
+    '7': 'Seven',
+    '6': 'Six',
+    '5': 'Five',
+    '4': 'Four',
+    '3': 'Trey',
+    '2': 'Deuce'
+    }
+
+letter2names = {
+    'A': 'Aces',
+    'K': 'Kings',
+    'Q': 'Queens',
+    'J': 'Jacks',
+    'T': 'Tens',
+    '9': 'Nines',
+    '8': 'Eights',
+    '7': 'Sevens',
+    '6': 'Sixes',
+    '5': 'Fives',
+    '4': 'Fours',
+    '3': 'Treys',
+    '2': 'Deuces'
+    }
 
 class HandHistoryConverter:
+    eval = PokerEval()
     def __init__(self, config, file, sitename):
         print "HandHistory init called"
         self.c         = config
         self.sitename  = sitename
         self.obs       = ""             # One big string
         self.filetype  = "text"
+        self.codepage  = "utf8"
         self.doc       = None     # For XML based HH files
         self.file      = file
         self.hhbase    = self.c.get_import_parameters().get("hhArchiveBase")
@@ -57,6 +96,7 @@ class HandHistoryConverter:
         return tmp
 
     def processFile(self):
+        starttime = time()
         if not self.sanityCheck():
             print "Cowardly refusing to continue after failed sanity check"
             return
@@ -64,23 +104,39 @@ class HandHistoryConverter:
         self.gametype = self.determineGameType()
         self.hands = self.splitFileIntoHands()
         for hand in self.hands:
+            print "\nInput:\n"+hand.string
             self.readHandInfo(hand)
             self.readPlayerStacks(hand)
             self.markStreets(hand)
             self.readBlinds(hand)
-			self.readHeroCards(hand)
+            self.readHeroCards(hand) # want to generalise to draw games
-
+            self.readCommunityCards(hand) # read community cards
+            self.readShowdownActions(hand)
             # Read action (Note: no guarantee this is in hand order.
             for street in hand.streets.groupdict():
+                if hand.streets.group(street) is not None:
                     self.readAction(hand, street)
 
-			if(hand.involved == True):
+            self.readCollectPot(hand)
-				#self.writeHand("output file", hand)
+
-				hand.printHand()
+            # finalise it (total the pot)
-			else:
+            hand.totalPot()
-				pass #Don't write out observed hands
+            self.getRake(hand)
+
+            hand.printHand()
+            #if(hand.involved == True):
+                #self.writeHand("output file", hand)
+                #hand.printHand()
+            #else:
+                #pass #Don't write out observed hands
+
+        endtime = time()
+        print "Processed %d hands in %d seconds" % (len(self.hands), endtime-starttime)
+
+    #####
+    # These functions are parse actions that may be overridden by the inheriting class
+    #
     
-	# Functions to be implemented in the inheriting class
     def readSupportedGames(self): abstract
 
     # should return a list
@@ -89,7 +145,14 @@ class HandHistoryConverter:
     # Valid types specified in docs/tabledesign.html in Gametypes
     def determineGameType(self): abstract
 
-	#TODO: Comment
+    # Read any of:
+    # HID		HandID
+    # TABLE		Table name
+    # SB 		small blind
+    # BB		big blind
+    # GAMETYPE	gametype
+    # YEAR MON DAY HR MIN SEC 	datetime
+    # BUTTON	button seat number
     def readHandInfo(self, hand): abstract
 
     # Needs to return a list of lists in the format
@@ -97,6 +160,7 @@ class HandHistoryConverter:
     def readPlayerStacks(self, hand): abstract
 
     # Needs to return a MatchObject with group names identifying the streets into the Hand object
+    # that is, pulls the chunks of preflop, flop, turn and river text into hand.streets MatchObject.
     def markStreets(self, hand): abstract
 
     #Needs to return a list in the format
@@ -105,6 +169,11 @@ class HandHistoryConverter:
     def readBlinds(self, hand): abstract
     def readHeroCards(self, hand): abstract
     def readAction(self, hand, street): abstract
+    def readCollectPot(self, hand): abstract
+    
+    # Some sites don't report the rake. This will be called at the end of the hand after the pot total has been calculated
+    # so that an inheriting class can calculate it for the specific site if need be.
+    def getRake(self, hand): abstract
     
     def sanityCheck(self):
         sane = True
@@ -128,11 +197,13 @@ class HandHistoryConverter:
         return sane
 
     # Functions not necessary to implement in sub class
-	def setFileType(self, filetype = "text"):
+    def setFileType(self, filetype = "text", codepage='utf8'):
         self.filetype = filetype
+        self.codepage = codepage
 
     def splitFileIntoHands(self):
         hands = []
+        self.obs.strip()
         list = self.rexx.split_hand_re.split(self.obs)
         list.pop() #Last entry is empty
         for l in list:
@@ -144,7 +215,7 @@ class HandHistoryConverter:
         """Read file"""
         print "Reading file: '%s'" %(filename)
         if(self.filetype == "text"):
-			infile=open(filename, "rU")
+            infile=codecs.open(filename, "rU", self.codepage)
             self.obs = infile.read()
             infile.close()
         elif(self.filetype == "xml"):
@@ -154,73 +225,6 @@ class HandHistoryConverter:
             except:
                 traceback.print_exc(file=sys.stderr)
 
-	def writeHand(self, file, hand):
-		"""Write out parsed data"""
-		print "DEBUG: *************************"
-		print "DEBUG: Start of print hand"
-		print "DEBUG: *************************"
-
-		print "%s Game #%s: %s ($%s/$%s) - %s" %(hand.sitename, hand.handid, "XXXXhand.gametype", hand.sb, hand.bb, hand.starttime)
-		print "Table '%s' %d-max Seat #%s is the button" %(hand.tablename, hand.maxseats, hand.buttonpos)
-
-		for player in hand.players:
-			print "Seat %s: %s ($%s)" %(player[0], player[1], player[2])
-
-		if(hand.posted[0] == "FpdbNBP"):
-			print "No small blind posted"
-		else:
-			print "%s: posts small blind $%s" %(hand.posted[0], hand.sb)
-
-		#May be more than 1 bb posting
-		print "%s: posts big blind $%s" %(hand.posted[1], hand.bb)
-		if(len(hand.posted) > 2):
-			# Need to loop on all remaining big blinds - lazy
-			print "XXXXXXXXX FIXME XXXXXXXX"
-
-		print "*** HOLE CARDS ***"
-		print "Dealt to %s [%s %s]" %(hand.hero , hand.holecards[0], hand.holecards[1])
-#
-##		ACTION STUFF
-#		This is no limit only at the moment
-		
-		for act in hand.actions['PREFLOP']:
-			self.printActionLine(act, 0)
-
-		if 'PREFLOP' in hand.actions:
-			for act in hand.actions['PREFLOP']:
-				print "PF action"
-
-		if 'FLOP' in hand.actions:
-			print "*** FLOP *** [%s %s %s]" %(hand.streets.group("FLOP1"), hand.streets.group("FLOP2"), hand.streets.group("FLOP3"))
-			for act in hand.actions['FLOP']:
-				self.printActionLine(act, 0)
-
-		if 'TURN' in hand.actions:
-			print "*** TURN *** [%s %s %s] [%s]" %(hand.streets.group("FLOP1"), hand.streets.group("FLOP2"), hand.streets.group("FLOP3"), hand.streets.group("TURN1"))
-			for act in hand.actions['TURN']:
-				self.printActionLine(act, 0)
-
-		if 'RIVER' in hand.actions:
-			print "*** RIVER *** [%s %s %s %s] [%s]" %(hand.streets.group("FLOP1"), hand.streets.group("FLOP2"), hand.streets.group("FLOP3"), hand.streets.group("TURN1"), hand.streets.group("RIVER1"))
-			for act in hand.actions['RIVER']:
-				self.printActionLine(act, 0)
-
-		print "*** SUMMARY ***"
-		print "XXXXXXXXXXXX Need sumary info XXXXXXXXXXX"
-#		print "Total pot $%s | Rake $%s)" %(hand.totalpot  $" + hand.rake)
-#		print "Board [" + boardcards + "]"
-#
-#		SUMMARY STUFF
-
-
-	def printActionLine(self, act, pot):
-		if act[1] == 'folds' or act[1] == 'checks':
-			print "%s: %s " %(act[0], act[1])
-		if act[1] == 'calls':
-			print "%s: %s $%s" %(act[0], act[1], act[2])
-		if act[1] == 'raises':
-			print "%s: %s $%s to XXXpottotalXXX" %(act[0], act[1], act[2])
-			
 
 #takes a poker float (including , for thousand seperator and converts it to an int
     def float2int (self, string):
@@ -242,19 +246,18 @@ class Hand:
 #    def __init__(self, sitename, gametype, sb, bb, string):
 
     UPS = {'a':'A', 't':'T', 'j':'J', 'q':'Q', 'k':'K'}
-	STREETS = ['BLINDS','PREFLOP','FLOP','TURN','RIVER']
     def __init__(self, sitename, gametype, string):
         self.sitename = sitename
         self.gametype = gametype
         self.string = string
 
-		self.streets = None # A MatchObject using a groupnames to identify streets.
+        self.streetList = ['BLINDS','PREFLOP','FLOP','TURN','RIVER'] # a list of the observed street names in order
-		self.actions = {}
 
         self.handid = 0
         self.sb = gametype[3]
         self.bb = gametype[4]
         self.tablename = "Slartibartfast"
+        self.hero = "Hiro"
         self.maxseats = 10
         self.counted_seats = 0
         self.buttonpos = 0
@@ -262,78 +265,189 @@ class Hand:
         self.players = []
         self.posted = []
         self.involved = True
-		self.hero = "Hiro"
-		self.holecards = "Xx Xx"
-		self.action = []
 
-		self.rake = 0
+
+        #
+        # Collections indexed by street names
+        #
+
+        # A MatchObject using a groupnames to identify streets.
+        # filled by markStreets()
+        self.streets = None
+
+        # dict from street names to lists of tuples, such as
+        # [['mct','bets','$10'],['mika','folds'],['carlg','raises','$20']]
+        # actually they're clearly lists but they probably should be tuples.
+        self.actions = {}
+
+        # dict from street names to community cards
+        self.board = {}
+
+
+        #
+        # Collections indexed by player names
+        #
+
+        # dict from player names to lists of hole cards
+        self.holecards = {}
+
+        # dict from player names to amounts collected
+        self.collected = {}
+
+        # Sets of players
+        self.shown = set()
+        self.folded = set()
+
+        self.action = []
+        self.totalpot = None
+        self.rake = None
 
         self.bets = {}
         self.lastBet = {}
-		self.orderedBets = {}
+        for street in self.streetList:
-		for street in self.STREETS:
             self.bets[street] = {}
             self.lastBet[street] = 0
 
     def addPlayer(self, seat, name, chips):
-		"""seat, an int indicating the seat
+        """\
-		name, the player name
+Adds a player to the hand, and initialises data structures indexed by player.
-		chips, the chips the player has at the start of the hand"""
+seat    (int) indicating the seat
-		#self.players.append(name)
+name    (string) player name
+chips   (string) the chips the player has at the start of the hand (can be None)
+If a player has None chips he won't be added."""
+        if chips is not None:
             self.players.append([seat, name, chips])
-		#self.startChips[name] = chips
+            self.holecards[name] = []
-		#self.endChips[name] = chips
+            for street in self.streetList:
-		#self.winners[name] = 0
+                self.bets[street][name] = []
-		for street in self.STREETS:
-			self.bets[street][name] = [0]
 
 
-	def addHoleCards(self,h1,h2,seat=None): # generalise to add hole cards for a specific seat or player
+    def addHoleCards(self, cards, player):
-		self.holecards = [self.card(h1), self.card(h2)]
+        """\
+Assigns observed holecards to a player.
+cards   list of card bigrams e.g. ['2h','jc']
+player  (string) name of player
+Note, will automatically uppercase the rank letter.
+"""
+        try:
+            self.checkPlayerExists(player)
+            for c in cards:
+                self.holecards[player].append(self.card(c))
+        except FpdbParseError, e:
+            print "Tried to add holecards for unknown player: %s" % (player,)
 
+    def addShownCards(self, cards, player):
+        """\
+For when a player shows cards for any reason (for showdown or out of choice).
+"""
+        self.shown.add(player)
+        self.addHoleCards(cards,player)
+
+
+    def checkPlayerExists(self,player):
+        if player not in [p[1] for p in self.players]:
+            raise FpdbParseError
+
+    def discardHoleCards(self, cards, player):
+        try:
+            self.checkPlayerExists(player)
+            for card in cards:
+                self.holecards[player].remove(card)
+        except FpdbParseError, e:
+            pass
+        except ValueError:
+            print "tried to discard a card %s didn't have" % (player,)
+
+    def setCommunityCards(self, street, cards):
+        self.board[street] = [self.card(c) for c in cards]
 
     def card(self,c):
         """upper case the ranks but not suits, 'atjqk' => 'ATJQK'"""
-	# don't know how to make this 'static'
         for k,v in self.UPS.items():
             c = c.replace(k,v)
         return c
 
     def addBlind(self, player, amount):
-		#self.bets['BLINDS'][player].append(Decimal(amount))
+        # if player is None, it's a missing small blind.
+        if player is not None:
+            self.bets['PREFLOP'][player].append(Decimal(amount))
         self.lastBet['PREFLOP'] = Decimal(amount)
         self.posted += [player]
 
 
-	def addCall(self, street, player=None, amount=0):
+    def addCall(self, street, player=None, amount=None):
+        # Potentially calculate the amount of the call if not supplied
+        # corner cases include if player would be all in
+        if amount is not None:
             self.bets[street][player].append(Decimal(amount))
             #self.lastBet[street] = Decimal(amount)
             self.actions[street] += [[player, 'calls', amount]]
         
     def addRaiseTo(self, street, player, amountTo):
-		# amount is the amount raised to, not the amount raised.by
+        """\
+Add a raise on [street] by [player] to [amountTo]
+"""
+        #Given only the amount raised to, the amount of the raise can be calculated by
+        # working out how much this player has already in the pot 
+        #   (which is the sum of self.bets[street][player])
+        # and how much he needs to call to match the previous player 
+        #   (which is tracked by self.lastBet)
+        self.checkPlayerExists(player)
         committedThisStreet = reduce(operator.add, self.bets[street][player], 0)
         amountToCall = self.lastBet[street] - committedThisStreet
         self.lastBet[street] = Decimal(amountTo)
         amountBy = Decimal(amountTo) - amountToCall
-		self.bets[street][player].append(amountBy)
+        self.bets[street][player].append(amountBy+amountToCall)
         self.actions[street] += [[player, 'raises', amountBy, amountTo]]
         
-	#def addRaiseTo(self, street, player=None, amountTo=None):
+    def addBet(self, street, player, amount):
-		#self.amounts[street] += Decimal(amountTo)
+        self.checkPlayerExists(player)
-		
+        self.bets[street][player].append(Decimal(amount))
-		
-	def addBet(self, street, player=None, amount=0):
-		self.bets[street][name].append(Decimal(amount))
-		self.orderedBets[street].append(Decimal(amount))
         self.actions[street] += [[player, 'bets', amount]]
 
+    def addFold(self, street, player):
+        self.checkPlayerExists(player)
+        self.folded.add(player)
+        self.actions[street] += [[player, 'folds']]
 
+    def addCheck(self, street, player):
+        self.checkPlayerExists(player)
+        self.actions[street] += [[player, 'checks']]
+
+    def addCollectPot(self,player, pot):
+        self.checkPlayerExists(player)
+        if player not in self.collected:
+            self.collected[player] = pot
+        else:
+            # possibly lines like "p collected $ from pot" appear during the showdown
+            # but they are usually unique in the summary, so it's best to try to get them from there.
+            print "%s collected pot more than once; avoidable by reading winnings only from summary lines?"
+
+
+    def totalPot(self):
+        """If all bets and blinds have been added, totals up the total pot size
+Known bug: doesn't take into account side pots"""
+        if self.totalpot is None:
+            self.totalpot = 0
+
+            # player names: 
+            # print [x[1] for x in self.players]
+            for player in [x[1] for x in self.players]:
+                for street in self.streetList:
+                    #print street, self.bets[street][player]
+                    self.totalpot += reduce(operator.add, self.bets[street][player], 0)
+
+    def getGameTypeAsString(self):
+        """\
+Map the tuple self.gametype onto the pokerstars string describing it
+"""
+        # currently it appears to be something like ["ring", "hold", "nl", sb, bb]:
+        return "Hold'em No Limit"
 
     def printHand(self):
         # PokerStars format.
-		print "### DEBUG ###"
+        print "\n### Pseudo stars format ###"
-		print "%s Game #%s: %s ($%s/$%s) - %s" %(self.sitename, self.handid, "XXXXhand.gametype", self.sb, self.bb, self.starttime)
+        print "%s Game #%s: %s ($%s/$%s) - %s" %(self.sitename, self.handid, self.getGameTypeAsString(), self.sb, self.bb, self.starttime)
         print "Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos)
         for player in self.players:
             print "Seat %s: %s ($%s)" %(player[0], player[1], player[2])
@@ -350,56 +464,127 @@ class Hand:
         # What about big & small blinds?
 
         print "*** HOLE CARDS ***"
-		print "Dealt to %s [%s %s]" %(self.hero , self.holecards[0], self.holecards[1])
+        if self.involved:
+            print "Dealt to %s [%s]" %(self.hero , " ".join(self.holecards[self.hero]))
 
         if 'PREFLOP' in self.actions:
             for act in self.actions['PREFLOP']:
                 self.printActionLine(act)
 
         if 'FLOP' in self.actions:
-			print "*** FLOP *** [%s %s %s]" %(self.streets.group("FLOP1"), self.streets.group("FLOP2"), self.streets.group("FLOP3"))
+            print "*** FLOP *** [%s]" %( " ".join(self.board['Flop']))
             for act in self.actions['FLOP']:
                 self.printActionLine(act)
 
         if 'TURN' in self.actions:
-			print "*** TURN *** [%s %s %s] [%s]" %(self.streets.group("FLOP1"), self.streets.group("FLOP2"), self.streets.group("FLOP3"), self.streets.group("TURN1"))
+            print "*** TURN *** [%s] [%s]" %( " ".join(self.board['Flop']), " ".join(self.board['Turn']))
             for act in self.actions['TURN']:
                 self.printActionLine(act)
 
         if 'RIVER' in self.actions:
-			print "*** RIVER *** [%s %s %s %s] [%s]" %(self.streets.group("FLOP1"), self.streets.group("FLOP2"), self.streets.group("FLOP3"), self.streets.group("TURN1"), self.streets.group("RIVER1"))
+            print "*** RIVER *** [%s] [%s]" %(" ".join(self.board['Flop']+self.board['Turn']), " ".join(self.board['River']) )
             for act in self.actions['RIVER']:
                 self.printActionLine(act)
 
+
+        #Some sites don't have a showdown section so we have to figure out if there should be one
+        # The logic for a showdown is: at the end of river action there are at least two players in the hand
+        # we probably don't need a showdown section in pseudo stars format for our filtering purposes
+        if 'SHOWDOWN' in self.actions:
+            print "*** SHOW DOWN ***"
+            print "what do they show"
+
         print "*** SUMMARY ***"
-		print "XXXXXXXXXXXX Need sumary info XXXXXXXXXXX"
+        print "Total pot $%s | Rake $%.2f)" % (self.totalpot, self.rake) # TODO side pots
-#		print "Total pot $%s | Rake $%s)" %(hand.totalpot  $" + hand.rake)
+        board = []
-#		print "Board [" + boardcards + "]"
+        for s in self.board.values():
-#
+            board += s
-#		SUMMARY STUFF
+        if board:   # sometimes hand ends preflop without a board
+            print "Board [%s]" % (" ".join(board))
 
 
-		#print self.sitename
+        for player in self.players:
-		#print self.gametype
+            seatnum = player[0]
-		#print self.string
+            name = player[1]
-		#print self.handid
+            if name in self.collected and self.holecards[name]:
-		#print self.sb
+                print "Seat %d: %s showed [%s] and won ($%s)" % (seatnum, name, " ".join(self.holecards[name]), self.collected[name])
-		#print self.bb
+            elif name in self.collected:
-		#print self.tablename
+                print "Seat %d: %s collected ($%s)" % (seatnum, name, self.collected[name])
-		#print self.maxseats
+            elif player[1] in self.shown:
-		#print self.counted_seats
+                print "Seat %d: %s showed [%s]" % (seatnum, name, " ".join(self.holecards[name]))
-		#print self.buttonpos
+            elif player[1] in self.folded:
-		#print self.seating
+                print "Seat %d: %s folded" % (seatnum, name)
-		#print self.players
+            else:
-		#print self.posted
+                print "Seat %d: %s mucked" % (seatnum, name)
-		#print self.action
+
-		#print self.involved
+        print
-		#print self.hero
+            # TODO:
+            # logic for side pots
+            # logic for which players get to showdown
+            # I'm just not sure we need to do this so heavily.. and if we do, it's probably better to use pokerlib
+            #if self.holecards[player[1]]: # empty list default is false
+                #hole = self.holecards[player[1]]
+                ##board = []
+                ##for s in self.board.values():
+                    ##board += s
+                ##playerhand = self.bestHand('hi', board+hole)
+                ##print "Seat %d: %s showed %s and won/lost with %s" % (player[0], player[1], hole, playerhand)
+                #print "Seat %d: %s showed %s" % (player[0], player[1], hole)
+            #else:
+                #print "Seat %d: %s mucked or folded" % (player[0], player[1])
+
 
     def printActionLine(self, act):
         if act[1] == 'folds' or act[1] == 'checks':
             print "%s: %s " %(act[0], act[1])
         if act[1] == 'calls':
             print "%s: %s $%s" %(act[0], act[1], act[2])
+        if act[1] == 'bets':
+            print "%s: %s $%s" %(act[0], act[1], act[2])
         if act[1] == 'raises':
             print "%s: %s $%s to $%s" %(act[0], act[1], act[2], act[3])
+
+    # going to use pokereval to figure out hands at some point.
+    # these functions are copied from pokergame.py
+    def bestHand(self, side, cards):
+        return HandHistoryConverter.eval.best('hi', cards, [])
+
+    # from pokergame.py
+    def bestHandValue(self, side, serial):
+        (value, cards) = self.bestHand(side, serial)
+        return value
+
+    # from pokergame.py
+    # got rid of the _ for internationalisation
+    def readableHandValueLong(self, side, value, cards):
+        if value == "NoPair":
+            if side == "low":
+                if cards[0][0] == '5':
+                    return ("The wheel")
+                else:
+                    return join(map(lambda card: card[0], cards), ", ")
+            else:
+                return ("High card %(card)s") % { 'card' : (letter2name[cards[0][0]]) }
+        elif value == "OnePair":
+            return ("A pair of %(card)s") % { 'card' : (letter2names[cards[0][0]]) } + (", %(card)s kicker") % { 'card' : (letter2name[cards[2][0]]) }
+        elif value == "TwoPair":
+            return ("Two pairs %(card1)s and %(card2)s") % { 'card1' : (letter2names[cards[0][0]]), 'card2' : _(letter2names[cards[2][0]]) } + (", %(card)s kicker") % { 'card' : (letter2name[cards[4][0]]) }
+        elif value == "Trips":
+            return ("Three of a kind %(card)s") % { 'card' : (letter2names[cards[0][0]]) } + (", %(card)s kicker") % { 'card' : (letter2name[cards[3][0]]) }
+        elif value == "Straight":
+            return ("Straight %(card1)s to %(card2)s") % { 'card1' : (letter2name[cards[0][0]]), 'card2' : (letter2name[cards[4][0]]) }
+        elif value == "Flush":
+            return ("Flush %(card)s high") % { 'card' : (letter2name[cards[0][0]]) }
+        elif value == "FlHouse":
+            return ("%(card1)ss full of %(card2)ss") % { 'card1' : (letter2name[cards[0][0]]), 'card2' : (letter2name[cards[3][0]]) }
+        elif value == "Quads":
+            return _("Four of a kind %(card)s") % { 'card' : (letter2names[cards[0][0]]) } + (", %(card)s kicker") % { 'card' : (letter2name[cards[4][0]]) }
+        elif value == "StFlush":
+            if letter2name[cards[0][0]] == 'Ace':
+                return ("Royal flush")
+            else:
+                return ("Straight flush %(card)s high") % { 'card' : (letter2name[cards[0][0]]) }
+        return value
+        
+        
+class FpdbParseError(Exception): pass