From 6f1e335275fc95b82663e56b240fd96d8357cc0b Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Tue, 16 Dec 2008 21:49:04 +0000
Subject: [PATCH] FullTilt output is looking good, tried it on a HandHQ
 history, no crashes!

Hand.py: report summary line only for players who acted preflop (as with
stacks)

bug in a BB calling itself fixed
---
 pyfpdb/FulltiltToFpdb.py | 2 +-
 pyfpdb/Hand.py           | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 1cb9b1e6..f5f23e53 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -74,7 +74,7 @@ class FullTilt(HandHistoryConverter):
         self.setFileType("text", "cp1252")
         self.rexx.setGameInfoRegex('- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) -')
         self.rexx.setSplitHandRegex('\n\n+')
-        self.rexx.setHandInfoRegex('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[- a-zA-Z]+) - \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) - (?P<GAMETYPE>[a-zA-Z\' ]+) - (?P<HR>[0-9]+):(?P<MIN>[0-9]+):(?P<SEC>[0-9]+) ET - (?P<YEAR>[0-9]+)/(?P<MON>[0-9]+)/(?P<DAY>[0-9]+)')
+        self.rexx.setHandInfoRegex('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[- a-zA-Z]+) (\((?P<TABLEATTRIBUTES>.+)\) )?- \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) - (?P<GAMETYPE>[a-zA-Z\' ]+) - (?P<HR>[0-9]+):(?P<MIN>[0-9]+):(?P<SEC>[0-9]+) ET - (?P<YEAR>[0-9]+)/(?P<MON>[0-9]+)/(?P<DAY>[0-9]+)')
 #        self.rexx.setHandInfoRegex('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[ a-zA-Z]+) - \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) - (?P<GAMETYPE>.*) - (?P<HR>[0-9]+):(?P<MIN>[0-9]+) ET - (?P<YEAR>[0-9]+)/(?P<MON>[0-9]+)/(?P<DAY>[0-9]+)Table (?P<TABLE>[ a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)')
         self.rexx.button_re = re.compile('The button is in seat #(?P<BUTTON>\d+)')
         self.rexx.setPlayerInfoRegex('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$(?P<CASH>[.0-9]+)\)\n')
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 2ee0316a..f49449c0 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -294,8 +294,10 @@ Add a raise on [street] by [player] to [amountTo]
                         self.totalpot += Decimal(act[3])
                         if act[2] == 'big blind':
                             # the bb gets called by out-of-blinds posts; but sb+bb only calls bb
-                            calls = calls + [Decimal(act[3])]
-                            uncalled = Decimal(act[3])
+                            if uncalled == Decimal(act[3]): # a bb is already posted
+                                calls = calls + [Decimal(act[3])]
+                            else: # no blind yet posted.
+                                uncalled = Decimal(act[3])
                         elif act[2] == 'small blind':
                             pass
 
@@ -409,8 +411,7 @@ Map the tuple self.gametype onto the pokerstars string describing it
         if board:   # sometimes hand ends preflop without a board
             print >>fh, _("Board [%s]" % (" ".join(board)))
 
-
-        for player in self.players:
+        for player in [x for x in self.players if x[1] in players_who_act_preflop]:
             seatnum = player[0]
             name = player[1]
             if name in self.collected and name in self.shown: