diff --git a/mopidy/__init__.py b/mopidy/__init__.py index 76aca226..0b0be1a6 100644 --- a/mopidy/__init__.py +++ b/mopidy/__init__.py @@ -1,18 +1,9 @@ -import os import sys - if not (2, 6) <= sys.version_info < (3,): sys.exit(u'Mopidy requires Python >= 2.6, < 3') -import glib - __version__ = '0.8.0' -DATA_PATH = os.path.join(str(glib.get_user_data_dir()), 'mopidy') -CACHE_PATH = os.path.join(str(glib.get_user_cache_dir()), 'mopidy') -SETTINGS_PATH = os.path.join(str(glib.get_user_config_dir()), 'mopidy') -SETTINGS_FILE = os.path.join(SETTINGS_PATH, 'settings.py') - from mopidy import settings as default_settings_module from mopidy.utils.settings import SettingsProxy settings = SettingsProxy(default_settings_module) diff --git a/mopidy/__main__.py b/mopidy/__main__.py index ba175ceb..719e8e24 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -31,7 +31,6 @@ sys.path.insert( 0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../'))) -import mopidy from mopidy import audio, core, exceptions, settings from mopidy.utils import ( deps, importing, log, path, process, settings as settings_utils, @@ -122,13 +121,13 @@ def check_old_folders(): logger.warning( u'Old settings folder found at %s, settings.py should be moved ' u'to %s, any cache data should be deleted. See release notes for ' - u'further instructions.', old_settings_folder, mopidy.SETTINGS_PATH) + u'further instructions.', old_settings_folder, path.SETTINGS_PATH) def setup_settings(interactive): - path.get_or_create_folder(mopidy.SETTINGS_PATH) - path.get_or_create_folder(mopidy.DATA_PATH) - path.get_or_create_file(mopidy.SETTINGS_FILE) + path.get_or_create_folder(path.SETTINGS_PATH) + path.get_or_create_folder(path.DATA_PATH) + path.get_or_create_file(path.SETTINGS_FILE) try: settings.validate(interactive) except exceptions.SettingsError as ex: diff --git a/mopidy/utils/path.py b/mopidy/utils/path.py index 0cf02a4a..220d6775 100644 --- a/mopidy/utils/path.py +++ b/mopidy/utils/path.py @@ -1,4 +1,3 @@ -import glib import logging import os import re @@ -6,8 +5,13 @@ import string import sys import urllib +import glib + logger = logging.getLogger('mopidy.utils.path') +DATA_PATH = os.path.join(str(glib.get_user_data_dir()), 'mopidy') +SETTINGS_PATH = os.path.join(str(glib.get_user_config_dir()), 'mopidy') +SETTINGS_FILE = os.path.join(SETTINGS_PATH, 'settings.py') XDG_DIRS = { 'XDG_CACHE_DIR': glib.get_user_cache_dir(), 'XDG_DATA_DIR': glib.get_user_data_dir(), diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py index a886a90c..be0e4420 100644 --- a/mopidy/utils/settings.py +++ b/mopidy/utils/settings.py @@ -9,7 +9,7 @@ import os import pprint import sys -from mopidy import exceptions, SETTINGS_PATH, SETTINGS_FILE +from mopidy import exceptions from mopidy.utils import formatting, path logger = logging.getLogger('mopidy.utils.settings') @@ -23,9 +23,9 @@ class SettingsProxy(object): self.runtime = {} def _get_local_settings(self): - if not os.path.isfile(SETTINGS_FILE): + if not os.path.isfile(path.SETTINGS_FILE): return {} - sys.path.insert(0, SETTINGS_PATH) + sys.path.insert(0, path.SETTINGS_PATH) # pylint: disable = F0401 import settings as local_settings_module # pylint: enable = F0401