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 2010-08-05 04:09:51 -04:00
commit 381e8958d9
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pyfpdb/GuiBulkImport.py
View File

@ -349,11 +349,11 @@ def main(argv=None):
if options.usage == True: if options.usage == True:
#Print usage examples and exit #Print usage examples and exit
print "USAGE:" print "USAGE:"
print 'PokerStars converter: ./GuiBulkImport -c PokerStars -f filename' print 'PokerStars converter: ./GuiBulkImport.py -c PokerStars -f filename'
print 'Full Tilt converter: ./GuiBulkImport -c "Full Tilt Poker" -f filename' print 'Full Tilt converter: ./GuiBulkImport.py -c "Full Tilt Poker" -f filename'
print "Everleaf converter: ./GuiBulkImport -c Everleaf -f filename" print "Everleaf converter: ./GuiBulkImport.py -c Everleaf -f filename"
print "Absolute converter: ./GuiBulkImport -c Absolute -f filename" print "Absolute converter: ./GuiBulkImport.py -c Absolute -f filename"
print "PartyPoker converter: ./GuiBulkImport -c PartyPoker -f filename" print "PartyPoker converter: ./GuiBulkImport.py -c PartyPoker -f filename"
sys.exit(0) sys.exit(0)
config = Configuration.Config() config = Configuration.Config()

15
pyfpdb/PartyPokerToFpdb.py
View File

@ -96,7 +96,8 @@ 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_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)
@ -185,6 +186,8 @@ class PartyPoker(HandHistoryConverter):
info = {} info = {}
m = self._getGameType(handText) m = self._getGameType(handText)
m_sb = self.re_ringSB.search(handText)
m_bb = self.re_ringBB.search(handText)
if m is None: if m is None:
return None return None
@ -216,7 +219,8 @@ class PartyPoker(HandHistoryConverter):
info['type'] = 'ring' info['type'] = 'ring'
if info['type'] == 'ring': if info['type'] == 'ring':
info['sb'], info['bb'] = ringBlinds(mg['RINGLIMIT']) info['sb'] = m_sb.group('RINGSB')
info['bb'] = m_bb.group('RINGBB')
info['currency'] = currencies[mg['CURRENCY']] info['currency'] = currencies[mg['CURRENCY']]
else: else:
info['sb'] = clearMoneyString(mg['SB']) info['sb'] = clearMoneyString(mg['SB'])
@ -483,13 +487,6 @@ class PartyPoker(HandHistoryConverter):
print 'party', 'getTableTitleRe', table_number print 'party', 'getTableTitleRe', table_number
return table_name return table_name
def ringBlinds(ringLimit):
"Returns blinds for current limit in cash games"
ringLimit = float(clearMoneyString(ringLimit))
if ringLimit == 5.: ringLimit = 4.
return ('%.2f' % (ringLimit/200.), '%.2f' % (ringLimit/100.) )
def clearMoneyString(money): def clearMoneyString(money):
"Renders 'numbers' like '1 200' and '2,000'" "Renders 'numbers' like '1 200' and '2,000'"
return money.replace(' ', '').replace(',', '') return money.replace(' ', '').replace(',', '')