diff --git a/mopidy/__init__.py b/mopidy/__init__.py index 7b25c525..fdcb11d7 100644 --- a/mopidy/__init__.py +++ b/mopidy/__init__.py @@ -3,10 +3,16 @@ import sys if not (2, 6) <= sys.version_info < (3,): sys.exit(u'Mopidy requires Python >= 2.6, < 3') +import glib +import os + from subprocess import PIPE, Popen VERSION = (0, 6, 0) +SETTINGS_FOLDER = os.path.join(glib.get_user_config_dir(), 'mopidy') +SETTINGS_FILE = os.path.join(SETTINGS_FOLDER, 'settings.py') + def get_version(): try: return get_git_version() diff --git a/mopidy/core.py b/mopidy/core.py index b3ce9070..c16f32c8 100644 --- a/mopidy/core.py +++ b/mopidy/core.py @@ -18,7 +18,7 @@ sys.argv[1:] = gstreamer_args from pykka.registry import ActorRegistry from mopidy import (get_version, settings, OptionalDependencyError, - SettingsError) + SettingsError, SETTINGS_FOLDER, SETTINGS_FILE) from mopidy.gstreamer import GStreamer from mopidy.utils import get_class from mopidy.utils.log import setup_logging @@ -78,8 +78,8 @@ def parse_options(): return parser.parse_args(args=mopidy_args)[0] def setup_settings(interactive): - get_or_create_folder('~/.mopidy/') - get_or_create_file('~/.mopidy/settings.py') + get_or_create_folder(SETTINGS_FOLDER) + get_or_create_file(SETTINGS_FILE) try: settings.validate(interactive) except SettingsError, e: diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py index a4d8052b..60a02957 100644 --- a/mopidy/utils/settings.py +++ b/mopidy/utils/settings.py @@ -8,7 +8,7 @@ import os from pprint import pformat import sys -from mopidy import SettingsError +from mopidy import SettingsError, SETTINGS_FOLDER, SETTINGS_FILE from mopidy.utils.log import indent logger = logging.getLogger('mopidy.utils.settings') @@ -21,11 +21,9 @@ class SettingsProxy(object): self.runtime = {} def _get_local_settings(self): - dotdir = os.path.join(glib.get_user_config_dir(), 'mopidy') - settings_file = os.path.join(dotdir, u'settings.py') - if not os.path.isfile(settings_file): + if not os.path.isfile(SETTINGS_FILE): return {} - sys.path.insert(0, dotdir) + sys.path.insert(0, SETTINGS_FOLDER) # pylint: disable = F0401 import settings as local_settings_module # pylint: enable = F0401