Merge branch 'master' of git://git.assembla.com/fpdboz

pyfpdb/GuiBulkImport.py

@@ -243,7 +243,17 @@ class GuiBulkImport():
 
 #    ComboBox - filter
         self.cbfilter = gtk.combo_box_new_text()
+        disabled_sites = []                                # move disabled sites to bottom of list
         for w in self.config.hhcs:
+            try:
+                if self.config.supported_sites[w].enabled: # include enabled ones first
+                    print w
+                    self.cbfilter.append_text(w)
+                else:
+                    disabled_sites.append(w)
+            except: # self.supported_sites[w] may not exist if hud_config is bad
+                disabled_sites.append(w)
+        for w in disabled_sites:                           # then disabled ones
             print w
             self.cbfilter.append_text(w)
         self.cbfilter.set_active(0)

pyfpdb/HUD_main.py

@@ -245,10 +245,6 @@ class HUD_main(object):
                                                                   ,self.hero_ids[site_id], num_seats)
                 t3 = time.time()
                 try:
-                    self.db_connection.init_hud_stat_vars( self.hud_dict[temp_key].hud_params['hud_days']
-                                                     , self.hud_dict[temp_key].hud_params['h_hud_days'])
-                    t4 = time.time()
-                    stat_dict = self.db_connection.get_stats_from_hand(new_hand_id, type, self.hud_dict[temp_key].hud_params, self.hero_ids[site_id])
                     self.hud_dict[temp_key].stat_dict = stat_dict
                 except KeyError:    # HUD instance has been killed off, key is stale
                     sys.stderr.write('hud_dict[%s] was not found\n' % temp_key)
@@ -256,9 +252,10 @@ class HUD_main(object):
                     # Unlocks table, copied from end of function
                     self.db_connection.connection.rollback()
                     return
-                t5 = time.time()
                 cards      = self.db_connection.get_cards(new_hand_id)
+                t4 = time.time()
                 comm_cards = self.db_connection.get_common_cards(new_hand_id)
+                t5 = time.time()
                 if comm_cards != {}: # stud!
                     cards['common'] = comm_cards['common']
                 self.hud_dict[temp_key].cards = cards
@@ -278,6 +275,7 @@ class HUD_main(object):
 
                 table_kwargs = dict(table_name = table_name, tournament = tour_number, table_number = tab_number)
                 search_string = getTableTitleRe(self.config, site_name, type, **table_kwargs)
+                # print "getTableTitleRe ", self.config, site_name, type, "=", search_string
                 tablewindow = Tables.Table(search_string, **table_kwargs)
 
                 if tablewindow is None:

pyfpdb/TableWindow.py

@@ -101,7 +101,7 @@ class Table_Window(object):
             self.table = int(table_number)
             self.name = "%s - %s" % (self.tournament, self.table)
         elif table_name is not None:
-            search_string = table_name
+            # search_string = table_name
             self.name = table_name
             self.tournament = None
         else:

pyfpdb/WinTables.py

@@ -50,6 +50,7 @@ class Table(Table_Window):
         titles = {}
         win32gui.EnumWindows(win_enum_handler, titles)
         for hwnd in titles:
+            if titles[hwnd] == "": continue
             # print "searching ", search_string, " in ", titles[hwnd]
             if re.search(search_string, titles[hwnd]):
                 if 'History for table:' in titles[hwnd]: continue # Everleaf Network HH viewer window

pyfpdb/test2.py

@@ -22,12 +22,39 @@ Test if gtk is working.
 ########################################################################
 
 import sys
+import os
+import Configuration
+
+config_path = Configuration.get_default_config_path()
 
 try:
+    import gobject as _gobject
+    print "Import of gobject:\tSuccess"
     import pygtk
+    print "Import of pygtk:\tSuccess"
     pygtk.require('2.0')
     import gtk
+    print "Import of gtk:\t\tSuccess"
+    import pango
+    print "Import of pango:\tSuccess"
 
+    if os.name == 'nt':
+        import win32
+        import win32api
+        print "Import of win32:\tSuccess"
+
+    try:
+        import matplotlib
+        matplotlib.use('GTK')
+        print "Import of matplotlib:\tSuccess"
+        import numpy
+        print "Import of numpy:\tSuccess"
+        import pylab
+        print "Import of pylab:\tSuccess"
+    except:
+        print "\nError:", sys.exc_info()
+        print "\npress return to finish"
+        sys.stdin.readline()
 
     win = gtk.Window(gtk.WINDOW_TOPLEVEL)
     win.set_title("Test GTK")
@@ -42,7 +69,7 @@ try:
                      (gtk.STOCK_CLOSE, gtk.RESPONSE_OK))
     dia.set_default_size(500, 300)
 
-    l = gtk.Label("GTK is working!")
+    l = gtk.Label("GTK is working!\nConfig location: %s" %config_path)
     dia.vbox.add(l)
     l.show()
 

pyfpdb/test_PokerStars.py

@@ -27,9 +27,9 @@ settings.update(config.get_default_paths())
 gametype = {'type':'ring', 'base':'draw', 'category':'badugi', 'limitType':'fl', 'sb':'0.25', 'bb':'0.50','currency':'USD'}
 text = ""
 
-hhc = PokerStarsToFpdb.PokerStars(autostart=False)
+hhc = PokerStarsToFpdb.PokerStars(config, autostart=False)
 
-h = HoldemOmahaHand(None, "PokerStars", gametype, text, builtFrom = "Test")
+h = HoldemOmahaHand(config, None, "PokerStars", gametype, text, builtFrom = "Test")
 h.addPlayer("1", "s0rrow", "100000")
 
 hhc.compilePlayerRegexs(h)
@@ -39,7 +39,7 @@ def checkGameInfo(hhc, header, info):
     assert hhc.determineGameType(header) == info
 
 def testGameInfo():
-    hhc = PokerStarsToFpdb.PokerStars(autostart=False)    
+    hhc = PokerStarsToFpdb.PokerStars(config, autostart=False)
     pairs = (
     (u"PokerStars Game #20461877044:  Hold'em No Limit ($1/$2) - 2008/09/16 18:58:01 ET",
     {'type':'ring', 'base':"hold", 'category':'holdem', 'limitType':'nl', 'sb':'1', 'bb':'2', 'currency':'USD'}),