From dd8f35e58a2379a6429a8ae93dcdc89a61dc599d Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 20 Jan 2013 18:14:42 +0100 Subject: [PATCH] fixed bug 1086987 Fixes: https://launchpad.net/bugs/1086987 --- openlp/core/__init__.py | 15 ++++++--------- openlp/core/lib/__init__.py | 16 ++++++++++------ openlp/core/utils/__init__.py | 9 +++------ 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py index d5556d16e..364fa6146 100644 --- a/openlp/core/__init__.py +++ b/openlp/core/__init__.py @@ -213,7 +213,7 @@ def set_up_logging(log_path): """ Setup our logging using log_path """ - check_directory_exists(log_path) + check_directory_exists(log_path, True) filename = os.path.join(log_path, u'openlp.log') logfile = logging.FileHandler(filename, u'w') logfile.setFormatter(logging.Formatter(u'%(asctime)s %(name)-55s %(levelname)-8s %(message)s')) @@ -243,12 +243,6 @@ def main(args=None): # Parse command line options and deal with them. # Use args supplied programatically if possible. (options, args) = parser.parse_args(args) if args else parser.parse_args() - if options.portable: - app_path = AppLocation.get_directory(AppLocation.AppDir) - set_up_logging(os.path.abspath(os.path.join(app_path, u'..', u'..', u'Other'))) - log.info(u'Running portable') - else: - set_up_logging(AppLocation.get_directory(AppLocation.CacheDir)) qt_args = [] if options.loglevel.lower() in ['d', 'debug']: log.setLevel(logging.DEBUG) @@ -273,14 +267,16 @@ def main(args=None): app.setApplicationName(u'OpenLPPortable') Settings.setDefaultFormat(Settings.IniFormat) # Get location OpenLPPortable.ini + app_path = AppLocation.get_directory(AppLocation.AppDir) + set_up_logging(os.path.abspath(os.path.join(app_path, u'..', u'..', u'Other'))) + log.info(u'Running portable') portable_settings_file = os.path.abspath(os.path.join(app_path, u'..', u'..', u'Data', u'OpenLP.ini')) # Make this our settings file log.info(u'INI file: %s', portable_settings_file) Settings.setFilename(portable_settings_file) portable_settings = Settings() # Set our data path - data_path = os.path.abspath(os.path.join(app_path, - u'..', u'..', u'Data',)) + data_path = os.path.abspath(os.path.join(app_path, u'..', u'..', u'Data',)) log.info(u'Data path: %s', data_path) # Point to our data path portable_settings.setValue(u'advanced/data path', data_path) @@ -288,6 +284,7 @@ def main(args=None): portable_settings.sync() else: app.setApplicationName(u'OpenLP') + set_up_logging(AppLocation.get_directory(AppLocation.CacheDir)) app.setApplicationVersion(get_application_version()[u'version']) # Instance check if not options.testing: diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index d0a5e9880..865ec6d3c 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -415,17 +415,21 @@ def expand_tags(text): return text -def check_directory_exists(dir): +def check_directory_exists(directory, do_not_log=False): """ Check a theme directory exists and if not create it - ``dir`` - Theme directory to make sure exists + ``directory`` + The directory to make sure exists + + ``do_not_log`` + To not log anything. This is need for the start up, when the log isn't ready. """ - log.debug(u'check_directory_exists %s' % dir) + if not do_not_log: + log.debug(u'check_directory_exists %s' % directory) try: - if not os.path.exists(dir): - os.makedirs(dir) + if not os.path.exists(directory): + os.makedirs(directory) except IOError: pass diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index 21b1b4f30..7418797eb 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -154,16 +154,13 @@ def _get_os_dir_path(dir_type): return os.path.join(unicode(os.getenv(u'APPDATA'), encoding), u'openlp', u'data') elif dir_type == AppLocation.LanguageDir: return os.path.split(openlp.__file__)[0] - return os.path.join(unicode(os.getenv(u'APPDATA'), encoding), - u'openlp') + return os.path.join(unicode(os.getenv(u'APPDATA'), encoding), u'openlp') elif sys.platform == u'darwin': if dir_type == AppLocation.DataDir: - return os.path.join(unicode(os.getenv(u'HOME'), encoding), - u'Library', u'Application Support', u'openlp', u'Data') + return os.path.join(unicode(os.getenv(u'HOME'), encoding), u'Library', u'Application Support', u'openlp', u'Data') elif dir_type == AppLocation.LanguageDir: return os.path.split(openlp.__file__)[0] - return os.path.join(unicode(os.getenv(u'HOME'), encoding), - u'Library', u'Application Support', u'openlp') + return os.path.join(unicode(os.getenv(u'HOME'), encoding), u'Library', u'Application Support', u'openlp') else: if dir_type == AppLocation.LanguageDir: prefixes = [u'/usr/local', u'/usr']