Merge branch 'master' of git://git.assembla.com/fpdb-eric

Conflicts:
	pyfpdb/fpdb_simple.py

pyfpdb/AbsoluteToFpdb.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 #    Copyright 2008, Carl Gherardi
@@ -60,7 +60,7 @@ debugging: if False, pass on partially supported game types. If true, have a go
         logging.info("Initialising Absolute converter class")
         self.filetype = "text"
         self.codepage = "cp1252"
-        self.siteId   = 3 # Needs to match id entry in Sites database
+        self.siteId   = 8 # Needs to match id entry in Sites database
         self.debugging = debugging
         if autostart:
             self.start()
@@ -79,7 +79,7 @@ debugging: if False, pass on partially supported game types. If true, have a go
             # TODO: Absolute posting when coming in new: %s - Posts $0.02 .. should that be a new Post line? where do we need to add support for that? *confused*
             self.re_PostBoth        = re.compile(ur"^%s - Posts dead (?:\$| €|)(?P<SBBB>[0-9]*[.0-9]+)" % player_re, re.MULTILINE)
             self.re_Action          = re.compile(ur"^%s - (?P<ATYPE>Bets |Raises |All-In |All-In\(Raise\) |Calls |Folds|Checks)?\$?(?P<BET>[0-9]*[.0-9]+)?" % player_re, re.MULTILINE)
-            print "^%s - (?P<ATYPE>Bets |Raises |All-In |All-In\(Raise\) |Calls |Folds|Checks)?\$?(?P<BET>[0-9]*[.0-9]+)?" % player_re
+#            print "^%s - (?P<ATYPE>Bets |Raises |All-In |All-In\(Raise\) |Calls |Folds|Checks)?\$?(?P<BET>[0-9]*[.0-9]+)?" % player_re
             self.re_ShowdownAction  = re.compile(ur"^%s - Shows \[(?P<CARDS>.*)\]" % player_re, re.MULTILINE)
             self.re_CollectPot      = re.compile(ur"^Seat [0-9]: %s(?: \(dealer\)| \(big blind\)| \(small blind\)|) (?:won|collected) Total \((?:\$| €|)(?P<POT>[0-9]*[.0-9]+)\)" % player_re, re.MULTILINE)
             #self.re_PostSB          = re.compile(ur"^%s: posts small blind \[(?:\$| €|) (?P<SB>[.0-9]+)" % player_re, re.MULTILINE)
@@ -248,8 +248,7 @@ or None if we fail to get the info """
         else:
             #Not involved in hand
             hand.involved = False
-
+    
-
     def readStudPlayerCards(self, hand, street):
         # lol. see Plymouth.txt
         logging.warning("Absolute readStudPlayerCards is only a stub.")
@@ -283,7 +282,7 @@ or None if we fail to get the info """
         logging.debug("readShowdownActions")
         for shows in self.re_ShowdownAction.finditer(hand.handText):
             cards = shows.group('CARDS')
-            cards = [validCard(card) for card in cards.split(' ')]
+            cards = [validCard(card) for card in cards.split(' ')]            
             logging.debug("readShowdownActions %s %s" %(cards, shows.group('PNAME')))
             hand.addShownCards(cards, shows.group('PNAME'))
 

pyfpdb/Configuration.py

@@ -584,19 +584,20 @@ class Config:
         return paths
     
     def get_frames(self, site = "PokerStars"):
+        if site not in self.supported_sites: return False
         return self.supported_sites[site].use_frames == True
 
     def get_default_colors(self, site = "PokerStars"):
         colors = {}
-        if self.supported_sites[site].hudopacity == "":
+        if site not in self.supported_sites or self.supported_sites[site].hudopacity == "":
             colors['hudopacity'] = 0.90
         else:
             colors['hudopacity'] = float(self.supported_sites[site].hudopacity)
-        if self.supported_sites[site].hudbgcolor == "":
+        if site not in self.supported_sites or self.supported_sites[site].hudbgcolor == "":
             colors['hudbgcolor'] = "#FFFFFF"
         else:
             colors['hudbgcolor'] = self.supported_sites[site].hudbgcolor
-        if self.supported_sites[site].hudfgcolor == "":
+        if site not in self.supported_sites or self.supported_sites[site].hudfgcolor == "":
             colors['hudfgcolor'] = "#000000"
         else:
             colors['hudfgcolor'] = self.supported_sites[site].hudfgcolor
@@ -604,6 +605,8 @@ class Config:
     
     def get_default_font(self, site = 'PokerStars'):
         (font, font_size) = ("Sans", "8")
+        if site not in self.supported_sites:
+            return ("Sans", "8")
         if self.supported_sites[site].font == "":
             font = "Sans"
         else:

pyfpdb/GuiAutoImport.py

@@ -17,6 +17,7 @@
 
 import threading
 import subprocess
+import traceback
 
 import pygtk
 pygtk.require('2.0')

pyfpdb/GuiPlayerStats.py

@@ -132,7 +132,7 @@ class GuiPlayerStats (threading.Thread):
         self.stats_vbox = gtk.VBox(False, 0)
         self.stats_vbox.show()
         self.stats_frame.add(self.stats_vbox)
-        self.fillStatsFrame(self.stats_vbox)
+        # self.fillStatsFrame(self.stats_vbox)
 
         self.main_hbox.pack_start(self.filters.get_vbox())
         self.main_hbox.pack_start(self.stats_frame, expand=True, fill=True)
@@ -167,7 +167,9 @@ class GuiPlayerStats (threading.Thread):
         for site in sites:
             if sites[site] == True:
                 sitenos.append(siteids[site])
-                self.cursor.execute(self.sql.query['getPlayerId'], (heroes[site],))
+                # Nasty hack to deal with multiple sites + same player name -Eric
+                que = self.sql.query['getPlayerId'] + " AND siteId=%d" % siteids[site]
+                self.cursor.execute(que, (heroes[site],))
                 result = self.db.cursor.fetchall()
                 if len(result) == 1:
                     playerids.append(result[0][0])

pyfpdb/HUD_main.py

@@ -37,7 +37,7 @@ import traceback
 
 if not options.errorsToConsole:
     print "Note: error output is being diverted to fpdb-error-log.txt and HUD-error.txt. Any major error will be reported there _only_."
-    errorFile = open('fpdb-error-log.txt', 'w', 0)
+    errorFile = open('HUD-error.txt', 'w', 0)
     sys.stderr = errorFile
 
 import thread

pyfpdb/Hud.py

@@ -60,6 +60,8 @@ class Hud:
     def __init__(self, parent, table, max, poker_game, config, db_connection):
 #    __init__ is (now) intended to be called from the stdin thread, so it
 #    cannot touch the gui
+        if parent == None: # running from cli ..
+            self.parent = self
         self.parent        = parent
         self.table         = table
         self.config        = config
@@ -125,7 +127,8 @@ class Hud:
         self.menu = gtk.Menu()
         self.item1 = gtk.MenuItem('Kill this HUD')
         self.menu.append(self.item1)
-        self.item1.connect("activate", self.parent.kill_hud, self.table_name)
+        if self.parent != None:
+            self.item1.connect("activate", self.parent.kill_hud, self.table_name)
         self.item1.show()
         
         self.item2 = gtk.MenuItem('Save Layout')
@@ -233,7 +236,7 @@ class Hud:
 #        Need range here, not xrange -> need the actual list        
         adj = range(0, self.max + 1) # default seat adjustments = no adjustment
 #    does the user have a fav_seat?
-        if int(config.supported_sites[self.table.site].layout[self.max].fav_seat) > 0:
+        if self.table.site != None and int(config.supported_sites[self.table.site].layout[self.max].fav_seat) > 0:
             try:
                 fav_seat = config.supported_sites[self.table.site].layout[self.max].fav_seat
                 actual_seat = self.get_actual_seat(config.supported_sites[self.table.site].screen_name)
@@ -600,15 +603,17 @@ if __name__== "__main__":
     
     c = Configuration.Config()
     #tables = Tables.discover(c)
-    t = Tables.discover_table_by_name(c, "Motorway")
+    t = Tables.discover_table_by_name(c, "Patriot Dr")
     if t is None:
         print "Table not found."
     db = Database.Database(c, 'fpdb', 'holdem')
+    
+    stat_dict = db.get_stats_from_hand(1)
 
 #    for t in tables:
-    win = Hud(t, 10, 'holdem', c, db)
+    win = Hud(None, t, 10, 'holdem', c, db) # parent, table, max, poker_game, config, db_connection
-    win.create(1, c)
+    win.create(1, c, stat_dict, None) # hand, config, stat_dict, cards):
 #        t.get_details()
-    win.update(8300, db, c)
+    win.update(8300, c) # self, hand, config):
 
     gtk.main()

pyfpdb/Tables.py

@@ -234,7 +234,7 @@ def discover_nt_by_name(c, tablename):
         #print "Tables.py: tablename =", tablename, "title =", titles[hwnd]
         try:
             # this can blow up in XP on some windows, eg firefox displaying http://docs.python.org/tutorial/classes.html
-            if not tablename in titles[hwnd]: continue
+            if not tablename.lower() in titles[hwnd].lower(): continue
         except:
             continue
         if 'History for table:' in titles[hwnd]: continue # Everleaf Network HH viewer window
@@ -302,7 +302,9 @@ def decode_windows(c, title, hwnd):
     return info
 
 def win_enum_handler(hwnd, titles):
-    titles[hwnd] = win32gui.GetWindowText(hwnd)
+    str = win32gui.GetWindowText(hwnd)
+    if str != "":
+        titles[hwnd] = win32gui.GetWindowText(hwnd)
   
 ###################################################################
 #    Utility routines used by all the discoverers.

pyfpdb/fpdb_parse_logic.py

@@ -93,7 +93,7 @@ def mainParser(settings, siteID, category, hand, config, db = None, writeq = Non
             seatLines.append(line)
 
     names       = fpdb_simple.parseNames(seatLines)
-    playerIDs   = fpdb_simple.recognisePlayerIDs(db, names, siteID)  # inserts players as needed
+    playerIDs   = fpdb_simple.recognisePlayerIDs(db.get_cursor(), names, siteID)  # inserts players as needed
     tmp         = fpdb_simple.parseCashesAndSeatNos(seatLines)
     startCashes = tmp['startCashes']
     seatNos     = tmp['seatNos']

pyfpdb/fpdb_simple.py

@@ -984,18 +984,15 @@ def recogniseTourneyTypeId(cursor, siteId, buyin, fee, knockout, rebuyOrAddon):
 #        result.append(tmp[0][0])
 #    return result
 
-def recognisePlayerIDs(db, names, site_id):
+def recognisePlayerIDs(cursor, names, site_id):
-    q = "SELECT name,id FROM Players WHERE name=" + " OR name=".join([db.sql.query['placeholder'] for n in names])
+    q = "SELECT name,id FROM Players WHERE siteid=%d and (name=%s)" % (site_id, " OR name=".join(["%s" for n in names]))
-    c = db.get_cursor()
+    cursor.execute(q, names) # get all playerids by the names passed in
-    c.execute(q, names) # get all playerids by the names passed in
+    ids = dict(cursor.fetchall()) # convert to dict
-    ids = dict(c.fetchall()) # convert to dict
     if len(ids) != len(names):
         notfound = [n for n in names if n not in ids] # make list of names not in database
         if notfound: # insert them into database
-            #q_ins = "INSERT INTO Players (name, siteId) VALUES (%s, "+str(site_id)+")"
-            #q_ins = q_ins.replace('%s', db.sql.query['placeholder'])
             c.executemany("INSERT INTO Players (name, siteId) VALUES (%s, "+str(site_id)+")", [(n,) for n in notfound])
-            q2 = "SELECT name,id FROM Players WHERE name=%s" % " OR name=".join(["%s" for n in notfound])
+            q2 = "SELECT name,id FROM Players WHERE siteid=%d and (name=%s)" % (site_id, " OR name=".join(["%s" for n in notfound]))
             q2 = q2.replace('%s', db.sql.query['placeholder'])
             c.execute(q2, notfound) # get their new ids
             tmp = c.fetchall()