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

This commit is contained in:
Eratosthenes
2009-11-13 22:02:16 -05:00
5 changed files with 43 additions and 19 deletions
+25
View File
@@ -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])