From affc697b322b27a53fbb3f44cc519a9b8eea11e6 Mon Sep 17 00:00:00 2001 From: Worros Date: Tue, 15 Mar 2011 14:42:43 +0800 Subject: [PATCH 1/3] Regression: Absolute HH from email. Not this file was been modified from the original email format to: - Remove the ####+ line - Rename the file into the manner expected. --- ... Limit $0.10(Real Money) Table 9330000.txt | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pyfpdb/regression-test-files/cash/Absolute/Flop/IHH20110221 Emailes - Hold'em No Limit $0.10(Real Money) Table 9330000.txt diff --git a/pyfpdb/regression-test-files/cash/Absolute/Flop/IHH20110221 Emailes - Hold'em No Limit $0.10(Real Money) Table 9330000.txt b/pyfpdb/regression-test-files/cash/Absolute/Flop/IHH20110221 Emailes - Hold'em No Limit $0.10(Real Money) Table 9330000.txt new file mode 100644 index 00000000..95a89123 --- /dev/null +++ b/pyfpdb/regression-test-files/cash/Absolute/Flop/IHH20110221 Emailes - Hold'em No Limit $0.10(Real Money) Table 9330000.txt @@ -0,0 +1,54 @@ +Stage #C379012708: Holdem No Limit $0.10 Turbo - 2011-02-21 05:08:53.010 (ET) [ 2011-02-21 05:08:53 ] +Table: Holmbury Rd.59 (Real Money) Seat #6 is the dealer +Seat 6 - PLAYER6 ($11.19 in chips) +Seat 7 - PLAYER7 ($1.09 in chips) +Seat 9 - PLAYER9 ($11.95 in chips) +Seat 1 - PLAYER1 ($1.60 in chips) +Seat 3 - HERO ($11.56 in chips) +Seat 4 - PLAYER4 ($2.67 in chips) +Seat 5 - PLAYER5 ($8.34 in chips) +PLAYER7 - Posts small blind $0.05 +PLAYER9 - Posts big blind $0.10 +*** POCKET CARDS *** +Dealt to HERO [10c 4d] +PLAYER1 - Folds +HERO - Folds (Preselection) +PLAYER4 - Calls $0.10 (Preselection) +PLAYER5 - Raises $0.20 to $0.20 +PLAYER6 - Calls $0.20 +PLAYER7 - Folds +PLAYER9 - Calls $0.10 +PLAYER4 - Raises $0.20 to $0.30 (Preselection) +PLAYER5 - Calls $0.10 +PLAYER6 - Calls $0.10 +PLAYER9 - Calls $0.10 +*** FLOP *** [Kh 3s 5c] +PLAYER9 - Checks +PLAYER4 - Checks +PLAYER5 - Checks +PLAYER6 - Checks +*** TURN *** [Kh 3s 5c] [6c] +PLAYER9 - Checks +PLAYER4 - Checks +PLAYER5 - Bets $0.90 +PLAYER6 - Folds +PLAYER9 - Folds +PLAYER4 - Calls $0.90 +*** RIVER *** [Kh 3s 5c 6c] [5d] +PLAYER4 - All-In $1.47 +PLAYER5 - Calls $1.47 +*** SHOW DOWN *** +PLAYER4 - Shows [Qd 6d] (Two Pair, sixes and fives) +PLAYER5 - Shows [Js Jh] (Two Pair, jacks and fives) +PLAYER5 Collects $5.70 from main pot +*** SUMMARY *** +Total Pot($5.99) | Rake ($0.29) +Board [Kh 3s 5c 6c 5d] +Seat 1: PLAYER1 Folded on the POCKET CARDS +Seat 3: HERO Folded on the POCKET CARDS +Seat 4: PLAYER4 HI:lost with Two Pair, sixes and fives [Qd 6d - P:6d,B:6c,B:5d,B:5c,B:Kh] +Seat 5: PLAYER5 collected Total ($5.70) HI:($5.70) with Two Pair, jacks and fives [Js Jh - P:Js,P:Jh,B:5d,B:5c,B:Kh] +Seat 6: PLAYER6 (dealer) Folded on the TURN +Seat 7: PLAYER7 (small blind) Folded on the POCKET CARDS +Seat 9: PLAYER9 (big blind) Folded on the TURN + From 15bdbfbdf7999c36a9e4cece3b7639fd6166b245 Mon Sep 17 00:00:00 2001 From: Worros Date: Tue, 15 Mar 2011 14:44:41 +0800 Subject: [PATCH 2/3] Absolute: Allow date variation to parse --- pyfpdb/AbsoluteToFpdb.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyfpdb/AbsoluteToFpdb.py b/pyfpdb/AbsoluteToFpdb.py index 299ff669..c31a52ab 100755 --- a/pyfpdb/AbsoluteToFpdb.py +++ b/pyfpdb/AbsoluteToFpdb.py @@ -55,8 +55,9 @@ class Absolute(HandHistoryConverter): (?PNo\ Limit|Pot\ Limit|Normal|)\s? (?P\$|\s€|) (?P[.,0-9]+)/?(?:\$|\s€|)(?P[.,0-9]+)? - \s+-\s+ - (?P\d\d\d\d-\d\d-\d\d\ \d\d:\d\d:\d\d)\s+ + \s+ + ((?P(Turbo))\s+)?-\s+ + ((?P\d\d\d\d-\d\d-\d\d\ \d\d:\d\d:\d\d)(\.\d+)?)\s+ (?: \( (?P[A-Z]+) \)\s+ )? .*? (Table:\ (?P.*?)\ \(Real\ Money\))? From 08ee109ec309d5270a04d7d82c606388e1623ea3 Mon Sep 17 00:00:00 2001 From: Worros Date: Thu, 17 Mar 2011 14:29:00 +0800 Subject: [PATCH 3/3] Stars: Allow ' in tablename Table 'Isildur's NLHE 50 IV' 2-max Seat #2 is the button --- pyfpdb/PokerStarsToFpdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index 7b1add77..8807bf7b 100644 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -115,7 +115,7 @@ class PokerStars(HandHistoryConverter): re.MULTILINE|re.VERBOSE) re_HandInfo = re.compile(""" - ^Table\s\'(?P
[-\ \#a-zA-Z\d]+)\'\s + ^Table\s\'(?P
[-\ \#a-zA-Z\d\']+)\'\s ((?P\d+)-max\s)? (?P\(Play\sMoney\)\s)? (Seat\s\#(?P