diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index 697eb632..baf356f7 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -38,16 +38,16 @@ class FullTilt(HandHistoryConverter): def compile_player_regexs(self): player_re = "(?P" + "|".join(map(re.escape, self.players)) + ")" #print "DEBUG player_re: " + player_re - self.re_PostSB = re.compile('.*\n(?P.*) posts the small blind of \$?(?P[.0-9]+)') - self.re_PostBB = re.compile('.*\n(?P.*) posts (the big blind of )?\$?(?P[.0-9]+)') - self.re_BringIn = re.compile('.*\n(?P.*) brings in for \$?(?P[.0-9]+)') - self.re_PostBoth = re.compile('.*\n(?P.*) posts small \& big blinds \[\$? (?P[.0-9]+)') - self.re_HeroCards = re.compile('.*\nDealt\sto\s(?P.*)\s\[(?P.*)\]( [(?P.*])?') - self.re_Action = re.compile('.*\n(?P.*)(?P bets| checks| raises to| calls| folds)(\s\$(?P[.\d]+))?') - self.re_ShowdownAction = re.compile('.*\n(?P.*) shows \[(?P.*)\]') - self.re_CollectPot = re.compile(r"Seat (?P[0-9]+): (?P.*?) (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P[.\d]+)\)(, mucked| with.*)") - self.re_SitsOut = re.compile('(?P.*) sits out') - self.re_ShownCards = re.compile('Seat (?P[0-9]+): (?P.*) \(.*\) showed \[(?P.*)\].*') + self.re_PostSB = re.compile(r"^%s posts the small blind of \$?(?P[.0-9]+)", player_re) + self.re_PostBB = re.compile(r"^%s posts (the big blind of )?\$?(?P[.0-9]+)", player_re) + self.re_BringIn = re.compile(r"^%s brings in for \$?(?P[.0-9]+)", player_re) + self.re_PostBoth = re.compile(r"^%s posts small \& big blinds \[\$? (?P[.0-9]+)", player_re) + self.re_HeroCards = re.compile(r"^Dealt to %s \[(?P.*)\]( [(?P.*])?", player_re) + self.re_Action = re.compile(r"^%s(?P bets| checks| raises to| calls| folds)(\s\$(?P[.\d]+))?", player_re) + self.re_ShowdownAction = re.compile(r"^%s shows \[(?P.*)\]", player_re) + self.re_CollectPot = re.compile(r"^Seat (?P[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P[.\d]+)\)(, mucked| with.*)", player_re) + self.re_SitsOut = re.compile(r"^%s sits out", player_re) + self.re_ShownCards = re.compile(r"^Seat (?P[0-9]+): %s \(.*\) showed \[(?P.*)\].*", player_re) def readSupportedGames(self):