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

merge, minor conflict in PS2Fpdb

Browse Source
This commit is contained in:
steffen123 2010-08-12 10:46:23 +02:00
parent 5d2391c019
commit 0c16ac0ac5
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pyfpdb/PartyPokerToFpdb.py
View File

@ -39,8 +39,8 @@ class FpdbParseError(FpdbParseError):
class PartyPoker(HandHistoryConverter): class PartyPoker(HandHistoryConverter):
sitename = "PartyPoker" sitename = "PartyPoker"
codepage = "cp1252" codepage = "cp1252"
siteId = 9 siteId = 9
filetype = "text" filetype = "text"
sym = {'USD': "\$", } sym = {'USD': "\$", }
# Static regexes # Static regexes
@ -96,8 +96,7 @@ class PartyPoker(HandHistoryConverter):
re_NoSmallBlind = re.compile( re_NoSmallBlind = re.compile(
'^There is no Small Blind in this hand as the Big Blind ' '^There is no Small Blind in this hand as the Big Blind '
'of the previous hand left the table', re.MULTILINE) 'of the previous hand left the table', re.MULTILINE)
re_ringSB = re.compile(r"(?P<PLAYER>.*) posts small blind \[\$(?P<RINGSB>[.,0-9]*) USD\]\.") re_20BBmin = re.compile(r"Table 20BB Min")
re_ringBB = re.compile(r"(?P<PLAYER>.*) posts big blind \[\$(?P<RINGBB>[.,0-9]*) USD\]\.")
def allHandsAsList(self): def allHandsAsList(self):
list = HandHistoryConverter.allHandsAsList(self) list = HandHistoryConverter.allHandsAsList(self)
@ -186,8 +185,7 @@ class PartyPoker(HandHistoryConverter):
info = {} info = {}
m = self._getGameType(handText) m = self._getGameType(handText)
m_sb = self.re_ringSB.search(handText) m_20BBmin = self.re_20BBmin.search(handText)
m_bb = self.re_ringBB.search(handText)
if m is None: if m is None:
return None return None
@ -219,11 +217,18 @@ class PartyPoker(HandHistoryConverter):
info['type'] = 'ring' info['type'] = 'ring'
if info['type'] == 'ring': if info['type'] == 'ring':
if (m_sb is None) or (m_bb is None): if m_20BBmin is None:
return None bb = float(mg['RINGLIMIT'])/100.0
else: else:
info['sb'] = m_sb.group('RINGSB') bb = float(mg['RINGLIMIT'])/40.0
info['bb'] = m_bb.group('RINGBB')
if bb == 0.25:
sb = 0.10
else:
sb = bb/2.0
info['bb'] = "%.2f" % (bb)
info['sb'] = "%.2f" % (sb)
info['currency'] = currencies[mg['CURRENCY']] info['currency'] = currencies[mg['CURRENCY']]
else: else:
info['sb'] = clearMoneyString(mg['SB']) info['sb'] = clearMoneyString(mg['SB'])
@ -298,9 +303,9 @@ class PartyPoker(HandHistoryConverter):
if key == 'TABLE': if key == 'TABLE':
hand.tablename = info[key] hand.tablename = info[key]
if key == 'MTTTABLE': if key == 'MTTTABLE':
if info[key] != None: if info[key] != None:
hand.tablename = info[key] hand.tablename = info[key]
hand.tourNo = info['TABLE'] hand.tourNo = info['TABLE']
if key == 'BUTTON': if key == 'BUTTON':
hand.buttonpos = info[key] hand.buttonpos = info[key]
if key == 'TOURNO': if key == 'TOURNO':

2
pyfpdb/PokerStarsToFpdb.py
View File

@ -49,7 +49,7 @@ class PokerStars(HandHistoryConverter):
'4.00': ('1.00', '2.00'), '6': ('1.00', '3.00'), '6.00': ('1.00', '3.00'), '4.00': ('1.00', '2.00'), '6': ('1.00', '3.00'), '6.00': ('1.00', '3.00'),
'10.00': ('2.00', '5.00'), '10': ('2.00', '5.00'), '20.00': ('5.00', '10.00'), '10.00': ('2.00', '5.00'), '10': ('2.00', '5.00'), '20.00': ('5.00', '10.00'),
'20': ('5.00', '10.00'), '30.00': ('10.00', '15.00'), '30': ('10.00', '15.00'), '20': ('5.00', '10.00'), '30.00': ('10.00', '15.00'), '30': ('10.00', '15.00'),
'60.00': ('15.00', '30.00'), '60': ('15.00', '30.00'), '100.00': ('25.00', '50.00'), '60.00': ('15.00', '30.00'), '60': ('15.00', '30.00'), '100.00': ('25.00', '50.00'),
'100': ('25.00', '50.00'),'200.00': ('50.00', '100.00'), '200': ('50.00', '100.00'), '100': ('25.00', '50.00'),'200.00': ('50.00', '100.00'), '200': ('50.00', '100.00'),
'400.00': ('100.00', '200.00'), '400': ('100.00', '200.00'),'1000.00': ('250.00', '500.00'), '400.00': ('100.00', '200.00'), '400': ('100.00', '200.00'),'1000.00': ('250.00', '500.00'),
'1000': ('250.00', '500.00')} '1000': ('250.00', '500.00')}