From dccc61013b63958bd59b550689e9289325136ba4 Mon Sep 17 00:00:00 2001 From: Worros Date: Wed, 19 Jan 2011 16:34:12 +0800 Subject: [PATCH] FTPSummary: First pass at EUR summary. Failing test now passes. --- pyfpdb/FullTiltPokerSummary.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyfpdb/FullTiltPokerSummary.py b/pyfpdb/FullTiltPokerSummary.py index 7c65a82f..79f50f01 100644 --- a/pyfpdb/FullTiltPokerSummary.py +++ b/pyfpdb/FullTiltPokerSummary.py @@ -60,9 +60,9 @@ class FullTiltPokerSummary(TourneySummary): (?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+)? - (Add-On:\s\$(?P[.\d]+)\s+)? - (Rebuy:\s\$(?P[.\d]+)\s+)? + (Buy-In:\s[%(LS)s](?P[.\d]+)(\s\+\s[%(LS)s](?P[.\d]+))?\s+)? + (Add-On:\s[%(LS)s](?P[.\d]+)\s+)? + (Rebuy:\s[%(LS)s](?P[.\d]+)\s+)? ((?P.{2,15})\sperformed\s(?P\d+)\sRebuys\s+)? (Buy-In\sChips:\s(?P\d+)\s+)? (Add-On\sChips:\s(?P\d+)\s+)? @@ -70,8 +70,8 @@ class FullTiltPokerSummary(TourneySummary): (?P[0-9]+)\sEntries\s+ (Total\sAdd-Ons:\s(?P\d+)\s+)? (Total\sRebuys:\s(?P\d+)\s+)? - (\$?(?P[.\d]+)\sadded\sto\sthe\sprize\spool\sby\sPokerStars\.com\s+)? - (Total\sPrize\sPool:\s\$?(?P[%(NUM)s]+)\s+)? + ([%(LS)s]?(?P[.\d]+)\sadded\sto\sthe\sprize\spool\sby\sPokerStars\.com\s+)? + (Total\sPrize\sPool:\s[%(LS)s]?(?P[%(NUM)s]+)\s+)? (Target\sTournament\s.*)? Tournament\sstarted:\s (?P[\d]{4})\/(?P[\d]{2})\/(?P[\d]+)\s+(?P[\d]+):(?P[\d]+):(?P[\d]+)\s??(?P[A-Z]+)\s @@ -79,7 +79,7 @@ class FullTiltPokerSummary(TourneySummary): re_Currency = re.compile(u"""(?P[%(LS)s]|FPP)""" % substitutions) - re_Player = re.compile(u"""(?P[\d]+):\s(?P[^,\r\n]{2,15})(,(\s)?\$(?P[.\d]+))?""") + re_Player = re.compile(u"""(?P[\d]+):\s(?P[^,\r\n]{2,15})(,(\s)?[%(LS)s](?P[.\d]+))?""") re_DateTime = re.compile("\[(?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\- ]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+)")