From 3a7d159d52fefff0f340f4bf3a6fee78e907d170 Mon Sep 17 00:00:00 2001 From: fpdb-mme Date: Mon, 2 Nov 2009 09:38:27 +0100 Subject: [PATCH] sorry, whitespace was messed up, have to find a better way to convert --- pyfpdb/Configuration.py | 175 ++++++++++++++++++++-------------------- 1 file changed, 88 insertions(+), 87 deletions(-) diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index e19c4c3a..8e55ee15 100755 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -60,7 +60,7 @@ def string_to_bool(string, default=True): class Layout: def __init__(self, node): - self.max = int( node.getAttribute('max') ) + self.max = int( node.getAttribute('max') ) if node.hasAttribute('fav_seat'): self.fav_seat = int( node.getAttribute('fav_seat') ) self.width = int( node.getAttribute('width') ) self.height = int( node.getAttribute('height') ) @@ -98,20 +98,20 @@ class Site: self.table_finder = node.getAttribute("table_finder") self.screen_name = node.getAttribute("screen_name") self.site_path = normalizePath(node.getAttribute("site_path")) - self.HH_path = normalizePath(node.getAttribute("HH_path")) - self.decoder = node.getAttribute("decoder") + self.HH_path = normalizePath(node.getAttribute("HH_path")) + self.decoder = node.getAttribute("decoder") self.hudopacity = node.getAttribute("hudopacity") self.hudbgcolor = node.getAttribute("bgcolor") self.hudfgcolor = node.getAttribute("fgcolor") self.converter = node.getAttribute("converter") self.aux_window = node.getAttribute("aux_window") - self.font = node.getAttribute("font") + self.font = node.getAttribute("font") self.font_size = node.getAttribute("font_size") self.use_frames = node.getAttribute("use_frames") - self.enabled = string_to_bool(node.getAttribute("enabled"), default=True) - self.xpad = node.getAttribute("xpad") - self.ypad = node.getAttribute("ypad") - self.layout = {} + self.enabled = string_to_bool(node.getAttribute("enabled"), default=True) + self.xpad = node.getAttribute("xpad") + self.ypad = node.getAttribute("ypad") + self.layout = {} print self.site_name, self.HH_path @@ -120,10 +120,10 @@ class Site: self.layout[lo.max] = lo # Site defaults - if self.xpad == "": self.xpad = 1 + if self.xpad == "": self.xpad = 1 else: self.xpad = int(self.xpad) - if self.ypad == "": self.ypad = 0 + if self.ypad == "": self.ypad = 0 else: self.ypad = int(self.ypad) if self.font_size == "": self.font_size = 7 @@ -133,7 +133,7 @@ class Site: else: self.hudopacity = float(self.hudopacity) if self.use_frames == "": self.use_frames = False - if self.font == "": self.font = "Sans" + if self.font == "": self.font = "Sans" if self.hudbgcolor == "": self.hudbgcolor = "000000" if self.hudfgcolor == "": self.hudfgcolor = "FFFFFF" @@ -162,10 +162,10 @@ class Stat: class Game: def __init__(self, node): self.game_name = node.getAttribute("game_name") - self.rows = int( node.getAttribute("rows") ) - self.cols = int( node.getAttribute("cols") ) - self.xpad = node.getAttribute("xpad") - self.ypad = node.getAttribute("ypad") + self.rows = int( node.getAttribute("rows") ) + self.cols = int( node.getAttribute("cols") ) + self.xpad = node.getAttribute("xpad") + self.ypad = node.getAttribute("ypad") # Defaults if self.xpad == "": self.xpad = 1 @@ -179,15 +179,15 @@ class Game: aux_list[i] = aux_list[i].strip() self.aux = aux_list - self.stats = {} + self.stats = {} for stat_node in node.getElementsByTagName('stat'): stat = Stat() stat.stat_name = stat_node.getAttribute("stat_name") - stat.row = int( stat_node.getAttribute("row") ) - stat.col = int( stat_node.getAttribute("col") ) - stat.tip = stat_node.getAttribute("tip") - stat.click = stat_node.getAttribute("click") - stat.popup = stat_node.getAttribute("popup") + stat.row = int( stat_node.getAttribute("row") ) + stat.col = int( stat_node.getAttribute("col") ) + stat.tip = stat_node.getAttribute("tip") + stat.click = stat_node.getAttribute("click") + stat.popup = stat_node.getAttribute("popup") stat.hudprefix = stat_node.getAttribute("hudprefix") stat.hudsuffix = stat_node.getAttribute("hudsuffix") stat.hudcolor = stat_node.getAttribute("hudcolor") @@ -206,18 +206,18 @@ class Game: temp = temp + "%s" % self.stats[stat] return temp - + class Database: def __init__(self, node): self.db_name = node.getAttribute("db_name") self.db_server = node.getAttribute("db_server") - self.db_ip = node.getAttribute("db_ip") + self.db_ip = node.getAttribute("db_ip") self.db_user = node.getAttribute("db_user") self.db_type = node.getAttribute("db_type") self.db_pass = node.getAttribute("db_pass") self.db_selected = string_to_bool(node.getAttribute("default"), default=False) log.debug("Database db_name:'%(name)s' db_server:'%(server)s' db_ip:'%(ip)s' db_user:'%(user)s' db_type:'%(type)s' db_pass (not logged) selected:'%(sel)s'" \ - % { 'name':self.db_name, 'server':self.db_server, 'ip':self.db_ip, 'user':self.db_user, 'type':self.db_type, 'sel':self.db_selected} ) + % { 'name':self.db_name, 'server':self.db_server, 'ip':self.db_ip, 'user':self.db_user, 'type':self.db_type, 'sel':self.db_selected} ) def __str__(self): temp = 'Database = ' + self.db_name + '\n' @@ -253,7 +253,7 @@ class Aux_window: class HHC: def __init__(self, node): - self.site = node.getAttribute("site") + self.site = node.getAttribute("site") self.converter = node.getAttribute("converter") def __str__(self): @@ -263,7 +263,7 @@ class HHC: class Popup: def __init__(self, node): self.name = node.getAttribute("pu_name") - self.pu_stats = [] + self.pu_stats = [] for stat_node in node.getElementsByTagName('pu_stat'): self.pu_stats.append(stat_node.getAttribute("pu_stat_name")) @@ -276,7 +276,7 @@ class Popup: class Import: def __init__(self, node): self.node = node - self.interval = node.getAttribute("interval") + self.interval = node.getAttribute("interval") self.callFpdbHud = node.getAttribute("callFpdbHud") self.hhArchiveBase = node.getAttribute("hhArchiveBase") self.saveActions = string_to_bool(node.getAttribute("saveActions"), default=True) @@ -284,7 +284,7 @@ class Import: def __str__(self): return " interval = %s\n callFpdbHud = %s\n hhArchiveBase = %s\n saveActions = %s\n fastStoreHudCache = %s\n" \ - % (self.interval, self.callFpdbHud, self.hhArchiveBase, self.saveActions, self.fastStoreHudCache) + % (self.interval, self.callFpdbHud, self.hhArchiveBase, self.saveActions, self.fastStoreHudCache) class HudUI: def __init__(self, node): @@ -293,15 +293,15 @@ class HudUI: # self.aggregate_ring = string_to_bool(node.getAttribute('aggregate_ring_game_stats')) self.aggregate_tour = string_to_bool(node.getAttribute('aggregate_tourney_stats')) - self.hud_style = node.getAttribute('stat_aggregation_range') - self.hud_days = node.getAttribute('aggregation_days') + self.hud_style = node.getAttribute('stat_aggregation_range') + self.hud_days = node.getAttribute('aggregation_days') self.agg_bb_mult = node.getAttribute('aggregation_level_multiplier') # self.h_aggregate_ring = string_to_bool(node.getAttribute('aggregate_hero_ring_game_stats')) self.h_aggregate_tour = string_to_bool(node.getAttribute('aggregate_hero_tourney_stats')) self.h_hud_style = node.getAttribute('hero_stat_aggregation_range') - self.h_hud_days = node.getAttribute('hero_aggregation_days') - self.h_agg_bb_mult = node.getAttribute('hero_aggregation_level_multiplier') + self.h_hud_days = node.getAttribute('hero_aggregation_days') + self.h_agg_bb_mult = node.getAttribute('hero_aggregation_level_multiplier') def __str__(self): @@ -311,7 +311,7 @@ class HudUI: class Tv: def __init__(self, node): self.combinedStealFold = node.getAttribute("combinedStealFold") - self.combined2B3B = node.getAttribute("combined2B3B") + self.combined2B3B = node.getAttribute("combined2B3B") self.combinedPostflop = node.getAttribute("combinedPostflop") def __str__(self): @@ -390,7 +390,7 @@ class Config: # attribute of the tag. if no database is explicitely selected, we use the first one we come across # s_dbs = doc.getElementsByTagName("supported_databases") #TODO: do we want to take all tags or all tags contained in - # ..this may break stuff for some users. so leave it unchanged for now untill there is a decission + # ..this may break stuff for some users. so leave it unchanged for now untill there is a decission for db_node in doc.getElementsByTagName("database"): db = Database(node=db_node) if db.db_name in self.supported_databases: @@ -402,12 +402,13 @@ class Config: if dbname and dbname in self.supported_databases: self.db_selected = dbname -# s_dbs = doc.getElementsByTagName("mucked_windows") + +# s_dbs = doc.getElementsByTagName("mucked_windows") for aw_node in doc.getElementsByTagName("aw"): aw = Aux_window(node = aw_node) self.aux_windows[aw.name] = aw -# s_dbs = doc.getElementsByTagName("mucked_windows") +# s_dbs = doc.getElementsByTagName("mucked_windows") for hhc_node in doc.getElementsByTagName("hhc"): hhc = HHC(node = hhc_node) self.hhcs[hhc.site] = hhc @@ -437,8 +438,8 @@ class Config: else: df_parms = self.read_default_conf(df_file) self.set_db_parameters(db_name = 'fpdb', db_ip = df_parms['db-host'], - db_user = df_parms['db-user'], - db_pass = df_parms['db-password']) + db_user = df_parms['db-user'], + db_pass = df_parms['db-password']) self.save(file=os.path.join(self.default_config_path, "HUD_config.xml")) print "" @@ -449,7 +450,7 @@ class Config: def find_config(self): """Looks in cwd and in self.default_config_path for a config file.""" if os.path.exists('HUD_config.xml'): # there is a HUD_config in the cwd - file = 'HUD_config.xml' # so we use it + file = 'HUD_config.xml' # so we use it else: # no HUD_config in the cwd, look where it should be in the first place config_path = os.path.join(self.default_config_path, 'HUD_config.xml') if os.path.exists(config_path): @@ -492,7 +493,7 @@ class Config: def find_example_config(self): if os.path.exists('HUD_config.xml.example'): # there is a HUD_config in the cwd - file = 'HUD_config.xml' # so we use it + file = 'HUD_config.xml' # so we use it try: shutil.copyfile(file+'.example', file) except: @@ -606,16 +607,16 @@ class Config: return db def set_db_parameters(self, db_name = 'fpdb', db_ip = None, db_user = None, - db_pass = None, db_server = None, db_type = None): + db_pass = None, db_server = None, db_type = None): db_node = self.get_db_node(db_name) if db_node != None: - if db_ip != None: db_node.setAttribute("db_ip", db_ip) + if db_ip != None: db_node.setAttribute("db_ip", db_ip) if db_user != None: db_node.setAttribute("db_user", db_user) if db_pass != None: db_node.setAttribute("db_pass", db_pass) if db_server != None: db_node.setAttribute("db_server", db_server) if db_type != None: db_node.setAttribute("db_type", db_type) if self.supported_databases.has_key(db_name): - if db_ip != None: self.supported_databases[db_name].dp_ip = db_ip + if db_ip != None: self.supported_databases[db_name].dp_ip = db_ip if db_user != None: self.supported_databases[db_name].dp_user = db_user if db_pass != None: self.supported_databases[db_name].dp_pass = db_pass if db_server != None: self.supported_databases[db_name].dp_server = db_server @@ -634,8 +635,8 @@ class Config: try: tv['combinedStealFold'] = self.tv.combinedStealFold except: tv['combinedStealFold'] = True - try: tv['combined2B3B'] = self.tv.combined2B3B - except: tv['combined2B3B'] = True + try: tv['combined2B3B'] = self.tv.combined2B3B + except: tv['combined2B3B'] = True try: tv['combinedPostflop'] = self.tv.combinedPostflop except: tv['combinedPostflop'] = True @@ -648,7 +649,7 @@ class Config: default_text = 'FPDB Menu - Right click\nLeft-Drag to Move' try: hui['label'] = self.ui.label - if self.ui.label == '': # Empty menu label is a big no-no + if self.ui.label == '': # Empty menu label is a big no-no hui['label'] = default_text except: hui['label'] = default_text @@ -662,11 +663,11 @@ class Config: try: hui['hud_style'] = self.ui.hud_style except: hui['hud_style'] = 'A' - try: hui['hud_days'] = int(self.ui.hud_days) - except: hui['hud_days'] = 90 + try: hui['hud_days'] = int(self.ui.hud_days) + except: hui['hud_days'] = 90 - try: hui['agg_bb_mult'] = self.ui.agg_bb_mult - except: hui['agg_bb_mult'] = 1 + try: hui['agg_bb_mult'] = self.ui.agg_bb_mult + except: hui['agg_bb_mult'] = 1 # Hero specific @@ -676,11 +677,11 @@ class Config: try: hui['h_aggregate_tour'] = self.ui.h_aggregate_tour except: hui['h_aggregate_tour'] = True - try: hui['h_hud_style'] = self.ui.h_hud_style - except: hui['h_hud_style'] = 'S' + try: hui['h_hud_style'] = self.ui.h_hud_style + except: hui['h_hud_style'] = 'S' - try: hui['h_hud_days'] = int(self.ui.h_hud_days) - except: hui['h_hud_days'] = 30 + try: hui['h_hud_days'] = int(self.ui.h_hud_days) + except: hui['h_hud_days'] = 30 try: hui['h_agg_bb_mult'] = self.ui.h_agg_bb_mult except: hui['h_agg_bb_mult'] = 1 @@ -690,19 +691,19 @@ class Config: def get_import_parameters(self): imp = {} - try: imp['callFpdbHud'] = self.imp.callFpdbHud - except: imp['callFpdbHud'] = True + try: imp['callFpdbHud'] = self.imp.callFpdbHud + except: imp['callFpdbHud'] = True - try: imp['interval'] = self.imp.interval - except: imp['interval'] = 10 + try: imp['interval'] = self.imp.interval + except: imp['interval'] = 10 - try: imp['hhArchiveBase'] = self.imp.hhArchiveBase - except: imp['hhArchiveBase'] = "~/.fpdb/HandHistories/" + try: imp['hhArchiveBase'] = self.imp.hhArchiveBase + except: imp['hhArchiveBase'] = "~/.fpdb/HandHistories/" - try: imp['saveActions'] = self.imp.saveActions - except: imp['saveActions'] = True + try: imp['saveActions'] = self.imp.saveActions + except: imp['saveActions'] = True - try: imp['fastStoreHudCache'] = self.imp.fastStoreHudCache + try: imp['fastStoreHudCache'] = self.imp.fastStoreHudCache except: imp['fastStoreHudCache'] = True return imp @@ -758,8 +759,8 @@ class Config: locations = self.supported_sites[site].layout[max].location except: locations = ( ( 0, 0), (684, 61), (689, 239), (692, 346), - (586, 393), (421, 440), (267, 440), ( 0, 361), - ( 0, 280), (121, 280), ( 46, 30) ) + (586, 393), (421, 440), (267, 440), ( 0, 361), + ( 0, 280), (121, 280), ( 46, 30) ) return locations def get_aux_locations(self, aux = "mucked", max = "9"): @@ -768,8 +769,8 @@ class Config: locations = self.aux_windows[aux].layout[max].location except: locations = ( ( 0, 0), (684, 61), (689, 239), (692, 346), - (586, 393), (421, 440), (267, 440), ( 0, 361), - ( 0, 280), (121, 280), ( 46, 30) ) + (586, 393), (421, 440), (267, 440), ( 0, 361), + ( 0, 280), (121, 280), ( 46, 30) ) return locations def get_supported_sites(self, all = False): @@ -785,21 +786,21 @@ class Config: """Returns a dict of the site parameters for the specified site""" parms = {} parms["converter"] = self.supported_sites[site].converter - parms["decoder"] = self.supported_sites[site].decoder + parms["decoder"] = self.supported_sites[site].decoder parms["hudbgcolor"] = self.supported_sites[site].hudbgcolor parms["hudfgcolor"] = self.supported_sites[site].hudfgcolor parms["hudopacity"] = self.supported_sites[site].hudopacity parms["screen_name"] = self.supported_sites[site].screen_name parms["site_path"] = self.supported_sites[site].site_path parms["table_finder"] = self.supported_sites[site].table_finder - parms["HH_path"] = self.supported_sites[site].HH_path + parms["HH_path"] = self.supported_sites[site].HH_path parms["site_name"] = self.supported_sites[site].site_name parms["aux_window"] = self.supported_sites[site].aux_window - parms["font"] = self.supported_sites[site].font + parms["font"] = self.supported_sites[site].font parms["font_size"] = self.supported_sites[site].font_size - parms["enabled"] = self.supported_sites[site].enabled - parms["xpad"] = self.supported_sites[site].xpad - parms["ypad"] = self.supported_sites[site].ypad + parms["enabled"] = self.supported_sites[site].enabled + parms["xpad"] = self.supported_sites[site].xpad + parms["ypad"] = self.supported_sites[site].ypad return parms def set_site_parameters(self, site_name, converter = None, decoder = None, @@ -811,18 +812,18 @@ class Config: """Sets the specified site parameters for the specified site.""" site_node = self.get_site_node(site_name) if db_node != None: - if converter != None: site_node.setAttribute("converter", converter) + if converter != None: site_node.setAttribute("converter", converter) if decoder != None: site_node.setAttribute("decoder", decoder) - if hudbgcolor != None: site_node.setAttribute("hudbgcolor", hudbgcolor) - if hudfgcolor != None: site_node.setAttribute("hudfgcolor", hudfgcolor) - if hudopacity != None: site_node.setAttribute("hudopacity", hudopacity) + if hudbgcolor != None: site_node.setAttribute("hudbgcolor", hudbgcolor) + if hudfgcolor != None: site_node.setAttribute("hudfgcolor", hudfgcolor) + if hudopacity != None: site_node.setAttribute("hudopacity", hudopacity) if screen_name != None: site_node.setAttribute("screen_name", screen_name) - if site_path != None: site_node.setAttribute("site_path", site_path) + if site_path != None: site_node.setAttribute("site_path", site_path) if table_finder != None: site_node.setAttribute("table_finder", table_finder) if HH_path != None: site_node.setAttribute("HH_path", HH_path) if enabled != None: site_node.setAttribute("enabled", enabled) - if font != None: site_node.setAttribute("font", font) - if font_size != None: site_node.setAttribute("font_size", font_size) + if font != None: site_node.setAttribute("font", font) + if font_size != None: site_node.setAttribute("font_size", font_size) return def get_aux_windows(self): @@ -850,11 +851,11 @@ class Config: param = {} if self.supported_games.has_key(name): param['game_name'] = self.supported_games[name].game_name - param['rows'] = self.supported_games[name].rows - param['cols'] = self.supported_games[name].cols - param['xpad'] = self.supported_games[name].xpad - param['ypad'] = self.supported_games[name].ypad - param['aux'] = self.supported_games[name].aux + param['rows'] = self.supported_games[name].rows + param['cols'] = self.supported_games[name].cols + param['xpad'] = self.supported_games[name].xpad + param['ypad'] = self.supported_games[name].ypad + param['aux'] = self.supported_games[name].aux return param def get_supported_games(self): @@ -914,8 +915,8 @@ if __name__== "__main__": c.edit_layout("PokerStars", 6, locations=( (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6) )) c.save(file="testout.xml") - print "db = ", c.get_db_parameters() -# print "tv = ", c.get_tv_parameters() + print "db = ", c.get_db_parameters() +# print "tv = ", c.get_tv_parameters() # print "imp = ", c.get_import_parameters() print "paths = ", c.get_default_paths("PokerStars") print "colors = ", c.get_default_colors("PokerStars")