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

Stars: Take 42 on Tourney parsing

Browse Source 
Hopefully fix parsing for bounty and cash tourneys for good.

FPP is probably still broken
This commit is contained in:
Worros 2010-08-03 19:22:52 +08:00
parent 2fd856d55b
commit 9329475298
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pyfpdb/PokerStarsToFpdb.py
View File

@ -72,7 +72,7 @@ class PokerStars(HandHistoryConverter):
(Tournament\s\# # open paren of tournament info (Tournament\s\# # open paren of tournament info
(?P<TOURNO>\d+),\s (?P<TOURNO>\d+),\s
# here's how I plan to use LS # here's how I plan to use LS
(?P<BUYIN>(?P<BIAMT>[%(LS)s\d\.]+)?\+?(?P<BOUNTY>[%(LS)s\d\.]+)?\+?(?P<BIRAKE>[%(LS)s\d\.]+)\s?(?P<TOUR_ISO>%(LEGAL_ISO)s)?|Freeroll)\s+)? (?P<BUYIN>(?P<BIAMT>[%(LS)s\d\.]+)?\+(?P<BIRAKE>[%(LS)s\d\.]+)?\+?(?P<BOUNTY>[%(LS)s\d\.]+)?\s?(?P<TOUR_ISO>%(LEGAL_ISO)s)?|Freeroll)\s+)?
# close paren of tournament info # close paren of tournament info
(?P<MIXED>HORSE|8\-Game|HOSE)?\s?\(? (?P<MIXED>HORSE|8\-Game|HOSE)?\s?\(?
(?P<GAME>Hold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|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/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s
@ -252,14 +252,20 @@ class PokerStars(HandHistoryConverter):
raise FpdbParseError("failed to detect currency") raise FpdbParseError("failed to detect currency")
if hand.buyinCurrency!="PSFP": if hand.buyinCurrency!="PSFP":
hand.buyin = int(100*Decimal(info['BIAMT'][1:])) if info['BOUNTY'] != None:
if info['BIRAKE'][0]!="$": #we have a non-bounty game # There is a bounty, Which means we need to switch BOUNTY and BIRAKE values
info['BOUNTY']=info['BOUNTY']+info['BIRAKE'] #TODO remove this dirty dirty hack by fixing regex tmp = info['BOUNTY']
hand.fee = int(100*Decimal(info['BOUNTY'][1:])) info['BOUNTY'] = info['BIRAKE']
else: info['BIRAKE'] = tmp
hand.fee = int(100*Decimal(info['BIRAKE'][1:])) info['BOUNTY'] = info['BOUNTY'].strip(u'$€') # Strip here where it isn't 'None'
hand.isKO = True hand.koBounty = int(100*Decimal(info['BOUNTY']))
hand.koBounty = int(100*Decimal(info['BOUNTY'][1:]))
info['BIAMT'] = info['BIAMT'].strip(u'$€')
info['BIRAKE'] = info['BIRAKE'].strip(u'$€')
hand.buyin = int(100*Decimal(info['BIAMT']))
hand.fee = int(100*Decimal(info['BIRAKE']))
hand.isKO = True
else: else:
hand.buyin = int(Decimal(info[key][0:-3])) hand.buyin = int(Decimal(info[key][0:-3]))
hand.fee = 0 hand.fee = 0