From b38c62367ae4f91d2b336e55ff469503fa663787 Mon Sep 17 00:00:00 2001 From: Worros Date: Wed, 25 Feb 2009 01:17:25 +0900 Subject: [PATCH] Preliminary razz support for Fulltilt Breaks stuff --- pyfpdb/FulltiltToFpdb.py | 35 +++++++++++++++++++++++++++------- pyfpdb/Hand.py | 3 +++ pyfpdb/HandHistoryConverter.py | 25 +++++++++++++++++++----- 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index ef50c518..ecaab23a 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -28,10 +28,9 @@ class FullTilt(HandHistoryConverter): HandHistoryConverter.__init__(self, config, file, sitename="FullTilt") # Call super class init. self.sitename = "FullTilt" self.setFileType("text", "cp1252") - - self.re_GameInfo = re.compile('- \$?(?P[.0-9]+)/\$?(?P[.0-9]+) - (?P(No|Pot)) Limit (?P(Hold\'em|Omaha))') + self.re_GameInfo = re.compile('- \$?(?P[.0-9]+)/\$?(?P[.0-9]+) (Ante \$(?P[.0-9]+) )?- (?P(No|Pot)? )?Limit (?P(Hold\'em|Omaha|Razz))') self.re_SplitHands = re.compile(r"\n\n+") - self.re_HandInfo = re.compile('.*#(?P[0-9]+): Table (?P[- a-zA-Z]+) (\((?P.+)\) )?- \$?(?P[.0-9]+)/\$?(?P[.0-9]+) - (?P[a-zA-Z\' ]+) - (?P.*)') + self.re_HandInfo = re.compile('.*#(?P[0-9]+): Table (?P
[- a-zA-Z]+) (\((?P.+)\) )?- \$?(?P[.0-9]+)/\$?(?P[.0-9]+) (Ante \$(?P[.0-9]+) )?- (?P[a-zA-Z\' ]+) - (?P.*)') self.re_Button = re.compile('The button is in seat #(?P