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

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

Browse Source
This commit is contained in:
Eratosthenes 2011-01-28 15:07:21 -05:00
commit 54146f7170
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pyfpdb/FulltiltToFpdb.py
View File

@ -60,7 +60,12 @@ class Fulltilt(HandHistoryConverter):
'400.00': ('100.00', '200.00'), '400': ('100.00', '200.00'),
'500.00': ('125.00', '250.00'), '500': ('125.00', '250.00'),
'800.00': ('200.00', '400.00'), '800': ('200.00', '400.00'),
'1000.00': ('250.00', '500.00'),'1000': ('250.00', '500.00')
'1000.00': ('250.00', '500.00'),'1000': ('250.00', '500.00'),
'2000.00': ('500.00', '1000.00'),'2000': ('500.00', '1000.00'),
'3000.00': ('750.00', '1500.00'),'3000': ('750.00', '1500.00'),
'4000.00': ('1000.00', '2000.00'),'4000': ('1000.00', '2000.00'),
'5000.00': ('1250.00', '2500.00'),'5000': ('1250.00', '2500.00'),
'6000.00': ('1500.00', '3000.00'),'6000': ('1500.00', '3000.00'),
}
# Static regexes
@ -100,7 +105,7 @@ class Fulltilt(HandHistoryConverter):
''' % substitutions, re.VERBOSE)
re_Button = re.compile('^The button is in seat #(?P<BUTTON>\d+)', re.MULTILINE)
re_PlayerInfo = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{2,15}) \([%(LS)s]?(?P<CASH>[%(NUM)s]+)\)(?P<SITOUT>, is sitting out)?$' % substitutions, re.MULTILINE)
re_SummarySitout = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{2,15}) is sitting out?$' % substitutions, re.MULTILINE)
re_SummarySitout = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{2,15}?) (\(button\) )?is sitting out?$' % substitutions, re.MULTILINE)
re_Board = re.compile(r"\[(?P<CARDS>.+)\]")
#static regex for tourney purpose
@ -197,11 +202,6 @@ class Fulltilt(HandHistoryConverter):
]
def determineGameType(self, handText):
# Full Tilt Poker Game #10777181585: Table Deerfly (deep 6) - $0.01/$0.02 - Pot Limit Omaha Hi - 2:24:44 ET - 2009/02/22
# Full Tilt Poker Game #10773265574: Table Butte (6 max) - $0.01/$0.02 - Pot Limit Hold'em - 21:33:46 ET - 2009/02/21
# Full Tilt Poker Game #9403951181: Table CR - tay - $0.05/$0.10 - No Limit Hold'em - 9:40:20 ET - 2008/12/09
# Full Tilt Poker Game #10809877615: Table Danville - $0.50/$1 Ante $0.10 - Limit Razz - 21:47:27 ET - 2009/02/23
# Full Tilt Poker.fr Game #23057874034: Table Douai–Lens (6 max) - €0.01/€0.02 - No Limit Hold'em - 21:59:17 CET - 2010/08/13
info = {'type':'ring'}
m = self.re_GameInfo.search(handText)
@ -243,12 +243,12 @@ class Fulltilt(HandHistoryConverter):
if info['limitType'] == 'fl' and info['bb'] is not None and info['type'] == 'ring':
try:
info['sb'] = self.Lim_Blinds[mg['BB']][0]
info['bb'] = self.Lim_Blinds[mg['BB']][1]
info['sb'] = self.Lim_Blinds[self.clearMoneyString(mg['BB'])][0]
info['bb'] = self.Lim_Blinds[self.clearMoneyString(mg['BB'])][1]
except KeyError:
log.error(_("determineGameType: Lim_Blinds has no lookup for '%s'" % mg['BB']))
log.error(_("determineGameType: Lim_Blinds has no lookup for '%s'" % self.clearMoneyString(mg['BB'])))
log.error(_("determineGameType: Raising FpdbParseError"))
raise FpdbParseError(_("Lim_Blinds has no lookup for '%s'") % mg['BB'])
raise FpdbParseError(_("Lim_Blinds has no lookup for '%s'") % self.clearMoneyString(mg['BB']))
if mg['GAME'] is not None:
(info['base'], info['category']) = games[mg['GAME']]
@ -338,7 +338,7 @@ class Fulltilt(HandHistoryConverter):
def readPlayerStacks(self, hand):
# Split hand text for FTP, as the regex matches the player names incorrectly
# in the summary section
pre, post = hand.handText.split('SUMMARY')
pre, post = hand.handText.split('*** SUMMARY ***')
m = self.re_PlayerInfo.finditer(pre)
plist = {}
@ -351,7 +351,7 @@ class Fulltilt(HandHistoryConverter):
n = self.re_SummarySitout.finditer(post)
for b in n:
del plist[b.group('PNAME')]
print "DEBUG: Deleting '%s' from player dict" %(b.group('PNAME'))
#print "DEBUG: Deleting '%s' from player dict" %(b.group('PNAME'))
# Add remaining players
for a in plist: