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

cleanup ParseNames fix dumb error in parsepositions cleanup

Browse Source
This commit is contained in:
eblade 2009-03-26 17:27:52 -04:00
parent cb542d9b3e
commit a210453cd2
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pyfpdb/fpdb_simple.py
View File

@ -882,14 +882,14 @@ ActionTypes = { 'calls':"call", 'brings in for':"blind", 'completes it to':"bet"
' posts a dead ' : "blind", ' posts the small blind of $':"blind", ': posts big blind ':"blind", ' posts a dead ' : "blind", ' posts the small blind of $':"blind", ': posts big blind ':"blind",
' posts the big blind of $':"blind", ': posts small & big blinds $':"blind", ' posts the big blind of $':"blind", ': posts small & big blinds $':"blind",
': posts small blind $':"blind", ': posts small blind $':"blind",
'bets' : "bet", 'raises' : "bet" ' bets' : "bet", ' raises' : "bet"
} }
def parseActionType(line): def parseActionType(line):
if (line.startswith("Uncalled bet")): if (line.startswith("Uncalled bet")):
return "unbet" return "unbet"
elif (line.endswith("folds")): elif (line.endswith(" folds")):
return "fold" return "fold"
elif (line.endswith("checks")): elif (line.endswith(" checks")):
return "check" return "check"
else: else:
for x in ActionTypes: for x in ActionTypes:
@ -1079,17 +1079,13 @@ def parseHandStartTime(topline, site):
#end def parseHandStartTime #end def parseHandStartTime
#parses the names out of the given lines and returns them as an array #parses the names out of the given lines and returns them as an array
def findName(line):
pos1 = line.find(":") + 2
pos2 = line.rfind("(") - 1
return unicode(line[pos1:pos2], "latin-1")
def parseNames(lines): def parseNames(lines):
result = [] return [findName(line) for line in lines]
for i in xrange (len(lines)):
pos1=lines[i].find(":")+2
pos2=lines[i].rfind("(")-1
tmp=lines[i][pos1:pos2]
#print "parseNames, tmp original:",tmp
tmp=unicode(tmp,"latin-1")
#print "parseNames, tmp after unicode latin-1 conversion:",tmp
result.append(tmp)
return result
#end def parseNames #end def parseNames
def parsePositions(hand, names): def parsePositions(hand, names):
@ -1158,7 +1154,7 @@ def parsePositions(hand, names):
arraypos-=1 arraypos-=1
distFromBtn+=1 distFromBtn+=1
if -1 in names: if any(p == -1 for p in positions):
print "parsePositions names:",names print "parsePositions names:",names
print "result:",positions print "result:",positions
raise FpdbError ("failed to read positions") raise FpdbError ("failed to read positions")