From 88d67dc429b72ee9ed5ec7fa57f033676efb8d83 Mon Sep 17 00:00:00 2001 From: grindi Date: Sat, 8 Aug 2009 12:07:30 +0400 Subject: [PATCH] Fixed folder couldn't be displayed error in BulkImport --- pyfpdb/Configuration.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index e01a6b43..f7f31167 100755 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- """Configuration.py Handles HUD configuration files. @@ -542,6 +543,13 @@ class Config: if db_server != None: self.supported_databases[db_name].dp_server = db_server if db_type != None: self.supported_databases[db_name].dp_type = db_type return + + def getDefaultSite(self): + "Returns first enabled site or None" + for site_name,site in self.supported_sites.iteritems(): + if site.enabled: + return site_name + return None def get_tv_parameters(self): tv = {} @@ -573,14 +581,15 @@ class Config: except: imp['fastStoreHudCache'] = True return imp - def get_default_paths(self, site = "PokerStars"): + def get_default_paths(self, site = None): + if site is None: site = self.getDefaultSite() paths = {} try: - paths['hud-defaultPath'] = os.path.expanduser(self.supported_sites[site].HH_path) - paths['bulkImport-defaultPath'] = os.path.expanduser(self.supported_sites[site].HH_path) + path = os.path.expanduser(self.supported_sites[site].HH_path) + assert(os.path.isdir(path) or os.path.isfile(path)) # maybe it should try another site? + paths['hud-defaultPath'] = paths['bulkImport-defaultPath'] = path except: - paths['hud-defaultPath'] = "default" - paths['bulkImport-defaultPath'] = "default" + paths['hud-defaultPath'] = paths['bulkImport-defaultPath'] = "default" return paths def get_frames(self, site = "PokerStars"):