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

Player regex interface updates from monkeyfutz

Browse Source
This commit is contained in:
Worros 2009-03-07 18:06:52 +09:00
parent 50a1ec1ccf
commit c505e98bcf
3 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pyfpdb/EverleafToFpdb.py
View File

@ -47,9 +47,12 @@ class Everleaf(HandHistoryConverter):
except: except:
self.ofile = os.path.join(self.hhdir, "x"+strftime("%d-%m-%y")+os.path.basename(file)) self.ofile = os.path.join(self.hhdir, "x"+strftime("%d-%m-%y")+os.path.basename(file))
def compilePlayerRegexs(self): def compilePlayerRegexs(self, players):
player_re = "(?P<PNAME>" + "|".join(map(re.escape, self.players)) + ")" if not players <= self.compiledPlayers: # x <= y means 'x is subset of y'
#print "DEBUG player_re: " + player_re # we need to recompile the player regexs.
self.compiledPlayers = players
player_re = "(?P<PNAME>" + "|".join(map(re.escape, players)) + ")"
logging.debug("player_re: "+ player_re)
self.re_PostSB = re.compile(r"^%s: posts small blind \[\$? (?P<SB>[.0-9]+)" % player_re, re.MULTILINE) self.re_PostSB = re.compile(r"^%s: posts small blind \[\$? (?P<SB>[.0-9]+)" % player_re, re.MULTILINE)
self.re_PostBB = re.compile(r"^%s: posts big blind \[\$? (?P<BB>[.0-9]+)" % player_re, re.MULTILINE) self.re_PostBB = re.compile(r"^%s: posts big blind \[\$? (?P<BB>[.0-9]+)" % player_re, re.MULTILINE)
self.re_PostBoth = re.compile(r"^%s: posts both blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE) self.re_PostBoth = re.compile(r"^%s: posts both blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)

9
pyfpdb/FulltiltToFpdb.py
View File

@ -39,9 +39,12 @@ class FullTilt(HandHistoryConverter):
self.sitename = "FullTilt" self.sitename = "FullTilt"
self.setFileType("text", "cp1252") self.setFileType("text", "cp1252")
def compilePlayerRegexs(self): def compilePlayerRegexs(self, players):
player_re = "(?P<PNAME>" + "|".join(map(re.escape, self.players)) + ")" if not players <= self.compiledPlayers: # x <= y means 'x is subset of y'
print "DEBUG player_re: " + player_re # we need to recompile the player regexs.
self.compiledPlayers = players
player_re = "(?P<PNAME>" + "|".join(map(re.escape, players)) + ")"
logging.debug("player_re: " + player_re)
self.re_PostSB = re.compile(r"^%s posts the small blind of \$?(?P<SB>[.0-9]+)" % player_re, re.MULTILINE) self.re_PostSB = re.compile(r"^%s posts the small blind of \$?(?P<SB>[.0-9]+)" % player_re, re.MULTILINE)
self.re_PostBB = re.compile(r"^%s posts (the big blind of )?\$?(?P<BB>[.0-9]+)" % player_re, re.MULTILINE) self.re_PostBB = re.compile(r"^%s posts (the big blind of )?\$?(?P<BB>[.0-9]+)" % player_re, re.MULTILINE)
self.re_Antes = re.compile(r"^%s antes \$?(?P<ANTE>[.0-9]+)" % player_re, re.MULTILINE) self.re_Antes = re.compile(r"^%s antes \$?(?P<ANTE>[.0-9]+)" % player_re, re.MULTILINE)

5
pyfpdb/HandHistoryConverter.py
View File

@ -92,6 +92,7 @@ class HandHistoryConverter:
self.ofile = os.path.join(self.hhdir, os.path.basename(file)) self.ofile = os.path.join(self.hhdir, os.path.basename(file))
self.rexx = FpdbRegex.FpdbRegex() self.rexx = FpdbRegex.FpdbRegex()
self.players = set() self.players = set()
self.compiledPlayers = set()
self.maxseats = 10 self.maxseats = 10
def __str__(self): def __str__(self):
@ -118,7 +119,7 @@ class HandHistoryConverter:
return return
self.obs = self.obs.replace('\r\n', '\n') self.obs = self.obs.replace('\r\n', '\n')
self.gametype = self.determineGameType() self.gametype = self.determineGameType(self.obs)
if self.gametype == None: if self.gametype == None:
print "Unknown game type from file, aborting on this file." print "Unknown game type from file, aborting on this file."
return return
@ -138,7 +139,7 @@ class HandHistoryConverter:
else: else:
# we need to recompile the player regexs. # we need to recompile the player regexs.
self.players = playersThisHand self.players = playersThisHand
self.compilePlayerRegexs() self.compilePlayerRegexs(playersThisHand)
self.markStreets(hand) self.markStreets(hand)
# Different calls if stud or holdem like # Different calls if stud or holdem like