Moved window title re to HHC classes

Just redefine function getTableTitleRe in coresponding hhc for custom re
This commit is contained in:
grindi 2009-11-07 20:30:47 +03:00
parent f99c4baa8b
commit 9dd600702a
3 changed files with 35 additions and 13 deletions

View File

@ -53,6 +53,7 @@ import gobject
# FreePokerTools modules # FreePokerTools modules
import Configuration import Configuration
import Database import Database
from HandHistoryConverter import getTableTitleRe
# get the correct module for the current os # get the correct module for the current os
if os.name == 'posix': if os.name == 'posix':
import XTables as Tables import XTables as Tables
@ -253,10 +254,10 @@ class HUD_main(object):
if comm_cards != {}: # stud! if comm_cards != {}: # stud!
cards['common'] = comm_cards['common'] 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 tablewindow is None:
# If no client window is found on the screen, complain and continue # If no client window is found on the screen, complain and continue
if type == "tour": if type == "tour":

View File

@ -506,3 +506,26 @@ or None if we fail to get the info """
def getTourney(self): def getTourney(self):
return self.tourney 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])

View File

@ -93,19 +93,17 @@ gobject.signal_new("client_destroyed", gtk.Window,
# screen location of (0, 0) in the working window. # screen location of (0, 0) in the working window.
class Table_Window(object): 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) print "tournament %s, table %s" % (tournament, table_number)
self.tournament = int(tournament) self.tournament = int(tournament)
self.table = int(table_number) self.table = int(table_number)
self.name = "%s - %s" % (self.tournament, self.table) 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: else:
return None return None
@ -151,4 +149,4 @@ class Table_Window(object):
def check_bad_words(self, title): def check_bad_words(self, title):
for word in bad_words: for word in bad_words:
if word in title: return True if word in title: return True
return False return False