diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py index 6105e443..509c9f61 100755 --- a/pyfpdb/GuiBulkImport.py +++ b/pyfpdb/GuiBulkImport.py @@ -213,7 +213,7 @@ if __name__ == '__main__': parser = OptionParser() parser.add_option("-f", "--file", dest="filename", help="Input file in quiet mode", metavar="FILE") parser.add_option("-q", "--quiet", action="store_false", dest="gui", default=True, help="don't start gui") - + parser.add_option("-x", "--convert", dest="filtername", help="Conversion filter", default="passthrough") (options, sys.argv) = parser.parse_args() config = Configuration.Config() @@ -240,7 +240,7 @@ if __name__ == '__main__': importer = fpdb_import.Importer(False,settings, config) importer.setDropIndexes("auto") importer.setFailOnError(True) - importer.addImportFile(options.filename) + importer.addImportFile(options.filename, filter=options.filtername) importer.setCallHud(False) importer.runImport() importer.clearFileList() diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py index aceab383..81e8700a 100755 --- a/pyfpdb/HUD_main.py +++ b/pyfpdb/HUD_main.py @@ -123,7 +123,7 @@ class HUD_main(object): gtk.gdk.threads_enter() try: self.hud_dict[table_name].update(new_hand_id, config) - map(lambda aw: aw.update_gui(new_hand_id), self.hud_dict[table_name].aux_windows) + [aw.update_gui(new_hand_id) for aw in self.hud_dict[table_name].aux_windows] return False finally: gtk.gdk.threads_leave() @@ -174,8 +174,7 @@ class HUD_main(object): if temp_key in self.hud_dict: self.hud_dict[temp_key].stat_dict = stat_dict self.hud_dict[temp_key].cards = cards - for aw in self.hud_dict[temp_key].aux_windows: - aw.update_data(new_hand_id, self.db_connection) + [aw.update_data(new_hand_id, self.db_connection) for aw in self.hud_dict[temp_key].aux_windows] self.update_HUD(new_hand_id, temp_key, self.config) # Or create a new HUD diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 65d0e175..45068c17 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -178,7 +178,7 @@ If a player has None chips he won't be added.""" elif blindtype == 'both': # extra small blind is 'dead' self.lastBet['PREFLOP'] = Decimal(self.bb) - self.posted = self.posted + [[player,blindtype]] + self.posted = self.posted + [[player,blindtype]] #print "DEBUG: self.posted: %s" %(self.posted) @@ -328,7 +328,7 @@ Map the tuple self.gametype onto the pokerstars string describing it # currently it appears to be something like ["ring", "hold", "nl", sb, bb]: gs = {"holdem" : "Hold'em", "omahahi" : "Omaha", - "omahahilo" : "FIXME", + "omahahilo" : "Omaha Hi/Lo", "razz" : "Razz", "studhi" : "7 Card Stud", "studhilo" : "FIXME", @@ -371,11 +371,11 @@ Map the tuple self.gametype onto the pokerstars string describing it print >>fh, _("%s: completes to $%s%s" %(act[0], act[2], ' and is all-in' if act[3] else '')) elif act[1] == 'posts': if(act[2] == "small blind"): - print >>fh, _("%s: posts small blind $%s" %(act[0], act[3])) + print >>fh, _("%s: posts small blind $%s%s" %(act[0], act[3], ' and is all-in' if act[4] else '')) elif(act[2] == "big blind"): - print >>fh, _("%s: posts big blind $%s" %(act[0], act[3])) + print >>fh, _("%s: posts big blind $%s%s" %(act[0], act[3], ' and is all-in' if act[4] else '')) elif(act[2] == "both"): - print >>fh, _("%s: posts small & big blinds $%s" %(act[0], act[3])) + print >>fh, _("%s: posts small & big blinds $%s%s" %(act[0], act[3], ' and is all-in' if act[4] else '')) elif act[1] == 'bringin': print >>fh, _("%s: brings in for $%s%s" %(act[0], act[2], ' and is all-in' if act[3] else '')) elif act[1] == 'discards': @@ -458,7 +458,7 @@ Card ranks will be uppercased def writeHand(self, fh=sys.__stdout__): # PokerStars format. - print >>fh, _("%s Game #%s: %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, time.strftime('%Y/%m/%d - %H:%M:%S (ET)', self.starttime))) + print >>fh, _("%s Game #%s: %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, time.strftime('%Y/%m/%d - %H:%M:%S ET', self.starttime))) print >>fh, _("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos)) players_who_act_preflop = set(([x[0] for x in self.actions['PREFLOP']]+[x[0] for x in self.actions['BLINDSANTES']])) @@ -501,10 +501,19 @@ Card ranks will be uppercased #Some sites don't have a showdown section so we have to figure out if there should be one # The logic for a showdown is: at the end of river action there are at least two players in the hand # we probably don't need a showdown section in pseudo stars format for our filtering purposes - if 'SHOWDOWN' in self.actions: + if self.shown: print >>fh, _("*** SHOW DOWN ***") - #TODO: Complete SHOWDOWN - + for name in self.shown: + # TODO: legacy importer can't handle only one holecard here, make sure there are 2 for holdem, 4 for omaha + # TOOD: If HoldHand subclass supports more than omahahi, omahahilo, holdem, add them here + numOfHoleCardsNeeded = None + if self.gametype['category'] in ('omahahi','omahahilo'): + numOfHoleCardsNeeded = 4 + elif self.gametype['category'] in ('holdem'): + numOfHoleCardsNeeded = 2 + if len(self.holecards[name]['PREFLOP']) == numOfHoleCardsNeeded: + print >>fh, _("%s shows [%s] (a hand...)" % (name, " ".join(self.holecards[name]['PREFLOP']))) + # Current PS format has the lines: # Uncalled bet ($111.25) returned to s0rrow # s0rrow collected $5.15 from side pot @@ -652,14 +661,14 @@ Card ranks will be uppercased def writeHand(self, fh=sys.__stdout__): # PokerStars format. - print >>fh, _("%s Game #%s: %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, time.strftime('%Y/%m/%d - %H:%M:%S (ET)', self.starttime))) + print >>fh, _("%s Game #%s: %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, time.strftime('%Y/%m/%d %H:%M:%S ET', self.starttime))) print >>fh, _("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos)) players_who_act_ondeal = set(([x[0] for x in self.actions['DEAL']]+[x[0] for x in self.actions['BLINDSANTES']])) for player in [x for x in self.players if x[1] in players_who_act_ondeal]: #Only print stacks of players who do something on deal - print >>fh, _("Seat %s: %s ($%s)" %(player[0], player[1], player[2])) + print >>fh, _("Seat %s: %s ($%s in chips) " %(player[0], player[1], player[2])) if 'BLINDSANTES' in self.actions: for act in self.actions['BLINDSANTES']: diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index 23688700..98a96638 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -204,12 +204,17 @@ Tail the in_path file and yield handTexts separated by re_SplitHands""" def processHand(self, handText): gametype = self.determineGameType(handText) logging.debug("gametype %s" % gametype) - - # See if gametype is supported. - type = gametype['type'] - base = gametype['base'] - limit = gametype['limitType'] - l = [type] + [base] + [limit] + if gametype is None: + l = None + gametype = "unmatched" + # TODO: not ideal, just trying to not error. + # TODO: Need to count failed hands. + else: + # See if gametype is supported. + type = gametype['type'] + base = gametype['base'] + limit = gametype['limitType'] + l = [type] + [base] + [limit] hand = None if l in self.readSupportedGames(): hand = None diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index 6d594b5b..20750b96 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -196,7 +196,7 @@ class Hud: s.window.destroy() self.stat_windows = {} # also kill any aux windows - map(lambda m: m.destroy(), self.aux_windows) + [aux.destroy() for aux in self.aux_windows] self.aux_windows = [] def reposition_windows(self, *args): @@ -217,8 +217,7 @@ class Hud: new_layout[self.stat_windows[sw].adj - 1] = new_loc self.config.edit_layout(self.table.site, self.max, locations = new_layout) # ask each aux to save its layout back to the config object - for aux in self.aux_windows: - aux.save_layout() + [aux.save_layout() for aux in self.aux_windows] # save the config object back to the file print "saving new xml file" self.config.save() @@ -351,6 +350,8 @@ class Hud: style = win32gui.GetWindowLong(self.table.number, win32con.GWL_EXSTYLE) style |= win32con.WS_CLIPCHILDREN win32gui.SetWindowLong(self.table.number, win32con.GWL_EXSTYLE, style) + break + window.set_title(real_name) class Stat_Window: @@ -575,6 +576,7 @@ class Popup_window: style = win32gui.GetWindowLong(self.table.number, win32con.GWL_EXSTYLE) style |= win32con.WS_CLIPCHILDREN win32gui.SetWindowLong(self.table.number, win32con.GWL_EXSTYLE, style) + break window.set_title(real_name) diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py index f1ff7e1a..5cdd3d3b 100755 --- a/pyfpdb/fpdb.py +++ b/pyfpdb/fpdb.py @@ -81,23 +81,13 @@ class fpdb: def display_tab(self, new_tab_name): """displays the indicated tab""" #print "start of display_tab, len(self.tab_names):",len(self.tab_names) - tab_no=-1 - #if len(self.tab_names)>1: - for i in range(len(self.tab_names)): - #print "display_tab, new_tab_name:",new_tab_name," self.tab_names[i]:", self.tab_names[i] - if (new_tab_name==self.tab_names[i]): - tab_no=i - #self.tab_buttons[i].set_active(False) - #else: - # tab_no=0 + tab_no = -1 + for i, name in enumerate(self.tab_names): + if name == new_tab_name: + tab_no = i + break - #current_tab_no=-1 - for i in range(len(self.tab_names)): - if self.current_tab==self.tabs[i]: - #self.tab_buttons[i].set_active(False) - pass - - if tab_no==-1: + if tab_no == -1: raise fpdb_simple.FpdbError("invalid tab_no") else: self.main_vbox.remove(self.current_tab) @@ -199,12 +189,13 @@ class fpdb: def dia_recreate_tables(self, widget, data): """Dialogue that asks user to confirm that he wants to delete and recreate the tables""" self.obtain_global_lock() - dia_confirm=gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, + + dia_confirm = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=(gtk.BUTTONS_YES_NO), message_format="Confirm deleting and recreating tables") - diastring=("Please confirm that you want to (re-)create the tables. If there already are tables in the database "+self.db.database+" on "+self.db.host+" they will be deleted.") + diastring = "Please confirm that you want to (re-)create the tables. If there already are tables in the database "+self.db.database+" on "+self.db.host+" they will be deleted." dia_confirm.format_secondary_text(diastring)#todo: make above string with bold for db, host and deleted - response=dia_confirm.run() + response = dia_confirm.run() dia_confirm.destroy() if response == gtk.RESPONSE_YES: self.db.recreate_tables() diff --git a/pyfpdb/fpdb_db.py b/pyfpdb/fpdb_db.py index 6f934819..771b79fa 100644 --- a/pyfpdb/fpdb_db.py +++ b/pyfpdb/fpdb_db.py @@ -23,12 +23,12 @@ import FpdbSQLQueries class fpdb_db: def __init__(self): """Simple constructor, doesnt really do anything""" - self.db=None - self.cursor=None - self.sql = {} - self.MYSQL_INNODB=2 - self.PGSQL=3 - self.SQLITE=4 + self.db = None + self.cursor = None + self.sql = {} + self.MYSQL_INNODB = 2 + self.PGSQL = 3 + self.SQLITE = 4 #end def __init__ def do_connect(self, config=None): @@ -37,10 +37,7 @@ class fpdb_db: raise FpdbError('Configuration not defined') self.settings = {} - if (os.sep=="/"): - self.settings['os']="linuxmac" - else: - self.settings['os']="windows" + self.settings['os'] = "linuxmac" if os.name != "nt" else "windows" self.settings.update(config.get_db_parameters()) self.connect(self.settings['db-backend'], diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py index 12575b4f..9eaa1fcd 100644 --- a/pyfpdb/fpdb_import.py +++ b/pyfpdb/fpdb_import.py @@ -51,22 +51,22 @@ class Importer: def __init__(self, caller, settings, config): """Constructor""" - self.settings=settings - self.caller=caller - self.config = config - self.fdb = None - self.cursor = None - self.filelist = {} - self.dirlist = {} + self.settings = settings + self.caller = caller + self.config = config + self.fdb = None + self.cursor = None + self.filelist = {} + self.dirlist = {} self.addToDirList = {} self.removeFromFileList = {} # to remove deleted files - self.monitor = False - self.updated = {} #Time last import was run {file:mtime} - self.lines = None - self.faobs = None #File as one big string + self.monitor = False + self.updated = {} #Time last import was run {file:mtime} + self.lines = None + self.faobs = None #File as one big string self.pos_in_file = {} # dict to remember how far we have read in the file #Set defaults - self.callHud = self.config.get_import_parameters().get("callFpdbHud") + self.callHud = self.config.get_import_parameters().get("callFpdbHud") if 'minPrint' not in self.settings: #TODO: Is this value in the xml file? self.settings['minPrint'] = 30 @@ -188,24 +188,26 @@ class Importer: self.addImportDirectory(self.dirlist[site][0], False, site, self.dirlist[site][1]) for file in self.filelist: - stat_info = os.stat(file) - try: - lastupdate = self.updated[file] - if stat_info.st_mtime > lastupdate: - self.import_file_dict(file, self.filelist[file][0], self.filelist[file][1]) + if os.path.exists(file): + stat_info = os.stat(file) + try: + lastupdate = self.updated[file] + if stat_info.st_mtime > lastupdate: + self.import_file_dict(file, self.filelist[file][0], self.filelist[file][1]) + self.updated[file] = time() + except: self.updated[file] = time() - except: - self.updated[file] = time() - # If modified in the last minute run an immediate import. - # This codepath only runs first time the file is found. - if os.path.isdir(file) or (time() - stat_info.st_mtime) < 60: - # TODO attach a HHC thread to the file - # TODO import the output of the HHC thread -- this needs to wait for the HHC to block? - self.import_file_dict(file, self.filelist[file][0], self.filelist[file][1]) + # If modified in the last minute run an immediate import. + # This codepath only runs first time the file is found. + if os.path.isdir(file) or (time() - stat_info.st_mtime) < 60: + # TODO attach a HHC thread to the file + # TODO import the output of the HHC thread -- this needs to wait for the HHC to block? + self.import_file_dict(file, self.filelist[file][0], self.filelist[file][1]) # TODO we also test if directory, why? #if os.path.isdir(file): #self.import_file_dict(file, self.filelist[file][0], self.filelist[file][1]) - + else: + removeFromFileList[file] = True self.addToDirList = filter(lambda x: self.addImportDirectory(x, True, self.addToDirList[x][0], self.addToDirList[x][1]), self.addToDirList) for file in self.removeFromFileList: @@ -251,7 +253,6 @@ class Importer: print "Unknown filter filter_name:'%s' in filter:'%s'" %(filter_name, filter) return - #This will barf if conv.getStatus != True return (stored, duplicates, partial, errors, ttime) diff --git a/pyfpdb/fpdb_parse_logic.py b/pyfpdb/fpdb_parse_logic.py index 9dd54f83..7d518e94 100644 --- a/pyfpdb/fpdb_parse_logic.py +++ b/pyfpdb/fpdb_parse_logic.py @@ -22,47 +22,46 @@ import fpdb_save_to_db #parses a holdem hand def mainParser(backend, db, cursor, site, category, hand, config): - category=fpdb_simple.recogniseCategory(hand[0]) - if (category=="holdem" or category=="omahahi" or category=="omahahilo"): - base="hold" - else: - base="stud" + category = fpdb_simple.recogniseCategory(hand[0]) + + base = "hold" if category == "holdem" or category == "omahahi" or category == "omahahilo" else "stud" + #part 0: create the empty arrays - lineTypes=[] #char, valid values: header, name, cards, action, win, rake, ignore - lineStreets=[] #char, valid values: (predeal, preflop, flop, turn, river) + lineTypes = [] #char, valid values: header, name, cards, action, win, rake, ignore + lineStreets = [] #char, valid values: (predeal, preflop, flop, turn, river) cardValues, cardSuits, boardValues, boardSuits, antes, actionTypes, allIns, actionAmounts, actionNos, actionTypeByNo, seatLines, winnings, rakes=[],[],[],[],[],[],[],[],[],[],[],[],[] #part 1: read hand no and check for duplicate - siteHandNo=fpdb_simple.parseSiteHandNo(hand[0]) - handStartTime=fpdb_simple.parseHandStartTime(hand[0], site) - siteID=fpdb_simple.recogniseSiteID(cursor, site) + siteHandNo = fpdb_simple.parseSiteHandNo(hand[0]) + handStartTime = fpdb_simple.parseHandStartTime(hand[0], site) + siteID = fpdb_simple.recogniseSiteID(cursor, site) #print "parse logic, siteID:",siteID,"site:",site - isTourney=fpdb_simple.isTourney(hand[0]) - smallBlindLine=0 - for i in range(len(hand)): - if 'posts small blind' in hand[i] or 'posts the small blind' in hand[i]: - if hand[i][-2:] == "$0": - continue - smallBlindLine=i - #print "found small blind line:",smallBlindLine + isTourney = fpdb_simple.isTourney(hand[0]) + smallBlindLine = 0 + for i, line in enumerate(hand): + if 'posts small blind' in line or 'posts the small blind' in line: + if line[-2:] == "$0": continue + smallBlindLine = i break #print "small blind line:",smallBlindLine - gametypeID=fpdb_simple.recogniseGametypeID(backend, db, cursor, hand[0], hand[smallBlindLine], siteID, category, isTourney) + + gametypeID = fpdb_simple.recogniseGametypeID(backend, db, cursor, hand[0], hand[smallBlindLine], siteID, category, isTourney) if isTourney: - if site!="ps": + if site != "ps": raise fpdb_simple.FpdbError("tourneys are only supported on PS right now") - siteTourneyNo=fpdb_simple.parseTourneyNo(hand[0]) - buyin=fpdb_simple.parseBuyin(hand[0]) - fee=fpdb_simple.parseFee(hand[0]) - entries=-1 #todo: parse this - prizepool=-1 #todo: parse this - knockout=0 - tourneyStartTime=handStartTime #todo: read tourney start time - rebuyOrAddon=fpdb_simple.isRebuyOrAddon(hand[0]) + siteTourneyNo = fpdb_simple.parseTourneyNo(hand[0]) + buyin = fpdb_simple.parseBuyin(hand[0]) + fee = fpdb_simple.parseFee(hand[0]) + entries = -1 #todo: parse this + prizepool = -1 #todo: parse this + knockout = 0 + tourneyStartTime= handStartTime #todo: read tourney start time + rebuyOrAddon = fpdb_simple.isRebuyOrAddon(hand[0]) - tourneyTypeId=fpdb_simple.recogniseTourneyTypeId(cursor, siteID, buyin, fee, knockout, rebuyOrAddon) + tourneyTypeId = fpdb_simple.recogniseTourneyTypeId(cursor, siteID, buyin, fee, knockout, rebuyOrAddon) + fpdb_simple.isAlreadyInDB(cursor, gametypeID, siteHandNo) #part 2: classify lines by type (e.g. cards, action, win, sectionchange) and street @@ -70,85 +69,82 @@ def mainParser(backend, db, cursor, site, category, hand, config): #part 3: read basic player info #3a read player names, startcashes - for i in range (len(hand)): #todo: use maxseats+1 here. - if (lineTypes[i]=="name"): - seatLines.append(hand[i]) - names=fpdb_simple.parseNames(seatLines) - playerIDs = fpdb_simple.recognisePlayerIDs(cursor, names, siteID) - tmp=fpdb_simple.parseCashesAndSeatNos(seatLines, site) - startCashes=tmp['startCashes'] - seatNos=tmp['seatNos'] + for i, line in enumerate(hand): + if lineTypes[i] == "name": + seatLines.append(line) + + names = fpdb_simple.parseNames(seatLines) + playerIDs = fpdb_simple.recognisePlayerIDs(cursor, names, siteID) + tmp = fpdb_simple.parseCashesAndSeatNos(seatLines, site) + startCashes = tmp['startCashes'] + seatNos = tmp['seatNos'] fpdb_simple.createArrays(category, len(names), cardValues, cardSuits, antes, winnings, rakes, actionTypes, allIns, actionAmounts, actionNos, actionTypeByNo) #3b read positions - if base=="hold": - positions = fpdb_simple.parsePositions (hand, names) + if base == "hold": + positions = fpdb_simple.parsePositions(hand, names) #part 4: take appropriate action for each line based on linetype - for i in range(len(hand)): - if (lineTypes[i]=="cards"): - fpdb_simple.parseCardLine (site, category, lineStreets[i], hand[i], names, cardValues, cardSuits, boardValues, boardSuits) + for i, line in enumerate(hand): + if lineTypes[i] == "cards": + fpdb_simple.parseCardLine(site, category, lineStreets[i], line, names, cardValues, cardSuits, boardValues, boardSuits) #if category=="studhilo": # print "hand[i]:", hand[i] # print "cardValues:", cardValues # print "cardSuits:", cardSuits - elif (lineTypes[i]=="action"): - fpdb_simple.parseActionLine (site, base, isTourney, hand[i], lineStreets[i], playerIDs, names, actionTypes, allIns, actionAmounts, actionNos, actionTypeByNo) - elif (lineTypes[i]=="win"): - fpdb_simple.parseWinLine (hand[i], site, names, winnings, isTourney) - elif (lineTypes[i]=="rake"): - if isTourney: - totalRake=0 - else: - totalRake=fpdb_simple.parseRake(hand[i]) + elif lineTypes[i] == "action": + fpdb_simple.parseActionLine(site, base, isTourney, line, lineStreets[i], playerIDs, names, actionTypes, allIns, actionAmounts, actionNos, actionTypeByNo) + elif lineTypes[i] == "win": + fpdb_simple.parseWinLine(line, site, names, winnings, isTourney) + elif lineTypes[i] == "rake": + totalRake = 0 if isTourney else fpdb_simple.parseRake(line) fpdb_simple.splitRake(winnings, rakes, totalRake) - elif (lineTypes[i]=="header" or lineTypes[i]=="rake" or lineTypes[i]=="name" or lineTypes[i]=="ignore"): + elif lineTypes[i]=="header" or lineTypes[i]=="rake" or lineTypes[i]=="name" or lineTypes[i]=="ignore": pass - elif (lineTypes[i]=="ante"): - fpdb_simple.parseAnteLine(hand[i], site, isTourney, names, antes) - elif (lineTypes[i]=="table"): - tableResult=fpdb_simple.parseTableLine(site, base, hand[i]) + elif lineTypes[i]=="ante": + fpdb_simple.parseAnteLine(line, site, isTourney, names, antes) + elif lineTypes[i]=="table": + tableResult=fpdb_simple.parseTableLine(site, base, line) else: raise fpdb_simple.FpdbError("unrecognised lineType:"+lineTypes[i]) - if site=="ftp": - tableResult=fpdb_simple.parseTableLine(site, base, hand[0]) - maxSeats=tableResult['maxSeats'] - tableName=tableResult['tableName'] + + if site == "ftp": + tableResult = fpdb_simple.parseTableLine(site, base, hand[0]) + + maxSeats = tableResult['maxSeats'] + tableName = tableResult['tableName'] #print "before part5, antes:", antes #part 5: final preparations, then call fpdb_save_to_db.* with # the arrays as they are - that file will fill them. fpdb_simple.convertCardValues(cardValues) - if base=="hold": + if base == "hold": fpdb_simple.convertCardValuesBoard(boardValues) fpdb_simple.convertBlindBet(actionTypes, actionAmounts) fpdb_simple.checkPositions(positions) cursor.execute("SELECT limitType FROM Gametypes WHERE id=%s",(gametypeID, )) - limit_type=cursor.fetchone()[0] + limit_type = cursor.fetchone()[0] fpdb_simple.convert3B4B(site, category, limit_type, actionTypes, actionAmounts) - totalWinnings=0 - for i in range(len(winnings)): - totalWinnings+=winnings[i] + totalWinnings = sum(winnings) - if base=="hold": - hudImportData=fpdb_simple.generateHudCacheData(playerIDs, base, category, actionTypes + # if hold'em, use positions and not antes, if stud do not use positions, use antes + if base == "hold": + hudImportData = fpdb_simple.generateHudCacheData(playerIDs, base, category, actionTypes , allIns, actionTypeByNo, winnings, totalWinnings, positions , actionTypes, actionAmounts, None) else: - hudImportData=fpdb_simple.generateHudCacheData(playerIDs, base, category, actionTypes + hudImportData = fpdb_simple.generateHudCacheData(playerIDs, base, category, actionTypes , allIns, actionTypeByNo, winnings, totalWinnings, None , actionTypes, actionAmounts, antes) if isTourney: - ranks=[] - for i in range (len(names)): - ranks.append(0) - payin_amounts=fpdb_simple.calcPayin(len(names), buyin, fee) + ranks = map(lambda x: 0, names) # create an array of 0's equal to the length of names + payin_amounts = fpdb_simple.calcPayin(len(names), buyin, fee) - if base=="hold": + if base == "hold": result = fpdb_save_to_db.tourney_holdem_omaha( config, backend, db, cursor, base, category, siteTourneyNo, buyin , fee, knockout, entries, prizepool, tourneyStartTime @@ -157,7 +153,7 @@ def mainParser(backend, db, cursor, site, category, hand, config): , positions, cardValues, cardSuits, boardValues, boardSuits , winnings, rakes, actionTypes, allIns, actionAmounts , actionNos, hudImportData, maxSeats, tableName, seatNos) - elif base=="stud": + elif base == "stud": result = fpdb_save_to_db.tourney_stud( config, backend, db, cursor, base, category, siteTourneyNo , buyin, fee, knockout, entries, prizepool, tourneyStartTime @@ -167,9 +163,9 @@ def mainParser(backend, db, cursor, site, category, hand, config): , allIns, actionAmounts, actionNos, hudImportData, maxSeats , tableName, seatNos) else: - raise fpdb_simple.FpdbError ("unrecognised category") + raise fpdb_simple.FpdbError("unrecognised category") # it's impossible to get here, but w/e else: - if base=="hold": + if base == "hold": result = fpdb_save_to_db.ring_holdem_omaha( config, backend, db, cursor, base, category, siteHandNo , gametypeID, handStartTime, names, playerIDs @@ -177,7 +173,7 @@ def mainParser(backend, db, cursor, site, category, hand, config): , boardValues, boardSuits, winnings, rakes , actionTypes, allIns, actionAmounts, actionNos , hudImportData, maxSeats, tableName, seatNos) - elif base=="stud": + elif base == "stud": result = fpdb_save_to_db.ring_stud( config, backend, db, cursor, base, category, siteHandNo, gametypeID , handStartTime, names, playerIDs, startCashes, antes @@ -185,7 +181,7 @@ def mainParser(backend, db, cursor, site, category, hand, config): , actionAmounts, actionNos, hudImportData, maxSeats, tableName , seatNos) else: - raise fpdb_simple.FpdbError ("unrecognised category") + raise fpdb_simple.FpdbError ("unrecognised category") # also impossible to get here db.commit() return result #end def mainParser diff --git a/pyfpdb/fpdb_save_to_db.py b/pyfpdb/fpdb_save_to_db.py index 68c11833..f13c8032 100644 --- a/pyfpdb/fpdb_save_to_db.py +++ b/pyfpdb/fpdb_save_to_db.py @@ -22,13 +22,13 @@ from time import time import fpdb_simple -MYSQL_INNODB=2 -PGSQL=3 -SQLITE=4 +MYSQL_INNODB = 2 +PGSQL = 3 +SQLITE = 4 -fastStoreHudCache=True # set this to True to test the new storeHudCache routine +fastStoreHudCache = True # set this to True to test the new storeHudCache routine -saveActions=False # set this to False to avoid storing action data +saveActions = False # set this to False to avoid storing action data # Pros: speeds up imports # Cons: no action data is saved, so you need to keep the hand histories # variance not available on stats page @@ -40,16 +40,17 @@ def ring_stud(config, backend, db, cursor, base, category, site_hand_no, gametyp ,seatNos): import_options = config.get_import_parameters() - saveActions = import_options['saveActions'] - fastStoreHudCache = import_options['fastStoreHudCache'] + + saveActions = True if import_options['saveActions'] == 'True' else False + fastStoreHudCache = True if import_options['fastStoreHudCache'] == 'True' else False fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits) - hands_id=fpdb_simple.storeHands(backend, db, cursor, site_hand_no, gametype_id + hands_id = fpdb_simple.storeHands(backend, db, cursor, site_hand_no, gametype_id ,hand_start_time, names, tableName, maxSeats) #print "before calling store_hands_players_stud, antes:", antes - hands_players_ids=fpdb_simple.store_hands_players_stud(backend, db, cursor, hands_id, player_ids + hands_players_ids = fpdb_simple.store_hands_players_stud(backend, db, cursor, hands_id, player_ids ,start_cashes, antes, card_values ,card_suits, winnings, rakes, seatNos) @@ -68,8 +69,8 @@ def ring_holdem_omaha(config, backend, db, cursor, base, category, site_hand_no, """stores a holdem/omaha hand into the database""" import_options = config.get_import_parameters() - saveActions = import_options['saveActions'] - fastStoreHudCache = import_options['fastStoreHudCache'] + saveActions = True if import_options['saveActions'] == 'True' else False + fastStoreHudCache = True if import_options['fastStoreHudCache'] == 'True' else False t0 = time() fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits) @@ -77,10 +78,10 @@ def ring_holdem_omaha(config, backend, db, cursor, base, category, site_hand_no, fpdb_simple.fill_board_cards(board_values, board_suits) t2 = time() - hands_id=fpdb_simple.storeHands(backend, db, cursor, site_hand_no, gametype_id + hands_id = fpdb_simple.storeHands(backend, db, cursor, site_hand_no, gametype_id ,hand_start_time, names, tableName, maxSeats) t3 = time() - hands_players_ids=fpdb_simple.store_hands_players_holdem_omaha( + hands_players_ids = fpdb_simple.store_hands_players_holdem_omaha( backend, db, cursor, category, hands_id, player_ids, start_cashes , positions, card_values, card_suits, winnings, rakes, seatNos) t4 = time() @@ -109,19 +110,19 @@ def tourney_holdem_omaha(config, backend, db, cursor, base, category, siteTourne """stores a tourney holdem/omaha hand into the database""" import_options = config.get_import_parameters() - saveActions = import_options['saveActions'] - fastStoreHudCache = import_options['fastStoreHudCache'] + saveActions = True if import_options['saveActions'] == 'True' else False + fastStoreHudCache = True if import_options['fastStoreHudCache'] == 'True' else False fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits) fpdb_simple.fill_board_cards(board_values, board_suits) - tourney_id=fpdb_simple.store_tourneys(cursor, tourneyTypeId, siteTourneyNo, entries, prizepool, tourney_start) - tourneys_players_ids=fpdb_simple.store_tourneys_players(cursor, tourney_id, player_ids, payin_amounts, ranks, winnings) + tourney_id = fpdb_simple.store_tourneys(cursor, tourneyTypeId, siteTourneyNo, entries, prizepool, tourney_start) + tourneys_players_ids = fpdb_simple.store_tourneys_players(cursor, tourney_id, player_ids, payin_amounts, ranks, winnings) - hands_id=fpdb_simple.storeHands(backend, db, cursor, site_hand_no, gametype_id + hands_id = fpdb_simple.storeHands(backend, db, cursor, site_hand_no, gametype_id ,hand_start_time, names, tableName, maxSeats) - hands_players_ids=fpdb_simple.store_hands_players_holdem_omaha_tourney( + hands_players_ids = fpdb_simple.store_hands_players_holdem_omaha_tourney( backend, db, cursor, category, hands_id, player_ids, start_cashes, positions , card_values, card_suits, winnings, rakes, seatNos, tourneys_players_ids) @@ -146,18 +147,18 @@ def tourney_stud(config, backend, db, cursor, base, category, siteTourneyNo, buy #stores a tourney stud/razz hand into the database import_options = config.get_import_parameters() - saveActions = import_options['saveActions'] - fastStoreHudCache = import_options['fastStoreHudCache'] + saveActions = True if import_options['saveActions'] == 'True' else False + fastStoreHudCache = True if import_options['fastStoreHudCache'] == 'True' else False fpdb_simple.fillCardArrays(len(names), base, category, cardValues, cardSuits) - tourney_id=fpdb_simple.store_tourneys(cursor, tourneyTypeId, siteTourneyNo, entries, prizepool, tourneyStartTime) + tourney_id = fpdb_simple.store_tourneys(cursor, tourneyTypeId, siteTourneyNo, entries, prizepool, tourneyStartTime) - tourneys_players_ids=fpdb_simple.store_tourneys_players(cursor, tourney_id, playerIds, payin_amounts, ranks, winnings) + tourneys_players_ids = fpdb_simple.store_tourneys_players(cursor, tourney_id, playerIds, payin_amounts, ranks, winnings) - hands_id=fpdb_simple.storeHands(backend, db, cursor, siteHandNo, gametypeId, handStartTime, names, tableName, maxSeats) + hands_id = fpdb_simple.storeHands(backend, db, cursor, siteHandNo, gametypeId, handStartTime, names, tableName, maxSeats) - hands_players_ids=fpdb_simple.store_hands_players_stud_tourney(backend, db, cursor, hands_id + hands_players_ids = fpdb_simple.store_hands_players_stud_tourney(backend, db, cursor, hands_id , playerIds, startCashes, antes, cardValues, cardSuits , winnings, rakes, seatNos, tourneys_players_ids) diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py index 2677d11b..fc6c13b2 100644 --- a/pyfpdb/fpdb_simple.py +++ b/pyfpdb/fpdb_simple.py @@ -18,14 +18,17 @@ #This file contains simple functions for fpdb import datetime +import time import re -PS=1 -FTP=2 +PS = 1 +FTP = 2 + +# TODO: these constants are also used in fpdb_save_to_db and others, is there a way to do like C #define, and #include ? +MYSQL_INNODB = 2 +PGSQL = 3 +SQLITE = 4 -MYSQL_INNODB=2 -PGSQL=3 -SQLITE=4 # Data Structures for index and foreign key creation # drop_code is an int with possible values: 0 - don't drop for bulk import # 1 - drop during bulk import @@ -384,27 +387,20 @@ def calcPayin(count, buyin, fee): result.append (buyin+fee) return result #end def calcPayin - + def checkPositions(positions): - """verifies that these positions are valid""" - for i in xrange(len(positions)): - pos=positions[i] - try:#todo: use type recognition instead of error - if (len(pos)!=1): - raise FpdbError("invalid position found in checkPositions. i: "+str(i)+" position: "+pos) #dont need to str() here - except TypeError:#->not string->is int->fine - pass - - ### RHH modified to allow for "position 9" here (pos==9 is when you're a dead hand before the BB - ### eric - position 8 could be valid - if only one blind is posted, but there's still 10 people, ie a sitout is present, and the small is dead... - if not (pos == "B" or pos == "S" or (pos >= 0 and pos <= 9)): - raise FpdbError("invalid position found in checkPositions. i: "+str(i)+" position: "+str(pos)) -#end def fpdb_simple.checkPositions + """ verify positions are valid """ + for p in positions: + if not (p == "B" or p == "S" or (p >= 0 and p <= 9)): + raise FpdbError("invalid position '" + p + "' found in checkPositions") + + ### RHH modified to allow for "position 9" here (pos==9 is when you're a dead hand before the BB + ### eric - position 8 could be valid - if only one blind is posted, but there's still 10 people, ie a sitout is present, and the small is dead... #classifies each line for further processing in later code. Manipulates the passed arrays. def classifyLines(hand, category, lineTypes, lineStreets): - currentStreet="predeal" - done=False #set this to true once we reach the last relevant line (the summary, except rake, is all repeats) + currentStreet = "predeal" + done = False #set this to true once we reach the last relevant line (the summary, except rake, is all repeats) for i, line in enumerate(hand): if done: if "[" not in line or "mucked [" not in line: @@ -415,20 +411,14 @@ def classifyLines(hand, category, lineTypes, lineStreets): lineTypes.append("cards") elif i == 0: lineTypes.append("header") + elif line.startswith("Table '"): + lineTypes.append("table") elif line.startswith("Seat ") and ( ("in chips" in line) or "($" in line): lineTypes.append("name") elif isActionLine(line): lineTypes.append("action") if " posts " in line or " posts the " in line: currentStreet="preflop" - elif isWinLine(line): - lineTypes.append("win") - elif line.startswith("Total pot ") and "Rake" in line: - lineTypes.append("rake") - done=True - elif "*** SHOW DOWN ***" in line or "*** SUMMARY ***" in line: - lineTypes.append("ignore") - #print "in classifyLine, showdown or summary" elif " antes " in line or " posts the ante " in line: lineTypes.append("ante") elif line.startswith("*** FLOP *** ["): @@ -454,11 +444,17 @@ def classifyLines(hand, category, lineTypes, lineStreets): currentStreet=3 elif line.startswith("*** 7") or line == "*** RIVER ***": lineTypes.append("ignore") - currentStreet=4 + currentStreet=4 + elif isWinLine(line): + lineTypes.append("win") + elif line.startswith("Total pot ") and "Rake" in line: + lineTypes.append("rake") + done=True + elif "*** SHOW DOWN ***" in line or "*** SUMMARY ***" in line: + lineTypes.append("ignore") + #print "in classifyLine, showdown or summary" elif " shows [" in line: lineTypes.append("cards") - elif line.startswith("Table '"): - lineTypes.append("table") else: raise FpdbError("unrecognised linetype in:"+hand[i]) lineStreets.append(currentStreet) @@ -515,69 +511,46 @@ def convertBlindBet(actionTypes, actionAmounts): def convertCardValues(arr): map(convertCardValuesBoard, arr) #end def convertCardValues + +card_map = { "2": 2, "3" : 3, "4" : 4, "5" : 5, "6" : 6, "7" : 7, "8" : 8, "9" : 9, "T" : 10, "J" : 11, "Q" : 12, "K" : 13, "A" : 14} #converts the strings in the given array to ints (changes the passed array, no returning). see table design for conversion details def convertCardValuesBoard(arr): for i in xrange(len(arr)): - if (arr[i]=="A"): - arr[i]=14 - elif (arr[i]=="K"): - arr[i]=13 - elif (arr[i]=="Q"): - arr[i]=12 - elif (arr[i]=="J"): - arr[i]=11 - elif (arr[i]=="T"): - arr[i]=10 - else: - arr[i]=int(arr[i]) + arr[i] = card_map[arr[i]] #end def convertCardValuesBoard #this creates the 2D/3D arrays. manipulates the passed arrays instead of returning. def createArrays(category, seats, card_values, card_suits, antes, winnings, rakes, action_types, allIns, action_amounts, actionNos, actionTypeByNo): for i in xrange(seats):#create second dimension arrays - tmp=[] - card_values.append(tmp) - tmp=[] - card_suits.append(tmp) + card_values.append( [] ) + card_suits.append( [] ) antes.append(0) winnings.append(0) rakes.append(0) - if (category=="holdem" or category=="omahahi" or category=="omahahilo"): - streetCount=4 - else: - streetCount=5 + streetCount = 4 if category == "holdem" or category == "omahahi" or category == "omahahilo" else 5 for i in xrange(streetCount): #build the first dimension array, for streets - tmp=[] - action_types.append(tmp) - tmp=[] - allIns.append(tmp) - tmp=[] - action_amounts.append(tmp) - tmp=[] - actionNos.append(tmp) - tmp=[] - actionTypeByNo.append(tmp) + action_types.append([]) + allIns.append([]) + action_amounts.append([]) + actionNos.append([]) + actionTypeByNo.append([]) for j in xrange (seats): #second dimension arrays: players - tmp=[] - action_types[i].append(tmp) - tmp=[] - allIns[i].append(tmp) - tmp=[] - action_amounts[i].append(tmp) - tmp=[] - actionNos[i].append(tmp) - if (category=="holdem" or category=="omahahi" or category=="omahahilo"): - pass - elif (category=="razz" or category=="studhi" or category=="studhilo"):#need to fill card arrays. + action_types[i].append([]) + allIns[i].append([]) + action_amounts[i].append([]) + actionNos[i].append([]) +# if (category=="holdem" or category=="omahahi" or category=="omahahilo"): +# pass + if category=="razz" or category=="studhi" or category=="studhilo":#need to fill card arrays. for i in xrange(seats): - for j in xrange (7): + for j in xrange(7): card_values[i].append(0) card_suits[i].append("x") - else: - raise FpdbError("invalid category") +# else: +# raise FpdbError("invalid category") #end def createArrays def fill_board_cards(board_values, board_suits): @@ -590,16 +563,16 @@ def fill_board_cards(board_values, board_suits): def fillCardArrays(player_count, base, category, card_values, card_suits): """fills up the two card arrays""" if (category=="holdem"): - cardCount=2 + cardCount = 2 elif (category=="omahahi" or category=="omahahilo"): - cardCount=4 + cardCount = 4 elif base=="stud": - cardCount=7 + cardCount = 7 else: - raise fpdb_simple.FpdbError ("invalid category:", category) + raise fpdb_simple.FpdbError("invalid category:", category) - for i in xrange (player_count): - while (len(card_values[i]) 0 +# ret = any(True for searchstr in ActionLines if searchstr in line) +# ret = len( [ x for x in ActionLines if line.find(x) > -1] ) > 0 +# ret = any(searchstr in line for searchstr in ActionLines) #end def isActionLine #returns whether this is a duplicate @@ -828,56 +781,14 @@ def isRebuyOrAddon(topline): #returns whether the passed topline indicates a tournament or not def isTourney(topline): - if (topline.find("Tournament")!=-1): - return True - else: - return False + return "Tournament" in topline #end def isTourney +WinLines = ( "wins the pot", "ties for the ", "wins side pot", "wins the low main pot", "wins the high main pot", + "wins the high pot", "wins the high side pot", "wins the main pot", "wins the side pot", "collected" ) #returns boolean whether the passed line is a win line def isWinLine(line): - if (line.find("wins the pot")!=-1): - return True - elif (line.find("ties for the high pot")!=-1): - return True - elif (line.find("ties for the high main pot")!=-1): - return True - elif (line.find("ties for the high side pot")!=-1): - return True - elif (line.find("ties for the low pot")!=-1): - return True - elif (line.find("ties for the low main pot")!=-1): - return True - elif (line.find("ties for the low side pot")!=-1): - return True - elif (line.find("ties for the main pot")!=-1): #for ftp tied main pot of split pot - return True - elif (line.find("ties for the pot")!=-1): #for ftp tie - return True - elif (line.find("ties for the side pot")!=-1): #for ftp tied split pots - return True - elif (line.find("wins side pot #")!=-1): #for ftp multi split pots - return True - elif (line.find("wins the low main pot")!=-1): - return True - elif (line.find("wins the low pot")!=-1): - return True - elif (line.find("wins the low side pot")!=-1): - return True - elif (line.find("wins the high main pot")!=-1): - return True - elif (line.find("wins the high pot")!=-1): - return True - elif (line.find("wins the high side pot")!=-1): - return True - elif (line.find("wins the main pot")!=-1): - return True - elif (line.find("wins the side pot")!=-1): #for ftp split pots - return True - elif (line.find("collected")!=-1): - return True - else: - return False #not raising error here, any unknown line wouldve been detected in isActionLine already + return len( [ x for x in WinLines if x in line ] ) > 0 #end def isWinLine #returns the amount of cash/chips put into the put in the given action line @@ -892,39 +803,36 @@ def parseActionAmount(line, atype, site, isTourney): if line.endswith(" and is capped"): line=line[:-14] - - if (atype=="fold"): - amount=0 - elif (atype=="check"): - amount=0 - elif (atype=="unbet" and site=="ftp"): - pos1=line.find("$")+1 - pos2=line.find(" returned to") - amount=float2int(line[pos1:pos2]) - elif (atype=="unbet" and site=="ps"): - #print "ps unbet, line:",line - pos1=line.find("$")+1 - if pos1==0: - pos1=line.find("(")+1 - pos2=line.find(")") - amount=float2int(line[pos1:pos2]) - elif (atype=="bet" and site=="ps" and line.find(": raises $")!=-1 and line.find("to $")!=-1): - pos=line.find("to $")+4 - amount=float2int(line[pos:]) + if atype == "fold" or atype == "check": + amount = 0 + elif atype == "unbet": + if site == "ftp": + pos1 = line.find("$") + 1 + pos2 = line.find(" returned to") + amount = float2int(line[pos1:pos2]) + elif site == "ps": + pos1 = line.find("$") + 1 + if pos1 == 0: + pos1 = line.find("(") + 1 + pos2 = line.find(")") + amount = float2int(line[pos1:pos2]) + elif atype == "bet" and site == "ps" and line.find(": raises $")!=-1 and line.find("to $")!=-1: + pos = line.find("to $")+4 + amount = float2int(line[pos:]) else: if not isTourney: - pos=line.rfind("$")+1 + pos = line.rfind("$")+1 #print "parseActionAmount, line:", line, "line[pos:]:", line[pos:] - amount=float2int(line[pos:]) + amount = float2int(line[pos:]) else: #print "line:"+line+"EOL" - pos=line.rfind(" ")+1 + pos = line.rfind(" ")+1 #print "pos:",pos #print "pos of 20:", line.find("20") - amount=int(line[pos:]) + amount = int(line[pos:]) - if atype=="unbet": - amount*=-1 + if atype == "unbet": + amount *= -1 return amount #end def parseActionAmount @@ -932,25 +840,25 @@ def parseActionAmount(line, atype, site, isTourney): # action_amounts. For stud this expects numeric streets (3-7), for # holdem/omaha it expects predeal, preflop, flop, turn or river def parseActionLine(site, base, isTourney, line, street, playerIDs, names, action_types, allIns, action_amounts, actionNos, actionTypeByNo): - if (street=="predeal" or street=="preflop"): - street=0 - elif (street=="flop"): - street=1 - elif (street=="turn"): - street=2 - elif (street=="river"): - street=3 + if street == "predeal" or street == "preflop": + street = 0 + elif street == "flop": + street = 1 + elif street == "turn": + street = 2 + elif street == "river": + street = 3 - nextActionNo=0 + nextActionNo = 0 for player in xrange(len(actionNos[street])): for count in xrange(len(actionNos[street][player])): if actionNos[street][player][count]>=nextActionNo: nextActionNo=actionNos[street][player][count]+1 - line, allIn=goesAllInOnThisLine(line) - atype=parseActionType(line) - playerno=recognisePlayerNo(line, names, atype) - amount=parseActionAmount(line, atype, site, isTourney) + (line, allIn) = goesAllInOnThisLine(line) + atype = parseActionType(line) + playerno = recognisePlayerNo(line, names, atype) + amount = parseActionAmount(line, atype, site, isTourney) action_types[street][playerno].append(atype) allIns[street][playerno].append(allIn) @@ -962,13 +870,13 @@ def parseActionLine(site, base, isTourney, line, street, playerIDs, names, actio def goesAllInOnThisLine(line): """returns whether the player went all-in on this line and removes the all-in text from the line.""" - isAllIn=False + isAllIn = False if (line.endswith(" and is all-in")): - line=line[:-14] - isAllIn=True + line = line[:-14] + isAllIn = True elif (line.endswith(", and is all in")): - line=line[:-15] - isAllIn=True + line = line[:-15] + isAllIn = True return (line, isAllIn) #end def goesAllInOnThisLine @@ -1012,48 +920,48 @@ def parseActionType(line): #parses the ante out of the given line and checks which player paid it, updates antes accordingly. def parseAnteLine(line, site, isTourney, names, antes): - for i in xrange(len(names)): - if (line.startswith(names[i].encode("latin-1"))): #found the ante'er - pos=line.rfind("$")+1 + for i, name in enumerate(names): + if line.startswith(name.encode("latin-1")): + pos = line.rfind("$") + 1 if not isTourney: - antes[i]+=float2int(line[pos:]) + antes[i] += float2int(line[pos:]) else: - if line.find("all-in")==-1: - pos=line.rfind(" ")+1 - antes[i]+=int(line[pos:]) + if "all-in" not in line: + pos = line.rfind(" ") + 1 + antes[i] += int(line[pos:]) else: - pos1=line.rfind("ante")+5 - pos2=line.find(" ",pos1) - antes[i]+=int(line[pos1:pos2]) + pos1 = line.rfind("ante") + 5 + pos2 = line.find(" ", pos1) + antes[i] += int(line[pos1:pos2]) #print "parseAnteLine line: ", line, "antes[i]", antes[i], "antes", antes #end def parseAntes #returns the buyin of a tourney in cents def parseBuyin(topline): - pos1=topline.find("$")+1 - pos2=topline.find("+") + pos1 = topline.find("$")+1 + pos2 = topline.find("+") return float2int(topline[pos1:pos2]) #end def parseBuyin #parses a card line and changes the passed arrays accordingly #todo: reorganise this messy method def parseCardLine(site, category, street, line, names, cardValues, cardSuits, boardValues, boardSuits): - if (line.startswith("Dealt to ") or line.find(" shows [")!=-1 or line.find("mucked [")!=-1): - playerNo=recognisePlayerNo(line, names, "card") #anything but unbet will be ok for that string + if line.startswith("Dealt to") or " shows [" in line or "mucked [" in line: + playerNo = recognisePlayerNo(line, names, "card") #anything but unbet will be ok for that string - pos=line.rfind("[")+1 - if (category=="holdem"): + pos = line.rfind("[")+1 + if category == "holdem": for i in (pos, pos+3): cardValues[playerNo].append(line[i:i+1]) cardSuits[playerNo].append(line[i+1:i+2]) - if (len(cardValues[playerNo])!=2): + if len(cardValues[playerNo]) !=2: if cardValues[playerNo][0]==cardValues[playerNo][2] and cardSuits[playerNo][1]==cardSuits[playerNo][3]: #two tests will do cardValues[playerNo]=cardValues[playerNo][0:2] cardSuits[playerNo]=cardSuits[playerNo][0:2] else: print "line:",line,"cardValues[playerNo]:",cardValues[playerNo] raise FpdbError("read too many/too few holecards in parseCardLine") - elif (category=="omahahi" or category=="omahahilo"): + elif category == "omahahi" or category == "omahahilo": for i in (pos, pos+3, pos+6, pos+9): cardValues[playerNo].append(line[i:i+1]) cardSuits[playerNo].append(line[i+1:i+2]) @@ -1064,8 +972,8 @@ def parseCardLine(site, category, street, line, names, cardValues, cardSuits, bo else: print "line:",line,"cardValues[playerNo]:",cardValues[playerNo] raise FpdbError("read too many/too few holecards in parseCardLine") - elif (category=="razz" or category=="studhi" or category=="studhilo"): - if (line.find("shows")==-1 and line.find("mucked")==-1): + elif category=="razz" or category=="studhi" or category=="studhilo": + if "shows" not in line and "mucked" not in line: #print "parseCardLine(in stud if), street:", street if line[pos+2]=="]": #-> not (hero and 3rd street) cardValues[playerNo][street+2]=line[pos:pos+1] @@ -1204,85 +1112,81 @@ def parseNames(lines): return result #end def parseNames -#returns an array with the positions of the respective players -def parsePositions (hand, names): - #prep array - positions=[] - for i in xrange(len(names)): - positions.append(-1) - - #find blinds - sb,bb=-1,-1 - for i in xrange (len(hand)): - if (sb==-1 and hand[i].find("small blind")!=-1 and hand[i].find("dead small blind")==-1): - sb=hand[i] - #print "sb:",sb - if (bb==-1 and hand[i].find("big blind")!=-1 and hand[i].find("dead big blind")==-1): - bb=hand[i] - #print "bb:",bb +def parsePositions(hand, names): + positions = map(lambda x: -1, names) - #identify blinds - #print "parsePositions before recognising sb/bb. names:",names - sbExists=True - if (sb!=-1): - sb=recognisePlayerNo(sb, names, "bet") - else: - sbExists=False - if (bb!=-1): - bb=recognisePlayerNo(bb, names, "bet") - + #find blinds + sb,bb=-1,-1 + for i in xrange (len(hand)): + if (sb==-1 and hand[i].find("small blind")!=-1 and hand[i].find("dead small blind")==-1): + sb=hand[i] + #print "sb:",sb + if (bb==-1 and hand[i].find("big blind")!=-1 and hand[i].find("dead big blind")==-1): + bb=hand[i] + #print "bb:",bb + +#identify blinds +#print "parsePositions before recognising sb/bb. names:",names + sbExists=True + if (sb!=-1): + sb=recognisePlayerNo(sb, names, "bet") + else: + sbExists=False + if (bb!=-1): + bb=recognisePlayerNo(bb, names, "bet") + # print "sb = ", sb, "bb = ", bb - if bb == sb: - sbExists = False - sb = -1 - - #write blinds into array - if (sbExists): - positions[sb]="S" - positions[bb]="B" - - - #fill up rest of array - if (sbExists): - arraypos=sb-1 - else: - arraypos=bb-1 - distFromBtn=0 - while (arraypos>=0 and arraypos != bb): - #print "parsePositions first while, arraypos:",arraypos,"positions:",positions - positions[arraypos]=distFromBtn - arraypos-=1 - distFromBtn+=1 + if bb == sb: + sbExists = False + sb = -1 - # eric - this takes into account dead seats between blinds - if sbExists: - i = bb - 1 - while positions[i] < 0 and i != sb: - positions[i] = 9 - i -= 1 - ### RHH - Changed to set the null seats before BB to "9" - if sbExists: - i = sb-1 - else: - i = bb-1 - while positions[i] < 0: - positions[i]=9 - i-=1 - - arraypos=len(names)-1 - if (bb!=0 or (bb==0 and sbExists==False) or (bb == 1 and sb != arraypos) ): - while (arraypos>bb and arraypos > sb): - positions[arraypos]=distFromBtn - arraypos-=1 - distFromBtn+=1 - - for i in xrange (len(names)): - if positions[i]==-1: - print "parsePositions names:",names - print "result:",positions - raise FpdbError ("failed to read positions") + #write blinds into array + if (sbExists): + positions[sb]="S" + positions[bb]="B" + + + #fill up rest of array + if (sbExists): + arraypos=sb-1 + else: + arraypos=bb-1 + distFromBtn=0 + while (arraypos>=0 and arraypos != bb): + #print "parsePositions first while, arraypos:",arraypos,"positions:",positions + positions[arraypos]=distFromBtn + arraypos-=1 + distFromBtn+=1 + + # eric - this takes into account dead seats between blinds + if sbExists: + i = bb - 1 + while positions[i] < 0 and i != sb: + positions[i] = 9 + i -= 1 + ### RHH - Changed to set the null seats before BB to "9" + if sbExists: + i = sb-1 + else: + i = bb-1 + while positions[i] < 0: + positions[i]=9 + i-=1 + + arraypos=len(names)-1 + if (bb!=0 or (bb==0 and sbExists==False) or (bb == 1 and sb != arraypos) ): + while (arraypos>bb and arraypos > sb): + positions[arraypos]=distFromBtn + arraypos-=1 + distFromBtn+=1 + + for i in xrange (len(names)): + if positions[i]==-1: + print "parsePositions names:",names + print "result:",positions + raise FpdbError ("failed to read positions") # print str(positions), "\n" - return positions + return positions #end def parsePositions #simply parses the rake amount and returns it as an int @@ -1368,18 +1272,20 @@ def parseWinLine(line, site, names, winnings, isTourney): #returns the category (as per database) string for the given line def recogniseCategory(line): - if (line.find("Razz")!=-1): + if "Razz" in line: return "razz" - elif (line.find("Hold'em")!=-1): + elif "Hold'em" in line: return "holdem" - elif (line.find("Omaha")!=-1 and line.find("Hi/Lo")==-1 and line.find("H/L")==-1): - return "omahahi" - elif (line.find("Omaha")!=-1 and (line.find("Hi/Lo")!=-1 or line.find("H/L")!=-1)): - return "omahahilo" - elif (line.find("Stud")!=-1 and line.find("Hi/Lo")==-1 and line.find("H/L")==-1): - return "studhi" - elif (line.find("Stud")!=-1 and (line.find("Hi/Lo")!=-1 or line.find("H/L")!=-1)): - return "studhilo" + elif "Omaha" in line: + if "Hi/Lo" not in line and "H/L" not in line: + return "omahahi" + else: + return "omahahilo" + elif "Stud" in line: + if "Hi/Lo" not in line and "H/L" not in line: + return "studhi" + else: + return "studhilo" else: raise FpdbError("failed to recognise category, line:"+line) #end def recogniseCategory @@ -1792,19 +1698,20 @@ sure to also change the following storage method and table_viewer.prepare_data i firstPfRaiserNo=-1 firstPfCallByNo=-1 firstPfCallerId=-1 - for i in xrange(len(actionTypeByNo[0])): - if actionTypeByNo[0][i][1]=="bet": - firstPfRaiseByNo=i - firstPfRaiserId=actionTypeByNo[0][i][0] - for j in xrange(len(player_ids)): - if player_ids[j]==firstPfRaiserId: - firstPfRaiserNo=j + + for i, action in enumerate(actionTypeByNo[0]): + if action[1] == "bet": + firstPfRaiseByNo = i + firstPfRaiserId = action[0] + for j, pid in enumerate(player_ids): + if pid == firstPfRaiserId: + firstPfRaiserNo = j break break - for i in xrange(len(actionTypeByNo[0])): - if actionTypeByNo[0][i][1]=="call": - firstPfCallByNo=i - firstPfCallerId=actionTypeByNo[0][i][0] + for i, action in enumerate(actionTypeByNo[0]): + if action[1] == "call": + firstPfCallByNo = i + firstPfCallerId = action[0] break cutoffId=-1 @@ -1812,15 +1719,15 @@ sure to also change the following storage method and table_viewer.prepare_data i sbId=-1 bbId=-1 if base=="hold": - for player in xrange(len(positions)): - if positions==1: - cutoffId=player_ids[player] - if positions==0: - buttonId=player_ids[player] - if positions=='S': - sbId=player_ids[player] - if positions=='B': - bbId=player_ids[player] + for player, pos in enumerate(positions): + if pos == 1: + cutoffId = player_ids[player] + if pos == 0: + buttonId = player_ids[player] + if pos == 'S': + sbId = player_ids[player] + if pos == 'B': + bbId = player_ids[player] someoneStole=False @@ -1856,30 +1763,29 @@ sure to also change the following storage method and table_viewer.prepare_data i #calculate VPIP and PFR street=0 heroPfRaiseCount=0 - for count in xrange(len(action_types[street][player])):#finally individual actions - currentAction=action_types[street][player][count] - if currentAction=="bet": - myStreet0Aggr=True - if (currentAction=="bet" or currentAction=="call"): - myStreet0VPI=True + for currentAction in action_types[street][player]: # finally individual actions + if currentAction == "bet": + myStreet0Aggr = True + if currentAction == "bet" or currentAction == "call": + myStreet0VPI = True #PF3B4BChance and PF3B4B pfFold=-1 pfRaise=-1 - if firstPfRaiseByNo!=-1: - for i in xrange(len(actionTypeByNo[0])): - if actionTypeByNo[0][i][0]==player_ids[player]: - if actionTypeByNo[0][i][1]=="bet" and pfRaise==-1 and i>firstPfRaiseByNo: - pfRaise=i - if actionTypeByNo[0][i][1]=="fold" and pfFold==-1: - pfFold=i - if pfFold==-1 or pfFold>firstPfRaiseByNo: - myStreet0_3B4BChance=True - if pfRaise>firstPfRaiseByNo: - myStreet0_3B4BDone=True + if firstPfRaiseByNo != -1: + for i, actionType in enumerate(actionTypeByNo[0]): + if actionType[0] == player_ids[player]: + if actionType[1] == "bet" and pfRaise == -1 and i > firstPfRaiseByNo: + pfRaise = i + if actionType[1] == "fold" and pfFold == -1: + pfFold = i + if pfFold == -1 or pfFold > firstPfRaiseByNo: + myStreet0_3B4BChance = True + if pfRaise > firstPfRaiseByNo: + myStreet0_3B4BDone = True #steal calculations - if base=="hold": + if base == "hold": if len(player_ids)>=5: #no point otherwise if positions[player]==1: if firstPfRaiserId==player_ids[player]: @@ -1907,52 +1813,45 @@ sure to also change the following storage method and table_viewer.prepare_data i #calculate saw* values - isAllIn=False - for i in xrange(len(allIns[0][player])): - if allIns[0][player][i]: - isAllIn=True + isAllIn = False + if any(i for i in allIns[0][player]): + isAllIn = True if (len(action_types[1][player])>0 or isAllIn): - myStreet1Seen=True - - for i in xrange(len(allIns[1][player])): - if allIns[1][player][i]: - isAllIn=True + myStreet1Seen = True + + if any(i for i in allIns[1][player]): + isAllIn = True if (len(action_types[2][player])>0 or isAllIn): - myStreet2Seen=True + myStreet2Seen = True - for i in xrange(len(allIns[2][player])): - if allIns[2][player][i]: - isAllIn=True + if any(i for i in allIns[2][player]): + isAllIn = True if (len(action_types[3][player])>0 or isAllIn): - myStreet3Seen=True + myStreet3Seen = True #print "base:", base if base=="hold": - mySawShowdown=True - for count in xrange(len(action_types[3][player])): - if action_types[3][player][count]=="fold": - mySawShowdown=False + mySawShowdown = True + if any(actiontype == "fold" for actiontype in action_types[3][player]): + mySawShowdown = False else: #print "in else" - for i in xrange(len(allIns[3][player])): - if allIns[3][player][i]: - isAllIn=True + if any(i for i in allIns[3][player]): + isAllIn = True if (len(action_types[4][player])>0 or isAllIn): #print "in if" - myStreet4Seen=True + myStreet4Seen = True - mySawShowdown=True - for count in xrange(len(action_types[4][player])): - if action_types[4][player][count]=="fold": - mySawShowdown=False + mySawShowdown = True + if any(actiontype == "fold" for actiontype in action_types[4][player]): + mySawShowdown = False #flop stuff street=1 if myStreet1Seen: - for count in xrange(len(action_types[street][player])): - if action_types[street][player][count]=="bet": - myStreet1Aggr=True + if any(actiontype == "bet" for actiontype in action_types[street][player]): + myStreet1Aggr = True for otherPlayer in xrange(len(player_ids)): if player==otherPlayer: @@ -1968,9 +1867,8 @@ sure to also change the following storage method and table_viewer.prepare_data i #turn stuff - copy of flop with different vars street=2 if myStreet2Seen: - for count in xrange(len(action_types[street][player])): - if action_types[street][player][count]=="bet": - myStreet2Aggr=True + if any(actiontype == "bet" for actiontype in action_types[street][player]): + myStreet2Aggr = True for otherPlayer in xrange(len(player_ids)): if player==otherPlayer: @@ -1986,9 +1884,8 @@ sure to also change the following storage method and table_viewer.prepare_data i #river stuff - copy of flop with different vars street=3 if myStreet3Seen: - for count in xrange(len(action_types[street][player])): - if action_types[street][player][count]=="bet": - myStreet3Aggr=True + if any(actiontype == "bet" for actiontype in action_types[street][player]): + myStreet3Aggr = True for otherPlayer in xrange(len(player_ids)): if player==otherPlayer: @@ -2004,9 +1901,8 @@ sure to also change the following storage method and table_viewer.prepare_data i #stud river stuff - copy of flop with different vars street=4 if myStreet4Seen: - for count in xrange(len(action_types[street][player])): - if action_types[street][player][count]=="bet": - myStreet4Aggr=True + if any(actiontype == "bet" for actiontype in action_types[street][player]): + myStreet4Aggr=True for otherPlayer in xrange(len(player_ids)): if player==otherPlayer: @@ -2019,9 +1915,9 @@ sure to also change the following storage method and table_viewer.prepare_data i if action_types[street][player][countOtherFold]=="fold": myFoldToOtherRaisedStreet4=True - if winnings[player]!=0: + if winnings[player] != 0: if myStreet1Seen: - myWonWhenSeenStreet1=winnings[player]/float(totalWinnings) + myWonWhenSeenStreet1 = winnings[player] / float(totalWinnings) if mySawShowdown: myWonAtSD=myWonWhenSeenStreet1