From cf52ee4822fe500ad07f2fbd4d7ad695f143e31e Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Feb 2009 00:22:25 +0900
Subject: [PATCH 1/2] Fix blinds output

Changes self.posted to be a list of lists.
[[p1, "small blind"][p2, "big blind"][p3, "big blind"][p4, "both"]]
---
 pyfpdb/Hand.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 48516fd4..d786a1c7 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -206,7 +206,7 @@ Card ranks will be uppercased
             elif blindtype == 'both':
                 # extra small blind is 'dead'
                 self.lastBet['PREFLOP'] = Decimal(self.bb)
-        self.posted += [player]
+        self.posted = self.posted + [[player,blindtype]]
         print "DEBUG: self.posted: %s" %(self.posted)
 
 
@@ -382,17 +382,15 @@ Map the tuple self.gametype onto the pokerstars string describing it
             #Only print stacks of players who do something preflop
             print >>fh, _("Seat %s: %s ($%s)" %(player[0], player[1], player[2]))
 
-        if(self.posted[0] is None):
-            #print >>fh, _("No small blind posted") # PS doesn't say this
-            pass
-        else:
-            print >>fh, _("%s: posts small blind $%s" %(self.posted[0], self.sb))
 
         #May be more than 1 bb posting
-        for a in self.posted[1:]:
-            print >>fh, _("%s: posts big blind $%s" %(a, self.bb))
-
-        # TODO: What about big & small blinds?
+        for a in self.posted:
+            if(a[1] == "small blind"):
+                print >>fh, _("%s: posts small blind $%s" %(a[0], self.sb))
+            if(a[1] == "big blind"):
+                print >>fh, _("%s: posts big blind $%s" %(a[0], self.bb))
+            if(a[1] == "both"):
+                print >>fh, _("%s: posts small & big blinds $%.2f" %(a[0], (Decimal(self.sb) + Decimal(self.bb))))
 
         print >>fh, _("*** HOLE CARDS ***")
         if self.involved:

From 40ccefe1055add00bafc4ac456f3d7469512a241 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 22 Feb 2009 01:17:06 +0900
Subject: [PATCH 2/2] Separate collected and collectees for output

---
 pyfpdb/Hand.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index d786a1c7..36b946f8 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -83,7 +83,8 @@ class Hand:
         self.stacks = {}
 
         # dict from player names to amounts collected
-        self.collected = {}
+        self.collected = []
+        self.collectees = {}
 
         # Sets of players
         self.shown = set()
@@ -319,10 +320,11 @@ Add a raise on [street] by [player] to [amountTo]
     def addCollectPot(self,player, pot):
         print "DEBUG: %s collected %s" % (player, pot)
         self.checkPlayerExists(player)
-        if player not in self.collected:
-            self.collected[player] = pot
+        self.collected = self.collected + [[player, pot]]
+        if player not in self.collectees:
+            self.collectees[player] = Decimal(pot)
         else:
-            print "[WARNING] %s collected pot more than once; avoidable by reading winnings only from summary lines?"
+            self.collectees[player] += Decimal(pot)
 
 
     def totalPot(self):
@@ -336,8 +338,9 @@ Add a raise on [street] by [player] to [amountTo]
         # This gives us the amount collected, i.e. after rake
         if self.totalcollected is None:
             self.totalcollected = 0;
-            for amount in self.collected.values():
-                self.totalcollected += Decimal(amount)
+            #self.collected looks like [[p1,amount][px,amount]]
+            for entry in self.collected:
+                self.totalcollected += Decimal(entry[1])
 
 
 
@@ -432,8 +435,8 @@ Map the tuple self.gametype onto the pokerstars string describing it
         # The current importer uses those lines for importing winning rather than the summary
         for name in self.pot.returned:
             print >>fh, _("Uncalled bet ($%s) returned to %s" %(self.pot.returned[name],name))
-        for name in self.collected:
-            print >>fh, _("%s collected $%s from x pot" %(name, self.collected[name]))
+        for entry in self.collected:
+            print >>fh, _("%s collected $%s from x pot" %(entry[0], entry[1]))
 
         print >>fh, _("*** SUMMARY ***")
         print >>fh, "%s | Rake $%.2f" % (self.pot, self.rake)
@@ -448,10 +451,10 @@ Map the tuple self.gametype onto the pokerstars string describing it
         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:
-                print >>fh, _("Seat %d: %s showed [%s] and won ($%s)" % (seatnum, name, " ".join(self.holecards[name]), self.collected[name]))
-            elif name in self.collected:
-                print >>fh, _("Seat %d: %s collected ($%s)" % (seatnum, name, self.collected[name]))
+            if name in self.collectees and name in self.shown:
+                print >>fh, _("Seat %d: %s showed [%s] and won ($%s)" % (seatnum, name, " ".join(self.holecards[name]), self.collectees[name]))
+            elif name in self.collectees:
+                print >>fh, _("Seat %d: %s collected ($%s)" % (seatnum, name, self.collectees[name]))
             elif name in self.shown:
                 print >>fh, _("Seat %d: %s showed [%s]" % (seatnum, name, " ".join(self.holecards[name])))
             elif name in self.folded: