evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.assembla.com/fpdboz.git

Browse Source
This commit is contained in:
Eric Blade 2011-01-01 01:58:21 -05:00
commit fd86051690
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pyfpdb/FullTiltPokerSummary.py
View File

@ -46,7 +46,9 @@ class FullTiltPokerSummary(TourneySummary):
substitutions = { substitutions = {
'LEGAL_ISO' : "USD|EUR|GBP|CAD|FPP", # legal ISO currency codes '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") re_SplitTourneys = re.compile("^Full Tilt Poker Tournament Summary")
@ -55,14 +57,21 @@ class FullTiltPokerSummary(TourneySummary):
re_TourneyInfo = re.compile(u""" re_TourneyInfo = re.compile(u"""
\s.* \s.*
(?P<TYPE>Tournament|Sit\s\&\sGo)\s\((?P<TOURNO>[0-9]+)\)(\s+)? (?P<TYPE>Tournament|Sit\s\&\sGo|\(Rebuy\))\s\((?P<TOURNO>[0-9]+)\)(\s+)?
(?P<GAME>Hold\'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+ (?P<GAME>Hold\'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+
(?P<LIMIT>No\sLimit|Limit|LIMIT|Pot\sLimit)\s+ (?P<LIMIT>No\sLimit|Limit|LIMIT|Pot\sLimit)\s+
(Buy-In:\s\$(?P<BUYIN>[.\d]+)(\s\+\s\$(?P<FEE>[.\d]+))?\s+)? (Buy-In:\s\$(?P<BUYIN>[.\d]+)(\s\+\s\$(?P<FEE>[.\d]+))?\s+)?
(Add-On:\s\$(?P<ADDON>[.\d]+)\s+)?
(Rebuy:\s\$(?P<REBUYAMT>[.\d]+)\s+)?
((?P<PNAME>.{2,15})\sperformed\s(?P<PREBUYS>\d+)\sRebuys\s+)?
(Buy-In\sChips:\s(?P<CHIPS>\d+)\s+)? (Buy-In\sChips:\s(?P<CHIPS>\d+)\s+)?
(Add-On\sChips:\s(?P<ADDONCHIPS>\d+)\s+)?
(Rebuy\sChips:\s(?P<REBUYCHIPS>\d+)\s+)?
(?P<ENTRIES>[0-9]+)\sEntries\s+ (?P<ENTRIES>[0-9]+)\sEntries\s+
(Total\sAdd-Ons:\s(?P<ADDONS>\d+)\s+)?
(Total\sRebuys:\s(?P<REBUYS>\d+)\s+)?
(\$?(?P<ADDED>[.\d]+)\sadded\sto\sthe\sprize\spool\sby\sPokerStars\.com\s+)? (\$?(?P<ADDED>[.\d]+)\sadded\sto\sthe\sprize\spool\sby\sPokerStars\.com\s+)?
(Total\sPrize\sPool:\s\$?(?P<PRIZEPOOL>[.0-9]+)\s+)? (Total\sPrize\sPool:\s\$?(?P<PRIZEPOOL>[%(NUM)s]+)\s+)?
(Target\sTournament\s.*)? (Target\sTournament\s.*)?
Tournament\sstarted:\s Tournament\sstarted:\s
(?P<Y>[\d]{4})\/(?P<M>[\d]{2})\/(?P<D>[\d]+)\s+(?P<H>[\d]+):(?P<MIN>[\d]+):(?P<S>[\d]+)\s??(?P<TZ>[A-Z]+)\s (?P<Y>[\d]{4})\/(?P<M>[\d]{2})\/(?P<D>[\d]+)\s+(?P<H>[\d]+):(?P<MIN>[\d]+):(?P<S>[\d]+)\s??(?P<TZ>[A-Z]+)\s

2
pyfpdb/HandHistoryConverter.py
View File

@ -632,7 +632,7 @@ or None if we fail to get the info """
elif givenTimezone == 'IST': # India Standard Time elif givenTimezone == 'IST': # India Standard Time
pass pass
elif givenTimezone == 'CCT': # China Coast Time elif givenTimezone == 'CCT': # China Coast Time
pass givenTZ = timezone('Australia/West')
elif givenTimezone == 'JST': # Japan Standard Time elif givenTimezone == 'JST': # Japan Standard Time
pass pass
elif givenTimezone == 'AWST': # Australian Western Standard Time elif givenTimezone == 'AWST': # Australian Western Standard Time