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

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

Browse Source 
Only seemed to conflict the [ --> \[ in the HeroCards re

Conflicts:

	pyfpdb/FulltiltToFpdb.py
This commit is contained in:
Matt Turnbull
2009-02-25 12:36:45 +00:00
parent 8cccce512d d500a9f9c5
commit bb4eece2f7
4 changed files with 132 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pyfpdb/FulltiltToFpdb.py
+5 -3
View File
@@ -42,7 +42,7 @@ class FullTilt(HandHistoryConverter):
self.re_PostBB = re.compile(r"^%s posts (the big blind of )?\$?(?P<BB>[.0-9]+)", player_re)
self.re_BringIn = re.compile(r"^%s brings in for \$?(?P<BRINGIN>[.0-9]+)", player_re)
self.re_PostBoth = re.compile(r"^%s posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)", player_re)
self.re_HeroCards = re.compile(r"^Dealt to %s \[(?P<CARDS>.*)\]( [(?P<NEWCARD>.*])?", player_re)
self.re_HeroCards = re.compile(r"^Dealt to %s \[(?P<CARDS>.*)\]( \[(?P<NEWCARD>.*\])?", player_re)
self.re_Action = re.compile(r"^%s(?P<ATYPE> bets| checks| raises to| calls| folds)(\s\$(?P<BET>[.\d]+))?", player_re)
self.re_ShowdownAction = re.compile(r"^%s shows \[(?P<CARDS>.*)\]", player_re)
self.re_CollectPot = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*)", player_re)
@@ -71,7 +71,7 @@ class FullTilt(HandHistoryConverter):
structure = "nl"
elif m.group('LTYPE') == "Pot ":
structure = "pl"
elif m.group('LTYPE') == "None":
elif m.group('LTYPE') == None:
structure = "fl"
if m.group('GAME') == "Hold\'em":
@@ -80,7 +80,9 @@ class FullTilt(HandHistoryConverter):
game = "omahahi"
elif m.group('GAME') == "Razz":
game = "razz"
print m.groups()
gametype = ["ring", game, structure, m.group('SB'), m.group('BB')]
return gametype