andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move DATA_PATH, SETTINGS_PATH, and SETTINGS_FILE to mopidy.utils.path

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-10-17 00:21:24 +02:00
parent afdc665ac0
commit b8d637e1f5
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mopidy/__init__.py
View File

@ -1,18 +1,9 @@
import os
import sys import sys
if not (2, 6) <= sys.version_info < (3,): if not (2, 6) <= sys.version_info < (3,):
sys.exit(u'Mopidy requires Python >= 2.6, < 3') sys.exit(u'Mopidy requires Python >= 2.6, < 3')
import glib
__version__ = '0.8.0' __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 import settings as default_settings_module
from mopidy.utils.settings import SettingsProxy from mopidy.utils.settings import SettingsProxy
settings = SettingsProxy(default_settings_module) settings = SettingsProxy(default_settings_module)

9
mopidy/__main__.py
View File

@ -31,7 +31,6 @@ sys.path.insert(
0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../'))) 0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../')))
import mopidy
from mopidy import audio, core, exceptions, settings from mopidy import audio, core, exceptions, settings
from mopidy.utils import ( from mopidy.utils import (
deps, importing, log, path, process, settings as settings_utils, deps, importing, log, path, process, settings as settings_utils,
@ -122,13 +121,13 @@ def check_old_folders():
logger.warning( logger.warning(
u'Old settings folder found at %s, settings.py should be moved ' 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'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): def setup_settings(interactive):
path.get_or_create_folder(mopidy.SETTINGS_PATH) path.get_or_create_folder(path.SETTINGS_PATH)
path.get_or_create_folder(mopidy.DATA_PATH) path.get_or_create_folder(path.DATA_PATH)
path.get_or_create_file(mopidy.SETTINGS_FILE) path.get_or_create_file(path.SETTINGS_FILE)
try: try:
settings.validate(interactive) settings.validate(interactive)
except exceptions.SettingsError as ex: except exceptions.SettingsError as ex:

6
mopidy/utils/path.py
View File

@ -1,4 +1,3 @@
import glib
import logging import logging
import os import os
import re import re
@ -6,8 +5,13 @@ import string
import sys import sys
import urllib import urllib
import glib
logger = logging.getLogger('mopidy.utils.path') 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_DIRS = {
'XDG_CACHE_DIR': glib.get_user_cache_dir(), 'XDG_CACHE_DIR': glib.get_user_cache_dir(),
'XDG_DATA_DIR': glib.get_user_data_dir(), 'XDG_DATA_DIR': glib.get_user_data_dir(),

6
mopidy/utils/settings.py
View File

@ -9,7 +9,7 @@ import os
import pprint import pprint
import sys import sys
from mopidy import exceptions, SETTINGS_PATH, SETTINGS_FILE from mopidy import exceptions
from mopidy.utils import formatting, path from mopidy.utils import formatting, path
logger = logging.getLogger('mopidy.utils.settings') logger = logging.getLogger('mopidy.utils.settings')
@ -23,9 +23,9 @@ class SettingsProxy(object):
self.runtime = {} self.runtime = {}
def _get_local_settings(self): def _get_local_settings(self):
if not os.path.isfile(SETTINGS_FILE): if not os.path.isfile(path.SETTINGS_FILE):
return {} return {}
sys.path.insert(0, SETTINGS_PATH) sys.path.insert(0, path.SETTINGS_PATH)
# pylint: disable = F0401 # pylint: disable = F0401
import settings as local_settings_module import settings as local_settings_module
# pylint: enable = F0401 # pylint: enable = F0401