diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py index c8f86b4f..affdc596 100755 --- a/pyfpdb/EverleafToFpdb.py +++ b/pyfpdb/EverleafToFpdb.py @@ -88,7 +88,7 @@ class Everleaf(HandHistoryConverter): print "DEBUG player_re: " + player_re self.re_PostSB = re.compile(r"^%s: posts small blind \[\$? (?P[.0-9]+)" % player_re, re.MULTILINE) self.re_PostBB = re.compile(r"^%s: posts big blind \[\$? (?P[.0-9]+)" % player_re, re.MULTILINE) - self.re_PostBoth = re.compile(r"^%s: posts small \& big blinds \[\$? (?P[.0-9]+)" % player_re, re.MULTILINE) + self.re_PostBoth = re.compile(r"^%s: posts both blinds \[\$? (?P[.0-9]+)" % player_re, re.MULTILINE) self.re_HeroCards = re.compile(r"^Dealt to %s \[ (?P.*) \]" % player_re, re.MULTILINE) self.re_Action = re.compile(r"^%s(?P: bets| checks| raises| calls| folds)(\s\[\$ (?P[.\d]+) (USD|EUR)\])?" % player_re, re.MULTILINE) self.re_ShowdownAction = re.compile(r"^%s shows \[ (?P.*) \]" % player_re, re.MULTILINE) @@ -164,7 +164,7 @@ class Everleaf(HandHistoryConverter): for a in self.re_PostBB.finditer(hand.string): hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB')) for a in self.re_PostBoth.finditer(hand.string): - hand.addBlind(a.group('PNAME'), 'small & big blinds', a.group('SBBB')) + hand.addBlind(a.group('PNAME'), 'both', a.group('SBBB')) def readHeroCards(self, hand): m = self.re_HeroCards.search(hand.string) diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index cebfeea7..48516fd4 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -191,7 +191,7 @@ Card ranks will be uppercased # - this is a bet of 1 bb and is the new uncalled # # If a player posts a big & small blind - # + # - FIXME: We dont record this for later printing yet print "DEBUG addBlind: %s posts %s, %s" % (player, blindtype, amount) if player is not None: @@ -203,10 +203,11 @@ Card ranks will be uppercased self.pot.addMoney(player, Decimal(amount)) if blindtype == 'big blind': self.lastBet['PREFLOP'] = Decimal(amount) - elif blindtype == 'small & big blinds': + elif blindtype == 'both': # extra small blind is 'dead' self.lastBet['PREFLOP'] = Decimal(self.bb) self.posted += [player] + print "DEBUG: self.posted: %s" %(self.posted) def addCall(self, street, player=None, amount=None): @@ -389,7 +390,7 @@ Map the tuple self.gametype onto the pokerstars string describing it #May be more than 1 bb posting for a in self.posted[1:]: - print >>fh, _("%s: posts big blind $%s" %(self.posted[1], self.bb)) + print >>fh, _("%s: posts big blind $%s" %(a, self.bb)) # TODO: What about big & small blinds?