diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py index 6d409bda..7a5344c2 100755 --- a/pyfpdb/EverleafToFpdb.py +++ b/pyfpdb/EverleafToFpdb.py @@ -78,7 +78,7 @@ class Everleaf(HandHistoryConverter): self.rexx.setPostBbRegex('.*\n(?P.*): posts big blind \[\$? (?P[.0-9]+)') self.rexx.setPostBothRegex('.*\n(?P.*): posts small \& big blinds \[\$? (?P[.0-9]+)') self.rexx.setHeroCardsRegex('.*\nDealt\sto\s(?P.*)\s\[ (?P.*) \]') - self.rexx.setActionStepRegex('.*\n(?P.*)(?P: bets| checks| raises| calls| folds)(\s\[\$ (?P[.\d]+) (USD|EUR)\])?') + self.rexx.setActionStepRegex('.*\n(?P[^: ]*)(?P: bets| checks| raises| calls| folds)(\s\[\$ (?P[.\d]+) (USD|EUR)\])?') self.rexx.setShowdownActionRegex('.*\n(?P.*) shows \[ (?P.*) \]') self.rexx.setCollectPotRegex('.*\n(?P.*) wins \$ (?P[.\d]+) (USD|EUR)(.*?\[ (?P.*?) \])?') #self.rexx.setCollectPotRegex('.*\n(?P.*) wins \$ (?P[.\d]+) USD(.*\[ (?P) \S\S, \S\S, \S\S, \S\S, \S\S \])?') diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index e8546237..35476bdf 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -545,11 +545,11 @@ class Pot(object): #print "returning %f to %s" % (lastbet, returnto) self.total -= lastbet self.committed[returnto] -= lastbet - - + + # Work out side pots commitsall = sorted([(v,k) for (k,v) in self.committed.items() if v >0]) - + self.pots = [] while len(commitsall) > 0: commitslive = [(v,k) for (v,k) in commitsall if k in self.contenders]