evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Regression: PKR updates

Browse Source
This commit is contained in:
Worros 2010-09-06 00:39:51 +08:00
parent 631d2361aa
commit 21043d5445
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyfpdb/PkrToFpdb.py
View File

@ -115,7 +115,7 @@ class Pkr(HandHistoryConverter):
^%(PLYR)s(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds)(\sto)? ^%(PLYR)s(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds)(\sto)?
(\s(%(CUR)s)?(?P<BET>[.\d]+))? (\s(%(CUR)s)?(?P<BET>[.\d]+))?
""" % subst, re.MULTILINE|re.VERBOSE) """ % subst, re.MULTILINE|re.VERBOSE)
self.re_ShowdownAction = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" % player_re, re.MULTILINE) self.re_ShowdownAction = re.compile(r"^%(PLYR)s shows \[(?P<CARDS>.*)\]" % subst, re.MULTILINE)
self.re_CollectPot = re.compile(r"^%(PLYR)s wins %(CUR)s(?P<POT>[.\d]+)" % subst, re.MULTILINE) self.re_CollectPot = re.compile(r"^%(PLYR)s wins %(CUR)s(?P<POT>[.\d]+)" % subst, re.MULTILINE)
self.re_sitsOut = re.compile("^%s sits out" % player_re, re.MULTILINE) self.re_sitsOut = re.compile("^%s sits out" % player_re, re.MULTILINE)
self.re_ShownCards = re.compile("^Seat (?P<SEAT>[0-9]+): %s (\(.*\) )?(?P<SHOWED>showed|mucked) \[(?P<CARDS>.*)\].*" % player_re, re.MULTILINE) self.re_ShownCards = re.compile("^Seat (?P<SEAT>[0-9]+): %s (\(.*\) )?(?P<SHOWED>showed|mucked) \[(?P<CARDS>.*)\].*" % player_re, re.MULTILINE)
@ -357,6 +357,7 @@ class Pkr(HandHistoryConverter):
# TODO: pick up mucks also?? # TODO: pick up mucks also??
for shows in self.re_ShowdownAction.finditer(hand.handText): for shows in self.re_ShowdownAction.finditer(hand.handText):
cards = shows.group('CARDS').split(' ') cards = shows.group('CARDS').split(' ')
#print "DEBUG: addShownCards(%s, %s)" %(cards, shows.group('PNAME'))
hand.addShownCards(cards, shows.group('PNAME')) hand.addShownCards(cards, shows.group('PNAME'))
def readCollectPot(self,hand): def readCollectPot(self,hand):

4
pyfpdb/regression-test-files/cash/PKR/Flop/NLHE-2max-USD-0.02-0.04-200903.All-in.on.turn.txt.hp
View File

@ -224,7 +224,7 @@
'sawShowdown': True, 'sawShowdown': True,
'seatNo': 3, 'seatNo': 3,
'sitout': False, 'sitout': False,
'startCards': 0, 'startCards': 2,
'startCash': 180, 'startCash': 180,
'street0Aggr': False, 'street0Aggr': False,
'street0Bets': 0, 'street0Bets': 0,
@ -271,7 +271,7 @@
'street4CheckCallRaiseDone': False, 'street4CheckCallRaiseDone': False,
'street4Raises': 0, 'street4Raises': 0,
'street4Seen': False, 'street4Seen': False,
'totalProfit': -159, 'totalProfit': 219,
'tourneyTypeId': None, 'tourneyTypeId': None,
'tourneysPlayersIds': None, 'tourneysPlayersIds': None,
'winnings': 0, 'winnings': 0,