diff --git a/pyfpdb/FullTiltPokerSummary.py b/pyfpdb/FullTiltPokerSummary.py index 6ad7560e..d3bcf191 100644 --- a/pyfpdb/FullTiltPokerSummary.py +++ b/pyfpdb/FullTiltPokerSummary.py @@ -46,7 +46,9 @@ class FullTiltPokerSummary(TourneySummary): substitutions = { 'LEGAL_ISO' : "USD|EUR|GBP|CAD|FPP", # legal ISO currency codes - 'LS' : "\$|\xe2\x82\xac|" # legal currency symbols - Euro(cp1252, utf-8) + 'LS' : "\$|\xe2\x82\xac|", # legal currency symbols - Euro(cp1252, utf-8) + 'TAB' : u"-\u2013'\s\da-zA-Z", # legal characters for tablename + 'NUM' : u".,\d", # legal characters in number format } re_SplitTourneys = re.compile("^Full Tilt Poker Tournament Summary") @@ -55,14 +57,21 @@ class FullTiltPokerSummary(TourneySummary): re_TourneyInfo = re.compile(u""" \s.* - (?PTournament|Sit\s\&\sGo)\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+)? + (Add-On:\s\$(?P[.\d]+)\s+)? + (Rebuy:\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+)? + (Rebuy\sChips:\s(?P\d+)\s+)? (?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[.0-9]+)\s+)? + (Total\sPrize\sPool:\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 diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index 34760664..8091b93a 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -632,7 +632,7 @@ or None if we fail to get the info """ elif givenTimezone == 'IST': # India Standard Time pass elif givenTimezone == 'CCT': # China Coast Time - pass + givenTZ = timezone('Australia/West') elif givenTimezone == 'JST': # Japan Standard Time pass elif givenTimezone == 'AWST': # Australian Western Standard Time