[pitivi/gtktimeline] settings: Create the conf file path in a single place
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/gtktimeline] settings: Create the conf file path in a single place
- Date: Wed, 6 May 2015 11:13:30 +0000 (UTC)
commit e99eadc12873913db001ecbca43011e357ca5c10
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Wed May 6 10:41:38 2015 +0200
settings: Create the conf file path in a single place
pitivi/settings.py | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/pitivi/settings.py b/pitivi/settings.py
index 6a1f120..37db752 100644
--- a/pitivi/settings.py
+++ b/pitivi/settings.py
@@ -144,6 +144,8 @@ class GlobalSettings(GObject.Object, Loggable):
def __init__(self, **unused_kwargs):
GObject.Object.__init__(self)
Loggable.__init__(self)
+
+ self.conf_file_path = os.path.join(xdg_config_home(), "pitivi.conf")
self._config = SafeConfigParser()
self._readSettingsFromConfigurationFile()
self._readSettingsFromEnvironmentVariables()
@@ -153,15 +155,14 @@ class GlobalSettings(GObject.Object, Loggable):
Read the configuration from the user configuration file.
"""
- conf_file_path = os.path.join(xdg_config_home(), "pitivi.conf")
try:
- self._config.read(conf_file_path)
+ self._config.read(self.conf_file_path)
except UnicodeDecodeError as e:
- self.error("Failed to read %s: %s", conf_file_path, e)
+ self.error("Failed to read %s: %s", self.conf_file_path, e)
unicode_error_dialog()
return
except ParsingError as e:
- self.error("Failed to parse %s: %s", conf_file_path, e)
+ self.error("Failed to parse %s: %s", self.conf_file_path, e)
return
for (section, attrname, typ, key, env, value) in self.iterAllOptions():
@@ -223,8 +224,6 @@ class GlobalSettings(GObject.Object, Loggable):
setattr(self, attrname, var)
def _writeSettingsToConfigurationFile(self):
- conf_file_path = os.path.join(xdg_config_home(), "pitivi.conf")
-
for (section, attrname, typ, key, env_var, value) in self.iterAllOptions():
if not self._config.has_section(section):
self._config.add_section(section)
@@ -234,10 +233,10 @@ class GlobalSettings(GObject.Object, Loggable):
else:
self._config.remove_option(section, key)
try:
- with open(conf_file_path, 'w') as file:
+ with open(self.conf_file_path, 'w') as file:
self._config.write(file)
except (IOError, OSError) as e:
- self.error("Failed to write to %s: %s", conf_file_path, e)
+ self.error("Failed to write to %s: %s", self.conf_file_path, e)
def storeSettings(self):
"""
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]