diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 8ebf2bcd..4c48b057 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +free-poker-tools (0.21~rc2) unstable; urgency=low + + * Second 0.21 release-candidate + + -- Mika Bostrom Tue, 28 Dec 2010 18:37:47 +0200 + free-poker-tools (0.21~rc1) unstable; urgency=low * First 0.21 release candidate diff --git a/pyfpdb/FullTiltPokerSummary.py b/pyfpdb/FullTiltPokerSummary.py index d3bcf191..7c65a82f 100644 --- a/pyfpdb/FullTiltPokerSummary.py +++ b/pyfpdb/FullTiltPokerSummary.py @@ -57,7 +57,7 @@ class FullTiltPokerSummary(TourneySummary): re_TourneyInfo = re.compile(u""" \s.* - (?PTournament|Sit\s\&\sGo|\(Rebuy\))\s\((?P[0-9]+)\)(\s+)? + (?PTournament|Sit\s\&\sGo|\(Rebuy\)|)\s\((?P[0-9]+)\)(\s+)? (?PHold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s+ (?PNo\sLimit|Limit|LIMIT|Pot\sLimit)\s+ (Buy-In:\s\$(?P[.\d]+)(\s\+\s\$(?P[.\d]+))?\s+)? @@ -86,14 +86,14 @@ class FullTiltPokerSummary(TourneySummary): codepage = ["utf-16", "cp1252", "utf-8"] def parseSummary(self): - m = self.re_TourneyInfo.search(self.summaryText) + m = self.re_TourneyInfo.search(self.summaryText[:2000]) if m == None: tmp = self.summaryText[0:200] log.error(_("parseSummary: Unable to recognise Tourney Info: '%s'") % tmp) log.error(_("parseSummary: Raising FpdbParseError")) raise FpdbParseError(_("Unable to recognise Tourney Info: '%s'") % tmp) - print "DEBUG: m.groupdict(): %s" % m.groupdict() + #print "DEBUG: m.groupdict(): %s" % m.groupdict() mg = m.groupdict() if 'TOURNO' in mg: self.tourNo = mg['TOURNO'] @@ -128,7 +128,7 @@ class FullTiltPokerSummary(TourneySummary): m = self.re_Player.finditer(self.summaryText) for a in m: mg = a.groupdict() - print "DEBUG: a.groupdict(): %s" % mg + #print "DEBUG: a.groupdict(): %s" % mg name = mg['NAME'] rank = mg['RANK'] winnings = 0 diff --git a/pyfpdb/Win2dayToFpdb.py b/pyfpdb/Win2dayToFpdb.py index e704e11b..4d2c442f 100755 --- a/pyfpdb/Win2dayToFpdb.py +++ b/pyfpdb/Win2dayToFpdb.py @@ -221,7 +221,7 @@ class Win2day(HandHistoryConverter): for a in self.re_PostBB.finditer(hand.handText): hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB')) for a in self.re_PostBoth.finditer(hand.handText): - hand.addBlind(a.group('PNAME'), 'small & big blinds', a.group('SBBB')) + hand.addBlind(a.group('PNAME'), 'both', a.group('SBBB')) def readHeroCards(self, hand): # streets PREFLOP, PREDRAW, and THIRD are special cases beacause diff --git a/pyfpdb/regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt.hp b/pyfpdb/regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt.hp index fff0dbf6..c16c6d63 100644 --- a/pyfpdb/regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt.hp +++ b/pyfpdb/regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt.hp @@ -261,7 +261,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, @@ -637,7 +637,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, diff --git a/pyfpdb/regression-test-files/cash/Everleaf/Flop/NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp b/pyfpdb/regression-test-files/cash/Everleaf/Flop/NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp index e14f853c..53d34e60 100644 --- a/pyfpdb/regression-test-files/cash/Everleaf/Flop/NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp +++ b/pyfpdb/regression-test-files/cash/Everleaf/Flop/NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp @@ -55,7 +55,7 @@ 'street1CheckCallRaiseChance': False, 'street1CheckCallRaiseDone': False, 'street1Raises': 0, - 'street1Seen': False, + 'street1Seen': True, 'street2Aggr': False, 'street2Bets': 0, 'street2CBChance': False, @@ -64,7 +64,7 @@ 'street2CheckCallRaiseChance': False, 'street2CheckCallRaiseDone': False, 'street2Raises': 0, - 'street2Seen': False, + 'street2Seen': True, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -73,7 +73,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, @@ -337,7 +337,7 @@ 'street1CheckCallRaiseChance': False, 'street1CheckCallRaiseDone': False, 'street1Raises': 0, - 'street1Seen': False, + 'street1Seen': True, 'street2Aggr': False, 'street2Bets': 0, 'street2CBChance': False, @@ -346,7 +346,7 @@ 'street2CheckCallRaiseChance': False, 'street2CheckCallRaiseDone': False, 'street2Raises': 0, - 'street2Seen': False, + 'street2Seen': True, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -355,7 +355,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, @@ -370,9 +370,9 @@ 'tourneysPlayersIds': None, 'winnings': 194, 'wonAtSD': 1.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet1': 1.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 1.0, 'wonWhenSeenStreet4': 0.0}, u'Player5': { 'card1': 0, 'card2': 0, @@ -619,7 +619,7 @@ 'street1CheckCallRaiseChance': False, 'street1CheckCallRaiseDone': False, 'street1Raises': 0, - 'street1Seen': False, + 'street1Seen': True, 'street2Aggr': False, 'street2Bets': 0, 'street2CBChance': False, @@ -628,7 +628,7 @@ 'street2CheckCallRaiseChance': False, 'street2CheckCallRaiseDone': False, 'street2Raises': 0, - 'street2Seen': False, + 'street2Seen': True, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -637,7 +637,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, diff --git a/pyfpdb/regression-test-files/cash/OnGame/Flop/LHE-9max-USD-0.50-1.00-201008.All-in.with.showdown.txt.hp b/pyfpdb/regression-test-files/cash/OnGame/Flop/LHE-9max-USD-0.50-1.00-201008.All-in.with.showdown.txt.hp index 0c129875..6a9111e6 100644 --- a/pyfpdb/regression-test-files/cash/OnGame/Flop/LHE-9max-USD-0.50-1.00-201008.All-in.with.showdown.txt.hp +++ b/pyfpdb/regression-test-files/cash/OnGame/Flop/LHE-9max-USD-0.50-1.00-201008.All-in.with.showdown.txt.hp @@ -243,7 +243,7 @@ 'street1CheckCallRaiseChance': False, 'street1CheckCallRaiseDone': False, 'street1Raises': 0, - 'street1Seen': False, + 'street1Seen': True, 'street2Aggr': False, 'street2Bets': 0, 'street2CBChance': False, @@ -252,7 +252,7 @@ 'street2CheckCallRaiseChance': False, 'street2CheckCallRaiseDone': False, 'street2Raises': 0, - 'street2Seen': False, + 'street2Seen': True, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -261,7 +261,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, @@ -276,9 +276,9 @@ 'tourneysPlayersIds': None, 'winnings': 325, 'wonAtSD': 1.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet1': 1.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 1.0, 'wonWhenSeenStreet4': 0.0}, u'player4': { 'card1': 0, 'card2': 0, @@ -431,7 +431,7 @@ 'street1CheckCallRaiseChance': False, 'street1CheckCallRaiseDone': False, 'street1Raises': 0, - 'street1Seen': False, + 'street1Seen': True, 'street2Aggr': False, 'street2Bets': 0, 'street2CBChance': False, @@ -440,7 +440,7 @@ 'street2CheckCallRaiseChance': False, 'street2CheckCallRaiseDone': False, 'street2Raises': 0, - 'street2Seen': False, + 'street2Seen': True, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -449,7 +449,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp index a073d0c1..390b2e99 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp @@ -88,9 +88,9 @@ 'tourneysPlayersIds': None, 'winnings': 3935, 'wonAtSD': 1.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet1': 1.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 1.0, 'wonWhenSeenStreet4': 0.0}, u'Arbaz': { 'card1': 0, 'card2': 0, diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp index d2231a26..3e134e68 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp @@ -55,7 +55,7 @@ 'street1CheckCallRaiseChance': False, 'street1CheckCallRaiseDone': False, 'street1Raises': 0, - 'street1Seen': False, + 'street1Seen': True, 'street2Aggr': False, 'street2Bets': 0, 'street2CBChance': False, @@ -64,7 +64,7 @@ 'street2CheckCallRaiseChance': False, 'street2CheckCallRaiseDone': False, 'street2Raises': 0, - 'street2Seen': False, + 'street2Seen': True, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -73,7 +73,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, @@ -619,7 +619,7 @@ 'street1CheckCallRaiseChance': False, 'street1CheckCallRaiseDone': False, 'street1Raises': 0, - 'street1Seen': False, + 'street1Seen': True, 'street2Aggr': False, 'street2Bets': 0, 'street2CBChance': False, @@ -628,7 +628,7 @@ 'street2CheckCallRaiseChance': False, 'street2CheckCallRaiseDone': False, 'street2Raises': 0, - 'street2Seen': False, + 'street2Seen': True, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -637,7 +637,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, @@ -652,7 +652,7 @@ 'tourneysPlayersIds': None, 'winnings': 1900, 'wonAtSD': 1.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet1': 1.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 1.0, 'wonWhenSeenStreet4': 0.0}} diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp index 50638df3..811945de 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp @@ -243,7 +243,7 @@ 'street1CheckCallRaiseChance': False, 'street1CheckCallRaiseDone': False, 'street1Raises': 0, - 'street1Seen': False, + 'street1Seen': True, 'street2Aggr': False, 'street2Bets': 0, 'street2CBChance': False, @@ -252,7 +252,7 @@ 'street2CheckCallRaiseChance': False, 'street2CheckCallRaiseDone': False, 'street2Raises': 0, - 'street2Seen': False, + 'street2Seen': True, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -261,7 +261,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, @@ -431,7 +431,7 @@ 'street1CheckCallRaiseChance': False, 'street1CheckCallRaiseDone': False, 'street1Raises': 0, - 'street1Seen': False, + 'street1Seen': True, 'street2Aggr': False, 'street2Bets': 0, 'street2CBChance': False, @@ -440,7 +440,7 @@ 'street2CheckCallRaiseChance': False, 'street2CheckCallRaiseDone': False, 'street2Raises': 0, - 'street2Seen': False, + 'street2Seen': True, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -449,7 +449,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, @@ -464,9 +464,9 @@ 'tourneysPlayersIds': None, 'winnings': 279, 'wonAtSD': 1.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet1': 1.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 1.0, 'wonWhenSeenStreet4': 0.0}, u'Player5': { 'card1': 0, 'card2': 0, diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp index 1fcb2468..6e859733 100644 --- a/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp +++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp @@ -64,7 +64,7 @@ 'street2CheckCallRaiseChance': False, 'street2CheckCallRaiseDone': False, 'street2Raises': 0, - 'street2Seen': False, + 'street2Seen': True, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -73,7 +73,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, @@ -628,7 +628,7 @@ 'street2CheckCallRaiseChance': False, 'street2CheckCallRaiseDone': False, 'street2Raises': 0, - 'street2Seen': False, + 'street2Seen': True, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -637,7 +637,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, @@ -653,8 +653,8 @@ 'winnings': 88, 'wonAtSD': 1.0, 'wonWhenSeenStreet1': 1.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 1.0, 'wonWhenSeenStreet4': 0.0}, u'Player5': { 'card1': 0, 'card2': 0, @@ -816,7 +816,7 @@ 'street2CheckCallRaiseChance': True, 'street2CheckCallRaiseDone': True, 'street2Raises': 0, - 'street2Seen': False, + 'street2Seen': True, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -825,7 +825,7 @@ 'street3CheckCallRaiseChance': False, 'street3CheckCallRaiseDone': False, 'street3Raises': 0, - 'street3Seen': False, + 'street3Seen': True, 'street4Aggr': False, 'street4Bets': 0, 'street4CBChance': False, @@ -841,6 +841,6 @@ 'winnings': 338, 'wonAtSD': 1.0, 'wonWhenSeenStreet1': 1.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 1.0, 'wonWhenSeenStreet4': 0.0}} diff --git a/pyfpdb/regression-test-files/summaries/FTP/NLHE-EUR-MTT-1-201012.txt b/pyfpdb/regression-test-files/summaries/FTP/NLHE-EUR-MTT-1-201012.txt new file mode 100644 index 00000000..e6d925cc Binary files /dev/null and b/pyfpdb/regression-test-files/summaries/FTP/NLHE-EUR-MTT-1-201012.txt differ diff --git a/pyfpdb/regression-test-files/summaries/FTP/NLHE-USD-MTT-1-201012.No.rake.txt b/pyfpdb/regression-test-files/summaries/FTP/NLHE-USD-MTT-1-201012.No.rake.txt new file mode 100644 index 00000000..338e2666 Binary files /dev/null and b/pyfpdb/regression-test-files/summaries/FTP/NLHE-USD-MTT-1-201012.No.rake.txt differ diff --git a/pyfpdb/regression-test-files/summaries/FTP/NLHE-USD-Rush-MTT-1-201012.No.cash.txt b/pyfpdb/regression-test-files/summaries/FTP/NLHE-USD-Rush-MTT-1-201012.No.cash.txt new file mode 100644 index 00000000..fcea192f Binary files /dev/null and b/pyfpdb/regression-test-files/summaries/FTP/NLHE-USD-Rush-MTT-1-201012.No.cash.txt differ