Merge branch 'master' of git://github.com/grindi/fpdb-grindi

pyfpdb/Exceptions.py

@@ -9,8 +9,8 @@ class FpdbParseError(FpdbError):
         self.value = value
         self.hid = hid
     def __str__(self):
-        if hid:
+        if self.hid:
-            return repr("HID:"+hid+", "+self.value)
+            return repr("HID:"+self.hid+", "+self.value)
         else:
             return repr(self.value)
 

pyfpdb/HUD_main.py

@@ -53,6 +53,7 @@ import gobject
 #    FreePokerTools modules
 import Configuration
 import Database
+from HandHistoryConverter import getTableTitleRe
 #    get the correct module for the current os
 if os.name == 'posix':
     import XTables as Tables
@@ -253,10 +254,10 @@ class HUD_main(object):
                 if comm_cards != {}: # stud!
                     cards['common'] = comm_cards['common']
 
-                if type == "tour":
+                table_kwargs = dict(table_name = table_name, tournament = tour_number, table_number = tab_number)
-                    tablewindow = Tables.Table(tournament = tour_number, table_number = tab_number)
+                search_string = getTableTitleRe(self.config, site, type, **table_kwargs)
-                else:
+                tablewindow = Tables.Table(search_string, **table_kwargs)
-                    tablewindow = Tables.Table(table_name = table_name)
+
                 if tablewindow is None:
 #        If no client window is found on the screen, complain and continue
                     if type == "tour":

pyfpdb/HandHistoryConverter.py

@@ -147,6 +147,7 @@ Otherwise, finish at EOF.
                     except FpdbParseError, e:
                         numErrors += 1
                         log.warning("Failed to convert hand %s" % e.hid)
+                        log.warning("Exception msg: '%s'" % str(e))
                         log.debug(handText)
             else:
                 handsList = self.allHandsAsList()
@@ -161,6 +162,7 @@ Otherwise, finish at EOF.
                         except FpdbParseError, e:
                             numErrors += 1
                             log.warning("Failed to convert hand %s" % e.hid)
+                            log.warning("Exception msg: '%s'" % str(e))
                             log.debug(handText)
                     numHands = len(handsList)
                     endtime = time.time()
@@ -499,3 +501,26 @@ or None if we fail to get the info """
     
     def getTourney(self):
         return self.tourney
+
+    @staticmethod
+    def getTableTitleRe(type, table_name=None, tournament = None, table_number=None):
+        "Returns string to search in windows titles"
+        if type=="tour":
+            return "%s.+Table\s%s" % (tournament, table_number)
+        else:
+            return table_name
+
+
+
+def getTableTitleRe(config, sitename, *args, **kwargs):
+    "Returns string to search in windows titles for current site"
+    return getSiteHhc(config, sitename).getTableTitleRe(*args, **kwargs)
+
+def getSiteHhc(config, sitename):
+    "Returns HHC class for current site"
+    hhcName = config.supported_sites[sitename].converter
+    hhcModule = __import__(hhcName)
+    return getattr(hhcModule, hhcName[:-6])
+    
+    
+

pyfpdb/Hud.py

@@ -440,7 +440,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
-        (aux.save_layout() for aux in self.aux_windows)
+        [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()

pyfpdb/TableWindow.py

@@ -93,19 +93,17 @@ gobject.signal_new("client_destroyed", gtk.Window,
 #            screen location of (0, 0) in the working window.
 
 class Table_Window(object):
-    def __init__(self, table_name = None, tournament = None, table_number = None):
+    def __init__(self, search_string, table_name = None, tournament = None, table_number = None):
 
-        if table_name is not None:
+        if tournament is not None and table_number is not None:
-            search_string = table_name
-            self.name = table_name
-            self.tournament = None
-            self.table = None
-        elif tournament is not None and table_number is not None:
             print "tournament %s, table %s" % (tournament, table_number)
             self.tournament = int(tournament)
             self.table = int(table_number)
             self.name = "%s - %s" % (self.tournament, self.table)
-            search_string = "%s.+Table\s%s" % (tournament, table_number)
+        elif table_name is not None:
+            search_string = table_name
+            self.name = table_name
+            self.tournament = None
         else:
             return None